Addresses PR comments

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

Hide file tree

Showing 5 changed files with 1,014 additions and 11 deletions.
diff --git a/charts/sonarqube-dce/templates/_helpers.tpl b/charts/sonarqube-dce/templates/_helpers.tpl
@@ -235,10 +235,8 @@ Parameters:
 */}}
 {{- define "sonarqube.log.jsonoutput" -}}
   {{- $node := (get .ctx.Values .node) }}
-  {{- $tempJsonOutput := "false" -}}
-  {{- if and .ctx.Values.logging (hasKey .ctx.Values.logging "jsonOutput" ) -}}
-    {{- $tempJsonOutput = (get .ctx.Values.logging "jsonOutput") | toString -}}
-  {{- else if and $node.sonarProperties (hasKey $node.sonarProperties "sonar.log.jsonOutput") -}}
+  {{- $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 -}}
@@ -255,7 +253,7 @@ Parameters:
       {{- end -}}
     {{- end -}}
   {{- end -}}
-  {{- printf "%s" $tempJsonOutput -}}
+  {{- printf "%s" ($tempJsonOutput | toString) -}}
 {{- end -}}
 
 {{/*

diff --git a/charts/sonarqube-dce/templates/sonarqube-search.yaml b/charts/sonarqube-dce/templates/sonarqube-search.yaml
@@ -269,9 +269,6 @@ spec:
                   key: SONAR_CLUSTER_ES_HTTP_SSL_KEYSTOREPASSWORD
             {{- end }}
             {{- end }}
-            {{- with .Values.searchNodes.env }}
-            {{- . | toYaml | trim | nindent 12 }}
-            {{- end }}
 {{- if or .Values.extraConfig.secrets .Values.extraConfig.configmaps }}
           envFrom:
 {{- range .Values.extraConfig.secrets }}