[kube-prometheus-stack] allow extraManifests as map/list

charts/kube-prometheus-stack/Chart.yaml

@@ -31,7 +31,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 70.3.0
+version: 70.4.0
 appVersion: v0.81.0
 kubeVersion: ">=1.19.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus

charts/kube-prometheus-stack/ci/03-non-defaults-values.yaml

@@ -1,5 +1,9 @@
 # this file tests some non default values to increase the test coverage
 
+commonLabels:
+  foo: one
+  bar: two
+
 defaultRules:
   additionalRuleLabels:
     key: value
@@ -93,3 +97,25 @@ nodeExporter:
 prometheus-node-exporter:
   kubeRBACProxy:
     enabled: true
+
+extraObjects:
+  - apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      name: test-cm
+    data:
+      plaintext: foobar
+      templated: '{{ print "foobar" | upper }}'
+  - |
+    apiVersion: v1
+    kind: Secret
+    type: Opaque
+    metadata:
+      name: test-secret
+      labels:
+        {{- range $key, $value := .Values.commonLabels }}
+        {{ $key }}: {{ $value }}
+        {{- end }}
+    data:
+      plaintext: Zm9vYmFy
+      templated: '{{ print "foobar" | upper | b64enc }}'

charts/kube-prometheus-stack/ci/05-ingress-and-gateway-routes-values.yaml

@@ -88,3 +88,22 @@ thanosRuler:
             - path:
                 type: PathPrefix
                 value: /foo/
+
+extraObjects:
+  configmap:
+    apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      name: test-cm
+    data:
+      plaintext: foobar
+      templated: '{{ print "foobar" | upper }}'
+  secret: |
+    apiVersion: v1
+    kind: Secret
+    type: Opaque
+    metadata:
+      name: test-secret
+    data:
+      plaintext: Zm9vYmFy
+      templated: '{{ print "foobar" | upper | b64enc }}'

charts/kube-prometheus-stack/templates/extra-objects.yaml

@@ -1,4 +1,15 @@
-{{ range .Values.extraManifests }}
+{{- /* Normalize extraObjects to a list, easier to loop over */ -}}
+{{- $extraObjects := .Values.extraManifests | default (list) -}}
+
+{{- if kindIs "map" $extraObjects -}}
+  {{- $extraObjects = values $extraObjects -}}
+{{- end -}}
+
+{{- range $extraObjects }}
 ---
-{{ tpl (toYaml .) $ }}
-{{ end }}
+  {{- if kindIs "map" . }}
+    {{- tpl (toYaml .) $ | nindent 0 }}
+  {{- else if kindIs "string" . }}
+    {{- tpl . $ | nindent 0 }}
+  {{- end }}
+{{- end }}

charts/kube-prometheus-stack/values.yaml

@@ -5300,12 +5300,29 @@ thanosRuler:
 ##
 cleanPrometheusOperatorObjectNames: false
 
-## Extra manifests to deploy as an array
-extraManifests: []
+## Extra manifests to deploy.  Can be of type dict or list.
+## If dict, keys are ignored and only values are used.
+## Items contained within extraObjects can be defined as dict or string and are passed through tpl.
+extraManifests: null
   # - apiVersion: v1
   #   kind: ConfigMap
   #   metadata:
   #   labels:
   #     name: prometheus-extra
   #   data:
   #     extra-data: "value"
+  #
+  # can also be defined as a string, useful for templating field names
+  # - |
+  #   apiVersion: v1
+  #   kind: Secret
+  #   type: Opaque
+  #   metadata:
+  #     name: super-secret
+  #     labels:
+  #       {{- range $key, $value := .Values.commonLabels }}
+  #       {{ $key }}: {{ $value }}
+  #       {{- end }}
+  #   data:
+  #     plaintext: Zm9vYmFy
+  #     templated: '{{ print "foobar" | upper | b64enc }}'