Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: feat(node-analyzer,cluster-scanner): resolving bug with nodeAnalyzer and clusterScanner condition. #1479

Merged
merged 8 commits into from
Nov 16, 2023
Merged

fix: feat(node-analyzer,cluster-scanner): resolving bug with nodeAnalyzer and clusterScanner condition. #1479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c9537bd
feat: add asdf .tools-versions as part of .gitignore
IgorEulalio Nov 16, 2023
8ce4a01
feat: fixing bug with helm versions below 3.12.3 where nodeAnalyzer n…
IgorEulalio Nov 16, 2023
41aa180
feat: bump version to 1.29.9
IgorEulalio Nov 16, 2023
20fee4c
feat: remove troubleshooting-values file
IgorEulalio Nov 16, 2023
ebdcbd8
Merge branch 'master' into feature/SSPROD-33633
IgorEulalio Nov 16, 2023
bc375dd
feat: pre-commit check fix
IgorEulalio Nov 16, 2023
c745284
feat: bump version to 1.29.10
IgorEulalio Nov 16, 2023
2c9f9fa
Merge branch 'master' into feature/SSPROD-33633
IgorEulalio Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,3 +145,6 @@ Chart.lock
*.envrc
.vscode
.local

# ASDF config
.tool-versions
2 changes: 1 addition & 1 deletion charts/sysdig-deploy/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
11 changes: 10 additions & 1 deletion charts/sysdig-deploy/templates/cluster-scanner-runtime-scanner-check.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 -}}
21 changes: 21 additions & 0 deletions charts/sysdig-deploy/tests/scannerconstraint_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading