Upgrade kube state metrics

resources/monitoring/charts/kube-state-metrics/Chart.yaml

@@ -1,12 +1,14 @@
-apiVersion: v1
+apiVersion: v2
 name: kube-state-metrics
 description: Install kube-state-metrics to generate and expose cluster-level metrics
 keywords:
 - metric
 - monitoring
 - prometheus
 - kubernetes
-version: 2.9.4
+type: application
+version: 4.4.1
+appVersion: 2.3.0
 home: https://github.com/kubernetes/kube-state-metrics/
 sources:
 - https://github.com/kubernetes/kube-state-metrics/

resources/monitoring/charts/kube-state-metrics/templates/_helpers.tpl

@@ -1,14 +1,3 @@
-{{- /*
-  Customization: Some changes are made to the default label set.
-  Added labels recommended by Kubernetes and Helm:
-    helm.sh/chart
-    app.kubernetes.io/managed-by
-    app.kubernetes.io/name
-    app.kubernetes.io/instance
-
-  Added labels to be used by label selectors
-*/ -}}
-
 {{/* vim: set filetype=mustache: */}}
 {{/*
 Expand the name of the chart.
@@ -17,13 +6,6 @@ Expand the name of the chart.
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "kube-state-metrics.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
 {{/*
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
@@ -65,18 +47,36 @@ Allow the release namespace to be overridden for multi-namespace deployments in
 {{- end -}}
 
 {{/*
-Common labels
+Create chart name and version as used by the chart label.
 */}}
