feat(helm): enhance extraObjects

operations/helm/charts/mimir-distributed/CHANGELOG.md

@@ -31,6 +31,7 @@ Entries should include a reference to the Pull Request that introduced the chang
 
 * [CHANGE] Set default memory ballast for ruler to 1GiB to reduce GC pressure during startup. #13376
 * [CHANGE] Set docker.io as the default registry for mimir image. #13267
+* [ENHANCEMENT] Enhanced `extraObjects` to support map format input where keys are ignored and values are extracted as manifests, improving flexibility for multiple values files input. #14193
 * [ENHANCEMENT] Add Support to customize gossip ring k8s service annotations. #12718
 * [ENHANCEMENT] Ruler querier and query-frontend: Add support for newly-introduced querier ring, which is used when performing query planning in query-frontends and distributing portions of the plan to queriers for execution. #13017
 * [ENHANCEMENT] Upgrade rollout-operator chart to [0.37.0](https://github.com/grafana/helm-charts/blob/main/charts/rollout-operator/README.md#upgrade-of-grafana-rollout-operator). Note required actions for upgrading the rollout-operator chart. #13245

operations/helm/charts/mimir-distributed/ci/offline/test-extra-objects-map-values.yaml

@@ -0,0 +1,22 @@
+# Pin kube version so results are the same for running in CI and locally where the installed kube version may be different.
+kubeVersionOverride: "1.29"
+
+# Test map format for extraObjects (keys are arbitrary, values are extracted as manifests)
+extraObjects:
+  myConfig:
+    kind: ConfigMap
+    apiVersion: v1
+    metadata:
+      name: extra-cm-{{ .Release.Name }}-map
+      namespace: '{{ .Release.Namespace }}'
+    data:
+      map.yml: "test.map-format: true"
+  mySecret:
+    kind: Secret
+    apiVersion: v1
+    metadata:
+      name: extra-secret-{{ .Release.Name }}-map
+      namespace: '{{ .Release.Namespace }}'
+    type: Opaque
+    stringData:
+      password: "test-password"

operations/helm/charts/mimir-distributed/templates/extra-manifests.yaml

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

operations/helm/charts/mimir-distributed/values.yaml

@@ -3921,21 +3921,29 @@ continuous_test:
   tolerations: []
   terminationGracePeriodSeconds: 30
 
-# -- Add dynamic manifests via values. Example:
+# -- Add dynamic manifests via values. Supports both list and map formats, useful when defining extraObjects from multiple (SOPS) values files. Examples:
+# As a list of objects:
 # extraObjects:
 # - kind: ConfigMap
 #   apiVersion: v1
 #   metadata:
 #     name: extra-cm-{{ .Release.Name }}
-#   data: |
+#   data:
 #     extra.yml: "does-my-install-need-extra-info: true"
-# alternatively, you can use strings, which lets you use the mimir defines:
+# As a list of strings (useful for using mimir template defines):
 # extraObjects:
 # - |
 #   kind: ConfigMap
 #   apiVersion: v1
 #   metadata:
 #     name: extra-cm-{{ .Release.Name }}
-#   data: |
-#     extra.yml: "{{ include some-mimir-define }}"
+#   data:
+#     extra.yml: "{{ include "some-mimir-define" . }}"
+# As a map (values will be extracted):
+# extraObjects:
+#   config1:
+#     kind: ConfigMap
+#     apiVersion: v1
+#     metadata:
+#       name: extra-cm-{{ .Release.Name }}
 extraObjects: []