SONAR-22528 Helm env valuesFrom regression

* SONAR-22528 Fixes env valuesFrom regression

* Updates changelogs

* Updates changelogs

Author: davividal

charts/sonarqube/CHANGELOG.md

@@ -4,6 +4,7 @@ All changes to this chart will be documented in this file.
 ## [10.6.1]
 * Update Chart's version to 10.6.1
 * Fix a typo in the new common STS template
+* Fix regression on env valuesFrom in the new STS template
 
 ## [10.6.0]
 * Update SonarQube to 10.6.0

charts/sonarqube/Chart.yaml

@@ -36,6 +36,8 @@ annotations:
       description: "Update Chart's version to 10.6.1"
     - kind: fixed
       description: "Fix typo in the new STS template"
+    - kind: fixed
+      description: "Fix regression on env valuesFrom in the new STS template"
   artifacthub.io/containsSecurityUpdates: "false"
   artifacthub.io/images: |
     - name: sonarqube

charts/sonarqube/templates/_pod.tpl

@@ -69,10 +69,7 @@ spec:
         - mountPath: /tmp/secrets/ca-certs
           name: ca-certs
       env:
-        {{- range (include "sonarqube.combined_env" . | fromJsonArray)  }}
-        - name: {{ .name }}
-          value: {{ .value | quote }}
-        {{- end }}
+        {{- (include "sonarqube.combined_env" . | fromJsonArray) | toYaml | trim | nindent 8 }}
     {{- end }}
     {{- if or .Values.initSysctl.enabled .Values.elasticsearch.configureNode }}
     - name: init-sysctl
@@ -89,10 +86,7 @@ spec:
         - name: init-sysctl
           mountPath: /tmp/scripts/
       env:
-        {{- range (include "sonarqube.combined_env" . | fromJsonArray)  }}
-        - name: {{ .name }}
-          value: {{ .value | quote }}
-        {{- end }}
+        {{- (include "sonarqube.combined_env" . | fromJsonArray) | toYaml | trim | nindent 8 }}
     {{- end }}
     {{- if or .Values.sonarProperties .Values.sonarSecretProperties .Values.sonarSecretKey (not .Values.elasticsearch.bootstrapChecks) }}
     - name: concat-properties
@@ -132,10 +126,7 @@ spec:
       resources: {{- toYaml . | nindent 8 }}
       {{- end }}
       env:
-        {{- range (include "sonarqube.combined_env" . | fromJsonArray)  }}
-        - name: {{ .name }}
-          value: {{ .value | quote }}
-        {{- end }}
+        {{- (include "sonarqube.combined_env" . | fromJsonArray) | toYaml | trim | nindent 8 }}
     {{- end }}
     {{- if .Values.prometheusExporter.enabled }}
     - name: inject-prometheus-exporter
@@ -160,10 +151,7 @@ spec:
           value: {{ default "" .Values.prometheusExporter.httpsProxy }}
         - name: no_proxy
           value: {{ default "" .Values.prometheusExporter.noProxy }}
-        {{- range (include "sonarqube.combined_env" . | fromJsonArray)  }}
-        - name: {{ .name }}
-          value: {{ .value | quote }}
-        {{- end }}
+        {{- (include "sonarqube.combined_env" . | fromJsonArray) | toYaml | trim | nindent 8 }}
     {{- end }}
     {{- if and .Values.persistence.enabled .Values.initFs.enabled }}
     - name: init-fs
@@ -236,10 +224,7 @@ spec:
           value: {{ default "" .Values.plugins.httpsProxy }}
         - name: no_proxy
           value: {{ default "" .Values.plugins.noProxy }}
-        {{- range (include "sonarqube.combined_env" . | fromJsonArray)  }}
-        - name: {{ .name }}
-          value: {{ .value | quote }}
-        {{- end }}
+        {{- (include "sonarqube.combined_env" . | fromJsonArray) | toYaml | trim | nindent 8 }}
     {{- end }}
   containers:
     {{- with .Values.extraContainers }}
@@ -279,10 +264,7 @@ spec:
               name: {{ include "sonarqube.fullname" . }}-monitoring-passcode
               key: SONAR_WEB_SYSTEMPASSCODE
             {{- end }}
-        {{- range (include "sonarqube.combined_env" . | fromJsonArray)  }}
-        - name: {{ .name }}
-          value: {{ .value | quote }}
-        {{- end }}
+        {{- (include "sonarqube.combined_env" . | fromJsonArray) | toYaml | trim | nindent 8 }}
       envFrom:
         - configMapRef:
             name: {{ include "sonarqube.fullname" . }}-jdbc-config