[kube-state-metrics] Allow adding volumeMounts and volumes in deploym…

…ent (#2296) * [kube-state-metrics] Allow adding volumeMounts and volumes in deployment Signed-off-by: Gadi Sneh gadisn@gmail.com Signed-off-by: gadisn <gadisn@users.noreply.github.com> * Add deployment template changes Signed-off-by: gadisn <gadisn@users.noreply.github.com> * Bump chart version Signed-off-by: gadisn <gadisn@users.noreply.github.com> * Bump minor instead of patch Signed-off-by: gadisn <gadisn@users.noreply.github.com> * CR fix - indentation for 'end' Signed-off-by: gadisn <gadisn@users.noreply.github.com> * CR fix - typo in 'beloe' Signed-off-by: gadisn <gadisn@users.noreply.github.com> * Bump version again to 4.15.0 Signed-off-by: gadisn <gadisn@users.noreply.github.com>
prometheus-community · Aug 2, 2022 · b48194c · b48194c
1 parent 6d7102e
commit b48194c
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/charts/kube-state-metrics/Chart.yaml b/charts/kube-state-metrics/Chart.yaml
@@ -7,7 +7,7 @@ keywords:
 - prometheus
 - kubernetes
 type: application
-version: 4.14.0
+version: 4.15.0
 appVersion: 2.5.0
 home: https://github.com/kubernetes/kube-state-metrics/
 sources:

diff --git a/charts/kube-state-metrics/templates/deployment.yaml b/charts/kube-state-metrics/templates/deployment.yaml
@@ -93,12 +93,17 @@ spec:
         - --telemetry-host={{ .Values.selfMonitor.telemetryHost }}
         {{- end }}
         - --telemetry-port={{ .Values.selfMonitor.telemetryPort | default 8081 }}
-        {{- if .Values.kubeconfig.enabled }}
+        {{- if or (.Values.kubeconfig.enabled) (.Values.volumeMounts) }}
         volumeMounts:
+        {{- if .Values.kubeconfig.enabled }}
         - name: kubeconfig
           mountPath: /opt/k8s/.kube/
           readOnly: true
         {{- end }}
+        {{- if .Values.volumeMounts }}
+{{ toYaml .Values.volumeMounts | indent 8 }}
+        {{- end }}
+        {{- end }}
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         ports:
@@ -148,9 +153,14 @@ spec:
       topologySpreadConstraints:
 {{ toYaml .Values.topologySpreadConstraints | indent 8 }}
       {{- end }}
-      {{- if .Values.kubeconfig.enabled}}
+      {{- if or (.Values.kubeconfig.enabled) (.Values.volumes) }}
       volumes:
+      {{- if .Values.kubeconfig.enabled}}
         - name: kubeconfig
           secret:
             secretName: {{ template "kube-state-metrics.fullname" . }}-kubeconfig
       {{- end }}
+      {{- if .Values.volumes }}
+{{ toYaml .Values.volumes | indent 8 }}
+      {{- end }}
+      {{- end }}
diff --git a/charts/kube-state-metrics/values.yaml b/charts/kube-state-metrics/values.yaml
@@ -249,3 +249,16 @@ selfMonitor:
   # telemetryHost: 0.0.0.0
   # telemetryPort: 8081
   # telemetryNodePort: 0
+
+# volumeMounts are used to add custom volume mounts to deployment.
+# See example below
+volumeMounts: []
+#  - mountPath: /etc/config
+#    name: config-volume
+
+# volumes are used to add custom volumes to deployment
+# See example below
+volumes: []
+#  - configMap:
+#      name: cm-for-volume
+#    name: config-volume