wip

Signed-off-by: Armel Soro <[email protected]>

Author: rm3l

charts/backstage/Chart.yaml

@@ -38,4 +38,4 @@ sources:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.5.3
+version: 2.6.0

charts/backstage/README.md

@@ -2,7 +2,7 @@
 # Backstage Helm Chart
 
 [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/backstage)](https://artifacthub.io/packages/search?repo=backstage)
-![Version: 2.5.3](https://img.shields.io/badge/Version-2.5.3-informational?style=flat-square)
+![Version: 2.6.0](https://img.shields.io/badge/Version-2.6.0-informational?style=flat-square)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 A Helm chart for deploying a Backstage application

charts/backstage/templates/backstage-deployment.yaml

@@ -156,8 +156,16 @@ spec:
                   key: {{ include "backstage.postgresql.databaseSecretKey" . }}
             {{- end }}
             {{- if .Values.backstage.extraEnvVars }}
+            {{- if (kindIs "map" .Values.backstage.extraEnvVars) }}
+            {{- /* If extraEnvVars is a dict, Helm will merge it automatically by key */ -}}
+            {{- range $_, $value := .Values.backstage.extraEnvVars }}
+            - {{- include "common.tplvalues.render" ( dict "value" $value "context" $) | nindent 14 }}
+            {{- end }}
+            {{- else if (kindIs "slice" .Values.backstage.extraEnvVars) }}
+            {{- /* If extraEnvVars is a list, keep current behavior (no merging) */ -}}
             {{- include "common.tplvalues.render" ( dict "value" .Values.backstage.extraEnvVars "context" $) | nindent 12 }}
             {{- end }}
+            {{- end }}
           ports:
             - name: backend
               containerPort: {{ .Values.backstage.containerPorts.backend }}