fix: feat(node-analyzer,cluster-scanner): resolving bug with nodeAnal…

…yzer and clusterScanner condition. (#1479)
sysdiglabs · Nov 16, 2023 · 16386ec · 16386ec
1 parent cdae3a7
commit 16386ec
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -145,3 +145,6 @@ Chart.lock
 *.envrc
 .vscode
 .local
+
+# ASDF config
+.tool-versions
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.9
+version: 1.29.10
 maintainers:
   - name: AlbertoBarba
     email: [email protected]

diff --git a/charts/sysdig-deploy/templates/cluster-scanner-runtime-scanner-check.yaml b/charts/sysdig-deploy/templates/cluster-scanner-runtime-scanner-check.yaml
@@ -1,3 +1,12 @@
-{{- if and .Values.clusterScanner.enabled .Values.nodeAnalyzer.enabled .Values.nodeAnalyzer.nodeAnalyzer.runtimeScanner.deploy ( include "deployRuntimeScanner" . ) -}}
+{{- $nodeAnalyzerEnabled := default false .Values.nodeAnalyzer.enabled -}}
+{{- $runtimeScannerDeploy := false -}}
+
+{{- if $nodeAnalyzerEnabled -}}
+  {{- if and (default dict .Values.nodeAnalyzer).nodeAnalyzer (default dict .Values.nodeAnalyzer.nodeAnalyzer).runtimeScanner -}}
+    {{- $runtimeScannerDeploy = default false .Values.nodeAnalyzer.nodeAnalyzer.runtimeScanner.deploy -}}
+  {{- end -}}
+{{- end -}}
+
+{{- if and $nodeAnalyzerEnabled $runtimeScannerDeploy .Values.clusterScanner.enabled -}}
 {{ fail "Cannot enable both the Runtime Scanner and the Cluster Scanner at the same time" }}
 {{- end -}}
diff --git a/charts/sysdig-deploy/tests/scannerconstraint_test.yaml b/charts/sysdig-deploy/tests/scannerconstraint_test.yaml
@@ -50,6 +50,27 @@ tests:
       - hasDocuments:
           count: 0
 
+  - it: Should not fail if node analyzer is entirely disabled and nested nodeAnalyzer object is not set
+    set:
+      nodeAnalyzer:
+        enabled: false
+      clusterScanner:
+        enabled: true
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: Should not fail if node analyzer is entirely disabled and nested nodeAnalyzer.runtimeScanner object is not set
+    set:
+      nodeAnalyzer:
+        enabled: false
+        nodeAnalyzer:
+      clusterScanner:
+        enabled: true
+    asserts:
+      - hasDocuments:
+          count: 0
+
   - it: Should not fail if runtime scanner is disabled
     set:
       nodeAnalyzer:
-Original file line number
+Diff line change
@@ Expand Up / @@ -145,3 +145,6 @@ Chart.lock @@
     *.envrc
     .vscode
     .local
+    # ASDF config
+    .tool-versions