Addresses PR comments

SonarSource · Nov 26, 2024 · 94c4679 · 94c4679
1 parent ae5e290
commit 94c4679
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/charts/sonarqube-dce/templates/_helpers.tpl b/charts/sonarqube-dce/templates/_helpers.tpl
@@ -229,6 +229,9 @@ Set sonarqube.jvmCEOpts
 
 {{/*
 Set sonarqube.log.jsonoutput
+Parameters:
+  - ctx: The context to use (required, normally should be '.')
+  - node: The node to use (required, ApplicationNodes or searchNodes)
 */}}
 {{- define "sonarqube.log.jsonoutput" -}}
   {{- $node := (get .ctx.Values .node) }}
@@ -407,7 +410,7 @@ Set combined_search_env, ensuring we don't have any duplicates with our features
 */}}
 {{- define "sonarqube.combined_search_env" -}}
 {{- $filteredEnv := list -}}
-{{- range $index,$val := .Values.ApplicationNodes.env -}}
+{{- range $index,$val := .Values.searchNodes.env -}}
   {{- if not (has $val.name (list "SONAR_LOG_JSONOUTPUT")) -}}
     {{- $filteredEnv = append $filteredEnv $val -}}
   {{- end -}}

diff --git a/tests/unit-compatibility-test/fixtures/sonarqube-dce/duplicated-env-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube-dce/duplicated-env-values.yaml
@@ -856,17 +856,6 @@ spec:
               ephemeral-storage: 1536M
               memory: 3072M
           env:
-            - name: SONAR_WEB_CONTEXT
-              value: some/context
-            - name: SONAR_CE_JAVAOPTS
-              value: -Xms2G -Xmx2G -DsomeOption=some/Value
-            - name: SONAR_WEB_JAVAOPTS
-              value: -Xmx1g
-            - name: FOOBAR
-              valueFrom:
-                secretKeyRef:
-                  key: BARFOO
-                  name: sonarqube-ldap
             - name: SONAR_LOG_JSONOUTPUT
               value: "false"
             - name: SONAR_CLUSTER_ES_HOSTS
@@ -877,6 +866,8 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.name
+            - name: SONAR_LOG_JSONOUTPUT
+              value: "true"
           livenessProbe:
             exec:
               command:

diff --git a/tests/unit-compatibility-test/sonarqube-dce/duplicated-env-values.yaml b/tests/unit-compatibility-test/sonarqube-dce/duplicated-env-values.yaml
@@ -11,8 +11,14 @@ ApplicationNodes:
       secretKeyRef:
         name: "sonarqube-ldap"
         key: BARFOO
+
 prometheusExporter:
     enabled: true
     httpProxy: "http://someProxy"
     httpsProxy: "https://someProxy"
-    noProxy: "https://someUrl"
+    noProxy: "https://someUrl"
+
+searchNodes:
+  env:
+  - name: SONAR_LOG_JSONOUTPUT
+    value: "true"