Changing sslVerifyCertificate flag logic, container value take the pr…

…ecedence Signed-off-by: Daniele De Lorenzi <[email protected]>
sysdiglabs · Nov 3, 2023 · 391b7a2 · 391b7a2
1 parent daf44fd
commit 391b7a2
Showing 1 changed file with 10 additions and 25 deletions.
diff --git a/charts/node-analyzer/templates/_helpers.tpl b/charts/node-analyzer/templates/_helpers.tpl
@@ -117,55 +117,40 @@ Return the proper image name for the CSPM Analyzer
  Helper to define skip of SSL Certificate for Runtime Scanner and Eve Connector
 */}}
 {{- define "runtimeScanner.sslVerifyCertificate" -}}
-{{- if or (eq .Values.nodeAnalyzer.runtimeScanner.sslVerifyCertificate false) (eq .Values.nodeAnalyzer.sslVerifyCertificate false) (eq .Values.global.sslVerifyCertificate false) -}}
-    "false"
-{{- else -}}
-    "true"
-{{- end -}}
+{{- $sslVerifyCertificate := coalesce (.Values.nodeAnalyzer.runtimeScanner.sslVerifyCertificate | quote) (.Values.nodeAnalyzer.sslVerifyCertificate | quote) (.Values.global.sslVerifyCertificate | quote) ("true" | quote) -}}
+{{ $sslVerifyCertificate }}
 {{- end -}}
 
 {{/*
  Helper to define skip of SSL Certificate for Host Scanner
 */}}
 {{- define "hostScanner.sslVerifyCertificate" -}}
-{{- if or (eq .Values.nodeAnalyzer.hostScanner.sslVerifyCertificate false) (eq .Values.nodeAnalyzer.sslVerifyCertificate false) (eq .Values.global.sslVerifyCertificate false) -}}
-    "false"
-{{- else -}}
-    "true"
-{{- end -}}
+{{- $sslVerifyCertificate := coalesce (.Values.nodeAnalyzer.hostScanner.sslVerifyCertificate | quote) (.Values.nodeAnalyzer.sslVerifyCertificate | quote) (.Values.global.sslVerifyCertificate | quote) ("true" | quote) -}}
+{{ $sslVerifyCertificate }}
 {{- end -}}
 
 {{/*
  Helper to define skip of SSL Certificate for Host Analyzer
 */}}
 {{- define "hostAnalyzer.sslVerifyCertificate" -}}
-{{- if or (eq .Values.nodeAnalyzer.hostAnalyzer.sslVerifyCertificate false) (eq .Values.nodeAnalyzer.sslVerifyCertificate false) (eq .Values.global.sslVerifyCertificate false) -}}
-    "false"
-{{- else -}}
-    "true"
-{{- end -}}
+{{- $sslVerifyCertificate := coalesce (.Values.nodeAnalyzer.hostAnalyzer.sslVerifyCertificate | quote) (.Values.nodeAnalyzer.sslVerifyCertificate | quote) (.Values.global.sslVerifyCertificate | quote) ("true" | quote) -}}
+{{ $sslVerifyCertificate }}
 {{- end -}}
 
 {{/*
  Helper to define skip of SSL Certificate for Image Analyzer
 */}}
 {{- define "imageAnalyzer.sslVerifyCertificate" -}}
-{{- if or (eq .Values.nodeAnalyzer.imageAnalyzer.sslVerifyCertificate false) (eq .Values.nodeAnalyzer.sslVerifyCertificate false) (eq .Values.global.sslVerifyCertificate false) -}}
-    "false"
-{{- else -}}
-    "true"
-{{- end -}}
+{{- $sslVerifyCertificate := coalesce (.Values.nodeAnalyzer.imageAnalyzer.sslVerifyCertificate | quote) (.Values.nodeAnalyzer.sslVerifyCertificate | quote) (.Values.global.sslVerifyCertificate | quote) ("true" | quote) -}}
+{{ $sslVerifyCertificate }}
 {{- end -}}
 
 {{/*
  Helper to define skip of SSL Certificate for Benchmark Runner
 */}}
 {{- define "benchmarkRunner.sslVerifyCertificate" -}}
-{{- if or (eq .Values.nodeAnalyzer.benchmarkRunner.sslVerifyCertificate false) (eq .Values.nodeAnalyzer.sslVerifyCertificate false) (eq .Values.global.sslVerifyCertificate false) -}}
-    "false"
-{{- else -}}
-    "true"
-{{- end -}}
+{{- $sslVerifyCertificate := coalesce (.Values.nodeAnalyzer.benchmarkRunner.sslVerifyCertificate | quote) (.Values.nodeAnalyzer.sslVerifyCertificate | quote) (.Values.global.sslVerifyCertificate | quote) ("true" | quote) -}}
+{{ $sslVerifyCertificate }}
 {{- end -}}
 
 {{/*