Addresses comments

SonarSource · Nov 26, 2024 · 88f2ce4 · 88f2ce4
1 parent 26d388e
commit 88f2ce4
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/charts/sonarqube-dce/templates/_helpers.tpl b/charts/sonarqube-dce/templates/_helpers.tpl
@@ -238,16 +238,16 @@ Parameters:
   {{- $tempJsonOutput := default "false" (get .ctx.Values.logging "jsonOutput") -}}
   {{- if and $node.sonarProperties (hasKey $node.sonarProperties "sonar.log.jsonOutput") -}}
     {{- $tempJsonOutput = (get $node.sonarProperties "sonar.log.jsonOutput") -}}
-  {{- else if $node.env -}}
-    {{- range $index, $val := $node.env -}}
+  {{- end -}}
+  {{- if .ctx.Values.env -}}
+    {{- range $index, $val := .ctx.Values.env -}}
       {{- if eq $val.name "SONAR_LOG_JSONOUTPUT" -}}
         {{- $tempJsonOutput = $val.value -}}
       {{- end -}}
     {{- end -}}
-  {{- else if and .ctx.Values.sonarProperties (hasKey .ctx.Values.sonarProperties "sonar.log.jsonOutput") -}}
-    {{- $tempJsonOutput = (get .ctx.Values.sonarProperties "sonar.log.jsonOutput") -}}
-  {{- else if .ctx.Values.env -}}
-    {{- range $index, $val := .ctx.Values.env -}}
+  {{- end -}}
+  {{- if $node.env -}}
+    {{- range $index, $val := $node.env -}}
       {{- if eq $val.name "SONAR_LOG_JSONOUTPUT" -}}
         {{- $tempJsonOutput = $val.value -}}
       {{- end -}}