Changing sslVerifyCertificate flag logic, container value take the pr…

…ecedence Signed-off-by: Daniele De Lorenzi <[email protected]>
sysdiglabs · Nov 3, 2023 · 5a625c2 · 5a625c2
1 parent daf44fd
commit 5a625c2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 28 deletions.
diff --git a/charts/node-analyzer/Chart.yaml b/charts/node-analyzer/Chart.yaml
@@ -3,7 +3,7 @@ name: node-analyzer
 description: Sysdig Node Analyzer
 
 # currently matching Sysdig's appVersion 1.14.34
-version: 1.18.2
+version: 1.18.3
 appVersion: 12.8.0
 keywords:
   - monitoring

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 -}}
 
 {{/*

diff --git a/charts/sysdig-deploy/Chart.yaml b/charts/sysdig-deploy/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: sysdig-deploy
 description: A chart with various Sysdig components for Kubernetes
 type: application
-version: 1.29.2
+version: 1.29.3
 maintainers:
   - name: AlbertoBarba
     email: [email protected]
@@ -36,7 +36,7 @@ dependencies:
   - name: node-analyzer
     # repository: https://charts.sysdig.com
     repository: file://../node-analyzer
-    version: ~1.18.2
+    version: ~1.18.3
     alias: nodeAnalyzer
     condition: nodeAnalyzer.enabled
   - name: cluster-scanner