diff --git a/charts/kube-state-metrics/Chart.yaml b/charts/kube-state-metrics/Chart.yaml index 8e2a7d502b29..1b60f78f0d47 100644 --- a/charts/kube-state-metrics/Chart.yaml +++ b/charts/kube-state-metrics/Chart.yaml @@ -7,7 +7,7 @@ keywords: - prometheus - kubernetes type: application -version: 6.3.0 +version: 6.3.1 # renovate: github-releases=kubernetes/kube-state-metrics appVersion: 2.17.0 home: https://github.com/kubernetes/kube-state-metrics/ diff --git a/charts/kube-state-metrics/templates/deployment.yaml b/charts/kube-state-metrics/templates/deployment.yaml index cd1aa5f14576..fd563ccf1c5f 100644 --- a/charts/kube-state-metrics/templates/deployment.yaml +++ b/charts/kube-state-metrics/templates/deployment.yaml @@ -96,8 +96,10 @@ spec: {{- if .Values.metricLabelsAllowlist }} - --metric-labels-allowlist={{ .Values.metricLabelsAllowlist | join "," }} {{- end }} - {{- if .Values.metricAnnotationsAllowList }} - - --metric-annotations-allowlist={{ .Values.metricAnnotationsAllowList | join "," }} + {{- /* backwards compatibility with metricAnnotationsAllowList */ }} + {{- $metricAnnotationsAllowlist := .Values.metricAnnotationsAllowlist | default .Values.metricAnnotationsAllowList }} + {{- if $metricAnnotationsAllowlist }} + - --metric-annotations-allowlist={{ $metricAnnotationsAllowlist | join "," }} {{- end }} {{- if .Values.metricAllowlist }} - --metric-allowlist={{ .Values.metricAllowlist | join "," }} diff --git a/charts/kube-state-metrics/values.yaml b/charts/kube-state-metrics/values.yaml index db9051f28fb2..cc982afa0b9f 100644 --- a/charts/kube-state-metrics/values.yaml +++ b/charts/kube-state-metrics/values.yaml @@ -397,7 +397,7 @@ metricLabelsAllowlist: [] # annotation keys you would like to allow for them (Example: '=namespaces=[kubernetes.io/team,...],pods=[kubernetes.io/team],...)'. # A single '*' can be provided per resource instead to allow any annotations, but that has # severe performance implications (Example: '=pods=[*]'). -metricAnnotationsAllowList: [] +metricAnnotationsAllowlist: [] # - pods=[k8s-annotation-1,k8s-annotation-n] # Available collectors for kube-state-metrics.