diff --git a/charts/cadvisor/Chart.yaml b/charts/cadvisor/Chart.yaml index dd71b46..c2e0378 100644 --- a/charts/cadvisor/Chart.yaml +++ b/charts/cadvisor/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: A chart for a Cadvisor deployment name: cadvisor -version: 2.2.4 +version: 2.3.0 appVersion: 0.47.0 home: https://github.com/google/cadvisor sources: diff --git a/charts/cadvisor/README.md b/charts/cadvisor/README.md index 8fb9760..443e678 100644 --- a/charts/cadvisor/README.md +++ b/charts/cadvisor/README.md @@ -61,6 +61,7 @@ The following table lists the configurable parameters of the cAdvisor chart and | `serviceAccount.create` | create a own serviceAccount for the pod | `true` | | `serviceAccount.name` | name of the serviceAccount to create | `""` | | `podAnnotations` | annotations for the daemonset pods | `{}` | +| `podLabels` | labels for the daemonset pods | `{}` | | `priorityClassName` | priority classes name for the pod | `{}` | | `podSecurityPolicy.create` | create a own PodSecurityPolicy for the pod | `false` | | `podSecurityPolicy.privileged` | create the PodSecurityPolicy as privileged | `false` | @@ -68,8 +69,8 @@ The following table lists the configurable parameters of the cAdvisor chart and | `podSecurityContext.privileged`| set podSecurityContext privileged to true | `false` | | `metrics.enabled` | create ServiceMonitor CR for Prometheus operator | `false` | | `metrics.relabelings` | add pre-scraping relabeling to ServiceMonitor | `[]` | -| `metrics.interval` | scraping interval for the ServiceMonitor | `30s` | -| `metrics.scrapeTimeout` | scraping timeout for the ServiceMonitor | `30s` | +| `metrics.interval` | scraping interval for the ServiceMonitor | `30s` | +| `metrics.scrapeTimeout` | scraping timeout for the ServiceMonitor | `30s` | | `metrics.metricsRelabelings` | add pre-ingestion relabeling to ServiceMonitor | `[]` | Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, diff --git a/charts/cadvisor/templates/daemonset.yaml b/charts/cadvisor/templates/daemonset.yaml index dae59de..38d7875 100644 --- a/charts/cadvisor/templates/daemonset.yaml +++ b/charts/cadvisor/templates/daemonset.yaml @@ -20,6 +20,9 @@ spec: labels: app: {{ template "cadvisor.name" . }} release: {{ .Release.Name }} + {{- range $key, $value := .Values.podLabels }} + {{ $key }}: {{ $value | quote }} + {{- end }} annotations: {{- range $key, $value := .Values.podAnnotations }} {{ $key }}: {{ $value | quote }} diff --git a/charts/cadvisor/values.yaml b/charts/cadvisor/values.yaml index 2396164..dbe52b8 100644 --- a/charts/cadvisor/values.yaml +++ b/charts/cadvisor/values.yaml @@ -43,6 +43,7 @@ resources: {} # memory: 128Mi podAnnotations: {} +podLabels: {} # priorityClassName: system-cluster-critical priorityClassName: {}