mirror of https://git.rancher.io/charts
(dev-v2.6-archive) Use Rancher images for monitoring subcharts
(partially cherry picked from commit 1b0deff7a9)
pull/1680/head
Arvind Iyengar
parent
079f3c0c0c
commit
bc85f45531
|
|
@ -214,6 +214,52 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/REA
|
|||
|
||||
### Kubelet Service
|
||||
Because the kubelet service has a new name in the chart, make sure to clean up the old kubelet service in the `kube-system` namespace to prevent counting container metrics twice.
|
||||
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/charts/grafana/README.md packages/rancher-monitoring/charts/charts/grafana/README.md
|
||||
--- packages/rancher-monitoring/charts-original/charts/grafana/README.md
|
||||
+++ packages/rancher-monitoring/charts/charts/grafana/README.md
|
||||
@@ -51,7 +51,7 @@
|
||||
| `readinessProbe` | Readiness Probe settings | `{ "httpGet": { "path": "/api/health", "port": 3000 } }`|
|
||||
| `securityContext` | Deployment securityContext | `{"runAsUser": 472, "runAsGroup": 472, "fsGroup": 472}` |
|
||||
| `priorityClassName` | Name of Priority Class to assign pods | `nil` |
|
||||
-| `image.repository` | Image repository | `grafana/grafana` |
|
||||
+| `image.repository` | Image repository | `rancher/grafana-grafana` |
|
||||
| `image.tag` | Image tag (`Must be >= 5.0.0`) | `7.0.3` |
|
||||
| `image.pullPolicy` | Image pull policy | `IfNotPresent` |
|
||||
| `image.pullSecrets` | Image pull secrets | `{}` |
|
||||
@@ -92,7 +92,7 @@
|
||||
| `persistence.finalizers` | PersistentVolumeClaim finalizers | `[ "kubernetes.io/pvc-protection" ]` |
|
||||
| `persistence.subPath` | Mount a sub dir of the persistent volume | `nil` |
|
||||
| `initChownData.enabled` | If false, don't reset data ownership at startup | true |
|
||||
-| `initChownData.image.repository` | init-chown-data container image repository | `busybox` |
|
||||
+| `initChownData.image.repository` | init-chown-data container image repository | `rancher/busybox` |
|
||||
| `initChownData.image.tag` | init-chown-data container image tag | `latest` |
|
||||
| `initChownData.image.pullPolicy` | init-chown-data container image pull policy | `IfNotPresent` |
|
||||
| `initChownData.resources` | init-chown-data pod resource requests & limits | `{}` |
|
||||
@@ -120,7 +120,7 @@
|
||||
| `podAnnotations` | Pod annotations | `{}` |
|
||||
| `podLabels` | Pod labels | `{}` |
|
||||
| `podPortName` | Name of the grafana port on the pod | `grafana` |
|
||||
-| `sidecar.image.repository` | Sidecar image repository | `kiwigrid/k8s-sidecar` |
|
||||
+| `sidecar.image.repository` | Sidecar image repository | `rancher/kiwigrid-k8s-sidecar` |
|
||||
| `sidecar.image.tag` | Sidecar image tag | `0.1.151` |
|
||||
| `sidecar.imagePullPolicy` | Sidecar image pull policy | `IfNotPresent` |
|
||||
| `sidecar.resources` | Sidecar resources | `{}` |
|
||||
@@ -159,13 +159,13 @@
|
||||
| `rbac.extraClusterRoleRules` | Additional rules to add to the ClusterRole | [] |
|
||||
| `command` | Define command to be executed by grafana container at startup | `nil` |
|
||||
| `testFramework.enabled` | Whether to create test-related resources | `true` |
|
||||
-| `testFramework.image` | `test-framework` image repository. | `bats/bats` |
|
||||
+| `testFramework.image` | `test-framework` image repository. | `rancher/bats-bats` |
|
||||
| `testFramework.tag` | `test-framework` image tag. | `v1.1.0` |
|
||||
| `testFramework.imagePullPolicy` | `test-framework` image pull policy. | `IfNotPresent` |
|
||||
| `testFramework.securityContext` | `test-framework` securityContext | `{}` |
|
||||
| `downloadDashboards.env` | Environment variables to be passed to the `download-dashboards` container | `{}` |
|
||||
| `downloadDashboards.resources` | Resources of `download-dashboards` container | `{}` |
|
||||
-| `downloadDashboardsImage.repository` | Curl docker image repo | `curlimages/curl` |
|
||||
+| `downloadDashboardsImage.repository` | Curl docker image repo | `rancher/curlimages-curl` |
|
||||
| `downloadDashboardsImage.tag` | Curl docker image tag | `7.68.0` |
|
||||
| `downloadDashboardsImage.pullPolicy` | Curl docker image pull policy | `IfNotPresent` |
|
||||
| `namespaceOverride` | Override the deployment namespace | `""` (`Release.Namespace`) |
|
||||
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/charts/grafana/templates/_pod.tpl packages/rancher-monitoring/charts/charts/grafana/templates/_pod.tpl
|
||||
--- packages/rancher-monitoring/charts-original/charts/grafana/templates/_pod.tpl
|
||||
+++ packages/rancher-monitoring/charts/charts/grafana/templates/_pod.tpl
|
||||
|
|
@ -262,6 +308,68 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/cha
|
|||
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
||||
{{- if .Values.command }}
|
||||
command:
|
||||
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/charts/grafana/values.yaml packages/rancher-monitoring/charts/charts/grafana/values.yaml
|
||||
--- packages/rancher-monitoring/charts-original/charts/grafana/values.yaml
|
||||
+++ packages/rancher-monitoring/charts/charts/grafana/values.yaml
|
||||
@@ -49,8 +49,8 @@
|
||||
# schedulerName: "default-scheduler"
|
||||
|
||||
image:
|
||||
- repository: grafana/grafana
|
||||
- tag: 7.0.5
|
||||
+ repository: rancher/grafana-grafana
|
||||
+ tag: 7.0.6
|
||||
pullPolicy: IfNotPresent
|
||||
|
||||
## Optionally specify an array of imagePullSecrets.
|
||||
@@ -62,7 +62,7 @@
|
||||
|
||||
testFramework:
|
||||
enabled: true
|
||||
- image: "bats/bats"
|
||||
+ image: "rancher/bats-bats"
|
||||
tag: "v1.1.0"
|
||||
imagePullPolicy: IfNotPresent
|
||||
securityContext: {}
|
||||
@@ -90,7 +90,7 @@
|
||||
# priorityClassName:
|
||||
|
||||
downloadDashboardsImage:
|
||||
- repository: curlimages/curl
|
||||
+ repository: rancher/curlimages-curl
|
||||
tag: 7.70.0
|
||||
pullPolicy: IfNotPresent
|
||||
|
||||
@@ -224,7 +224,7 @@
|
||||
## initChownData container image
|
||||
##
|
||||
image:
|
||||
- repository: busybox
|
||||
+ repository: rancher/busybox
|
||||
tag: "1.31.1"
|
||||
pullPolicy: IfNotPresent
|
||||
|
||||
@@ -465,7 +465,7 @@
|
||||
## Requires at least Grafana 5 to work and can't be used together with parameters dashboardProviders, datasources and dashboards
|
||||
sidecar:
|
||||
image:
|
||||
- repository: kiwigrid/k8s-sidecar
|
||||
+ repository: rancher/kiwigrid-k8s-sidecar
|
||||
tag: 0.1.151
|
||||
imagePullPolicy: IfNotPresent
|
||||
resources: {}
|
||||
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/charts/kube-state-metrics/README.md packages/rancher-monitoring/charts/charts/kube-state-metrics/README.md
|
||||
--- packages/rancher-monitoring/charts-original/charts/kube-state-metrics/README.md
|
||||
+++ packages/rancher-monitoring/charts/charts/kube-state-metrics/README.md
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
| Parameter | Description | Default |
|
||||
|:---------------------------------------------|:--------------------------------------------------------------------------------------|:-------------------------------------------|
|
||||
-| `image.repository` | The image repository to pull from | `quay.io/coreos/kube-state-metrics` |
|
||||
+| `image.repository` | The image repository to pull from | `rancher/coreos-kube-state-metrics` |
|
||||
| `image.tag` | The image tag to pull from | `v1.9.7` |
|
||||
| `image.pullPolicy` | Image pull policy | `IfNotPresent` |
|
||||
| `imagePullSecrets` | List of container registry secrets | `[]` |
|
||||
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/charts/kube-state-metrics/templates/deployment.yaml packages/rancher-monitoring/charts/charts/kube-state-metrics/templates/deployment.yaml
|
||||
--- packages/rancher-monitoring/charts-original/charts/kube-state-metrics/templates/deployment.yaml
|
||||
+++ packages/rancher-monitoring/charts/charts/kube-state-metrics/templates/deployment.yaml
|
||||
|
|
@ -274,6 +382,30 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/cha
|
|||
ports:
|
||||
- containerPort: 8080
|
||||
livenessProbe:
|
||||
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/charts/kube-state-metrics/values.yaml packages/rancher-monitoring/charts/charts/kube-state-metrics/values.yaml
|
||||
--- packages/rancher-monitoring/charts-original/charts/kube-state-metrics/values.yaml
|
||||
+++ packages/rancher-monitoring/charts/charts/kube-state-metrics/values.yaml
|
||||
@@ -1,7 +1,7 @@
|
||||
# Default values for kube-state-metrics.
|
||||
prometheusScrape: true
|
||||
image:
|
||||
- repository: quay.io/coreos/kube-state-metrics
|
||||
+ repository: rancher/coreos-kube-state-metrics
|
||||
tag: v1.9.7
|
||||
pullPolicy: IfNotPresent
|
||||
|
||||
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/charts/prometheus-adapter/README.md packages/rancher-monitoring/charts/charts/prometheus-adapter/README.md
|
||||
--- packages/rancher-monitoring/charts-original/charts/prometheus-adapter/README.md
|
||||
+++ packages/rancher-monitoring/charts/charts/prometheus-adapter/README.md
|
||||
@@ -111,7 +111,7 @@
|
||||
| Parameter | Description | Default |
|
||||
| ------------------------------- | ------------------------------------------------------------------------------- | --------------------------------------------|
|
||||
| `affinity` | Node affinity | `{}` |
|
||||
-| `image.repository` | Image repository | `directxman12/k8s-prometheus-adapter-amd64` |
|
||||
+| `image.repository` | Image repository | `rancher/directxman12-k8s-prometheus-adapter-amd64` |
|
||||
| `image.tag` | Image tag | `v0.6.0` |
|
||||
| `image.pullPolicy` | Image pull policy | `IfNotPresent` |
|
||||
| `image.pullSecrets` | Image pull secrets | `{}` |
|
||||
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/charts/prometheus-adapter/templates/custom-metrics-apiserver-deployment.yaml packages/rancher-monitoring/charts/charts/prometheus-adapter/templates/custom-metrics-apiserver-deployment.yaml
|
||||
--- packages/rancher-monitoring/charts-original/charts/prometheus-adapter/templates/custom-metrics-apiserver-deployment.yaml
|
||||
+++ packages/rancher-monitoring/charts/charts/prometheus-adapter/templates/custom-metrics-apiserver-deployment.yaml
|
||||
|
|
@ -286,6 +418,30 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/cha
|
|||
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
||||
args:
|
||||
- /adapter
|
||||
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/charts/prometheus-adapter/values.yaml packages/rancher-monitoring/charts/charts/prometheus-adapter/values.yaml
|
||||
--- packages/rancher-monitoring/charts-original/charts/prometheus-adapter/values.yaml
|
||||
+++ packages/rancher-monitoring/charts/charts/prometheus-adapter/values.yaml
|
||||
@@ -2,7 +2,7 @@
|
||||
affinity: {}
|
||||
|
||||
image:
|
||||
- repository: directxman12/k8s-prometheus-adapter-amd64
|
||||
+ repository: rancher/directxman12-k8s-prometheus-adapter-amd64
|
||||
tag: v0.6.0
|
||||
pullPolicy: IfNotPresent
|
||||
|
||||
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/charts/prometheus-node-exporter/README.md packages/rancher-monitoring/charts/charts/prometheus-node-exporter/README.md
|
||||
--- packages/rancher-monitoring/charts-original/charts/prometheus-node-exporter/README.md
|
||||
+++ packages/rancher-monitoring/charts/charts/prometheus-node-exporter/README.md
|
||||
@@ -38,7 +38,7 @@
|
||||
|
||||
| Parameter | Description | Default |
|
||||
| ------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------ |
|
||||
-| `image.repository` | Image repository | `quay.io/prometheus/node-exporter` |
|
||||
+| `image.repository` | Image repository | `rancher/prom-node-exporter` |
|
||||
| `image.tag` | Image tag | `v1.0.0` |
|
||||
| `image.pullPolicy` | Image pull policy | `IfNotPresent` |
|
||||
| `extraArgs` | Additional container arguments | `[]` |
|
||||
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/charts/prometheus-node-exporter/templates/daemonset.yaml packages/rancher-monitoring/charts/charts/prometheus-node-exporter/templates/daemonset.yaml
|
||||
--- packages/rancher-monitoring/charts-original/charts/prometheus-node-exporter/templates/daemonset.yaml
|
||||
+++ packages/rancher-monitoring/charts/charts/prometheus-node-exporter/templates/daemonset.yaml
|
||||
|
|
@ -298,6 +454,18 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/cha
|
|||
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
||||
args:
|
||||
- --path.procfs=/host/proc
|
||||
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/charts/prometheus-node-exporter/values.yaml packages/rancher-monitoring/charts/charts/prometheus-node-exporter/values.yaml
|
||||
--- packages/rancher-monitoring/charts-original/charts/prometheus-node-exporter/values.yaml
|
||||
+++ packages/rancher-monitoring/charts/charts/prometheus-node-exporter/values.yaml
|
||||
@@ -2,7 +2,7 @@
|
||||
# This is a YAML-formatted file.
|
||||
# Declare variables to be passed into your templates.
|
||||
image:
|
||||
- repository: quay.io/prometheus/node-exporter
|
||||
+ repository: rancher/prom-node-exporter
|
||||
tag: v1.0.0
|
||||
pullPolicy: IfNotPresent
|
||||
|
||||
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/crds/crd-alertmanager.yaml packages/rancher-monitoring/charts/crds/crd-alertmanager.yaml
|
||||
--- packages/rancher-monitoring/charts-original/crds/crd-alertmanager.yaml
|
||||
+++ packages/rancher-monitoring/charts/crds/crd-alertmanager.yaml
|
||||
|
|
@ -1598,7 +1766,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
|
|||
+ url: http://rancher-monitoring-prometheus.cattle-monitoring-system.svc
|
||||
+ port: 9090
|
||||
+ image:
|
||||
+ repository: directxman12/k8s-prometheus-adapter-amd64
|
||||
+ repository: rancher/directxman12-k8s-prometheus-adapter-amd64
|
||||
+ tag: v0.6.0
|
||||
+ pullPolicy: IfNotPresent
|
||||
+ pullSecrets: {}
|
||||
|
|
|
|||
Loading…
Reference in New Issue