-{{- define "kube-state-metrics.labels" -}}
-helm.sh/chart: {{ include "kube-state-metrics.chart" . }}
-{{ include "kube-state-metrics.selectorLabels" . }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- define "kube-state-metrics.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{/*
+Generate basic labels
+*/}}
+{{- define "kube-state-metrics.labels" }}
+helm.sh/chart: {{ template "kube-state-metrics.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/component: metrics
+app.kubernetes.io/part-of: {{ template "kube-state-metrics.name" . }}
+{{- include "kube-state-metrics.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+{{- if .Values.customLabels }}
+{{ toYaml .Values.customLabels }}
+{{- end }}
+{{- if .Values.releaseLabel }}
+release: {{ .Release.Name }}
+{{- end }}
+{{- end }}
+
 {{/*
 Selector labels
 */}}
-{{- define "kube-state-metrics.selectorLabels" -}}
+{{- define "kube-state-metrics.selectorLabels" }}
 app.kubernetes.io/name: {{ include "kube-state-metrics.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
+{{- end }}

resources/monitoring/charts/kube-state-metrics/templates/clusterrolebinding.yaml

@@ -1,16 +1,20 @@
-{{- if .Values.rbac.create -}}
+{{- if and .Values.rbac.create .Values.rbac.useClusterRole -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    {{- include "kube-state-metrics.labels" . | nindent 4 }}
+    {{- include "kube-state-metrics.labels" . | indent 4 }}
   name: {{ template "kube-state-metrics.fullname" . }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
+{{- if .Values.rbac.useExistingRole }}
+  name: {{ .Values.rbac.useExistingRole }}
+{{- else }}
   name: {{ template "kube-state-metrics.fullname" . }}
+{{- end }}
 subjects:
 - kind: ServiceAccount
-  name: {{ template "kube-state-metrics.fullname" . }}
+  name: {{ template "kube-state-metrics.serviceAccountName" . }}
   namespace: {{ template "kube-state-metrics.namespace" . }}
 {{- end -}}

resources/monitoring/charts/kube-state-metrics/templates/deployment.yaml

@@ -1,3 +1,6 @@
+{{- /*
+  Customization: did not take selector labels from upstream as they are immuatble and it fails during upgrade
+*/ -}}
 apiVersion: apps/v1
 {{- if .Values.autosharding.enabled }}
 kind: StatefulSet
@@ -8,43 +11,39 @@ metadata:
   name: {{ template "kube-state-metrics.fullname" . }}
   namespace: {{ template "kube-state-metrics.namespace" . }}
   labels:
-    {{- include "kube-state-metrics.labels" . | nindent 4 }}
-{{- if .Values.customLabels }}
-{{ toYaml .Values.customLabels | indent 4 }}
-{{- end }}
+    {{- include "kube-state-metrics.labels" . | indent 4 }}
 spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ template "kube-state-metrics.name" . }}
   replicas: {{ .Values.replicas }}
-{{- if .Values.autosharding.enabled }}
+  {{- if .Values.autosharding.enabled }}
   serviceName: {{ template "kube-state-metrics.fullname" . }}
   volumeClaimTemplates: []
-{{- end }}
+  {{- end }}
   template:
     metadata:
       labels:
-        {{- include "kube-state-metrics.labels" . | nindent 8 }}
-{{- if .Values.customLabels }}
-{{ toYaml .Values.customLabels | indent 8 }}
-{{- end }}
-{{- if .Values.podAnnotations }}
+        {{- include "kube-state-metrics.labels" . | indent 8 }}
+      {{- if .Values.podAnnotations }}
       annotations:
 {{ toYaml .Values.podAnnotations | indent 8 }}
-{{- end }}
+      {{- end }}
     spec:
       hostNetwork: {{ .Values.hostNetwork }}
       serviceAccountName: {{ template "kube-state-metrics.serviceAccountName" . }}
-      {{- if .Values.podSecurityContext }}
+      {{- if .Values.securityContext.enabled }}
       securityContext:
-{{ toYaml .Values.podSecurityContext | indent 8 }}
+        fsGroup: {{ .Values.securityContext.fsGroup }}
+        runAsGroup: {{ .Values.securityContext.runAsGroup }}
+        runAsUser: {{ .Values.securityContext.runAsUser }}
       {{- end }}
-    {{- if or .Values.priorityClassName .Values.global.priorityClassName }}
-      priorityClassName: {{ coalesce .Values.priorityClassName .Values.global.priorityClassName }}
+    {{- if .Values.priorityClassName }}
+      priorityClassName: {{ .Values.priorityClassName }}
     {{- end }}
       containers:
       - name: {{ .Chart.Name }}
-{{- if .Values.autosharding.enabled }}
+        {{- if .Values.autosharding.enabled }}
         env:
         - name: POD_NAME
           valueFrom:
@@ -54,151 +53,99 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-{{- end }}
+        {{- end }}
         args:
-{{  if .Values.collectors.certificatesigningrequests  }}
-        - --collectors=certificatesigningrequests
-{{  end  }}
-{{  if .Values.collectors.configmaps  }}
-        - --collectors=configmaps
-{{  end  }}
-{{  if .Values.collectors.cronjobs  }}
-        - --collectors=cronjobs
-{{  end  }}
-{{ if .Values.collectors.daemonsets  }}
-        - --collectors=daemonsets
-{{  end  }}
-{{  if .Values.collectors.deployments  }}
-        - --collectors=deployments
-{{  end  }}
-{{  if .Values.collectors.endpoints  }}
-        - --collectors=endpoints
-{{  end  }}
-{{  if .Values.collectors.horizontalpodautoscalers  }}
-        - --collectors=horizontalpodautoscalers
-{{  end  }}
-{{  if .Values.collectors.ingresses  }}
-        - --collectors=ingresses
-{{  end  }}
-{{  if .Values.collectors.jobs  }}
-        - --collectors=jobs
-{{  end  }}
-{{  if .Values.collectors.limitranges  }}
-        - --collectors=limitranges
-{{  end  }}
-{{  if .Values.collectors.mutatingwebhookconfigurations  }}
-        - --collectors=mutatingwebhookconfigurations
-{{  end  }}
-{{  if .Values.collectors.namespaces  }}
-        - --collectors=namespaces
-{{  end  }}
-{{  if .Values.collectors.networkpolicies  }}
-        - --collectors=networkpolicies
-{{  end  }}
-{{  if .Values.collectors.nodes  }}
-        - --collectors=nodes
-{{  end  }}
-{{  if .Values.collectors.persistentvolumeclaims  }}
-        - --collectors=persistentvolumeclaims
-{{  end  }}
-{{  if .Values.collectors.persistentvolumes  }}
-        - --collectors=persistentvolumes
-{{  end  }}
-{{  if .Values.collectors.poddisruptionbudgets  }}
-        - --collectors=poddisruptionbudgets
-{{  end  }}
-{{  if .Values.collectors.pods  }}
-        - --collectors=pods
-{{  end  }}
-{{  if .Values.collectors.replicasets  }}
-        - --collectors=replicasets
-{{  end  }}
-{{  if .Values.collectors.replicationcontrollers  }}
-        - --collectors=replicationcontrollers
-{{  end  }}
-{{  if .Values.collectors.resourcequotas  }}
-        - --collectors=resourcequotas
-{{  end  }}
-{{  if .Values.collectors.secrets  }}
-        - --collectors=secrets
-{{  end  }}
-{{  if .Values.collectors.services  }}
-        - --collectors=services
-{{  end  }}
-{{  if .Values.collectors.statefulsets  }}
-        - --collectors=statefulsets
-{{  end  }}
-{{  if .Values.collectors.storageclasses  }}
-        - --collectors=storageclasses
-{{  end  }}
-{{  if .Values.collectors.validatingwebhookconfigurations  }}
-        - --collectors=validatingwebhookconfigurations
-{{  end  }}
-{{  if .Values.collectors.verticalpodautoscalers  }}
-        - --collectors=verticalpodautoscalers
-{{  end  }}
-{{  if .Values.collectors.volumeattachments  }}
-        - --collectors=volumeattachments
-{{  end  }}
-{{ if .Values.namespace }}
-        - --namespace={{ .Values.namespace }}
-{{ end }}
-{{ if .Values.autosharding.enabled }}
+        {{-  if .Values.extraArgs  }}
+        {{- range .Values.extraArgs  }}
+        - {{ . }}
+        {{- end  }}
+        {{-  end  }}
+        {{- if .Values.service.port }}
+        - --port={{ .Values.service.port | default 8080}}
+        {{-  end  }}
+        {{-  if .Values.collectors  }}
+        - --resources={{ .Values.collectors | join "," }}
+        {{-  end  }}
+        {{- if .Values.metricLabelsAllowlist }}
+        - --metric-labels-allowlist={{ .Values.metricLabelsAllowlist | join "," }}
+        {{- end }}
+        {{- if .Values.metricAnnotationsAllowList }}
+        - --metric-annotations-allowlist={{ .Values.metricAnnotationsAllowList | join "," }}
+        {{- end }}
+        {{- if .Values.metricAllowlist }}
+        - --metric-allowlist={{ .Values.metricAllowlist | join "," }}
+        {{- end }}
+        {{- if .Values.metricDenylist }}
+        - --metric-denylist={{ .Values.metricDenylist | join "," }}
+        {{- end }}
+        {{- if .Values.namespaces }}
+        - --namespaces={{ tpl (.Values.namespaces | join ",") $ }}
+        {{- end }}
+        {{- if .Values.autosharding.enabled }}
         - --pod=$(POD_NAME)
         - --pod-namespace=$(POD_NAMESPACE)
-{{ end }}
-{{ if .Values.kubeconfig.enabled }}
+        {{- end }}
+        {{- if .Values.kubeconfig.enabled }}
         - --kubeconfig=/opt/k8s/.kube/config
-{{ end }}
-{{- if .Values.kubeconfig.enabled }}
+        {{- end }}
+        {{- if .Values.selfMonitor.telemetryHost }}
+        - --telemetry-host={{ .Values.selfMonitor.telemetryHost }}
+        {{- end }}
+        - --telemetry-port={{ .Values.selfMonitor.telemetryPort | default 8081 }}
+        {{- if .Values.kubeconfig.enabled }}
         volumeMounts:
         - name: kubeconfig
           mountPath: /opt/k8s/.kube/
           readOnly: true
-{{- end }}
+        {{- end }}
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         image: "{{ include "imageurl" (dict "reg" .Values.global.containerRegistry "img" .Values.global.images.kube_state_metrics) }}"
         ports:
-        - containerPort: 8080
+        - containerPort: {{ .Values.service.port | default 8080}}
+          name: "http"
+        {{- if .Values.selfMonitor.enabled }}
+        - containerPort: {{ .Values.selfMonitor.telemetryPort | default 8081 }}
+          name: "metrics"
+        {{- end }}
         livenessProbe:
           httpGet:
             path: /healthz
-            port: 8080
+            port: {{ .Values.service.port | default 8080}}
           initialDelaySeconds: 5
           timeoutSeconds: 5
         readinessProbe:
           httpGet:
             path: /
-            port: 8080
+            port: {{ .Values.service.port | default 8080}}
           initialDelaySeconds: 5
           timeoutSeconds: 5
-{{- if .Values.resources }}
+        {{- if .Values.resources }}
         resources:
 {{ toYaml .Values.resources | indent 10 }}
 {{- end }}
-{{- if .Values.securityContext }}
+{{- if .Values.containerSecurityContext }}
         securityContext:
-{{ toYaml .Values.securityContext | indent 10 }}
+{{ toYaml .Values.containerSecurityContext | indent 10 }}
 {{- end }}
 {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
 {{ toYaml .Values.imagePullSecrets | indent 8 }}
-{{- end }}
-{{- if .Values.affinity }}
+      {{- end }}
+      {{- if .Values.affinity }}
       affinity:
 {{ toYaml .Values.affinity | indent 8 }}
-{{- end }}
-{{- if .Values.nodeSelector }}
+      {{- end }}
+      {{- if .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 8 }}
-{{- end }}
-{{- if .Values.tolerations }}
+      {{- end }}
+      {{- if .Values.tolerations }}
       tolerations:
 {{ toYaml .Values.tolerations | indent 8 }}
-{{- end }}
-{{- if .Values.kubeconfig.enabled}}
+      {{- end }}
+      {{- if .Values.kubeconfig.enabled}}
       volumes:
         - name: kubeconfig
           secret:
             secretName: {{ template "kube-state-metrics.fullname" . }}-kubeconfig
-{{- end }}
+      {{- end }}

resources/monitoring/charts/kube-state-metrics/templates/kubeconfig-secret.yaml

@@ -5,7 +5,7 @@ metadata:
   name: {{ template "kube-state-metrics.fullname" . }}-kubeconfig
   namespace: {{ template "kube-state-metrics.namespace" . }}
   labels:
-    {{- include "kube-state-metrics.labels" . | nindent 4 }}
+    {{- include "kube-state-metrics.labels" . | indent 4 }}
 type: Opaque
 data:
   config: '{{ .Values.kubeconfig.secret }}'