diff --git a/charts/cluster-scanner/CHANGELOG.md b/charts/cluster-scanner/CHANGELOG.md index 3caf8c713..5a2e76cc0 100644 --- a/charts/cluster-scanner/CHANGELOG.md +++ b/charts/cluster-scanner/CHANGELOG.md @@ -10,6 +10,9 @@ Manual edits are supported only below '## Change Log' and should be used exclusively to fix incorrect entries and not to add new ones. ## Change Log +# v0.8.0 +### New Features +* **cluster-scanner** [23b421c6](https://github.com/sysdiglabs/charts/commit/23b421c60dafe24c2e777f38c490e7f88c2c42a4): Enable platform services only in regions which support them ([#1413](https://github.com/sysdiglabs/charts/issues/1413)) # v0.7.2 ### Bug Fixes * **cluster-scanner** [9b3864ff](https://github.com/sysdiglabs/charts/commit/9b3864fffdc9e8b7e8fdc96f8ed4902f945c34c7): removed unneeded version compatibility checks ([#1404](https://github.com/sysdiglabs/charts/issues/1404)) diff --git a/charts/cluster-scanner/Chart.yaml b/charts/cluster-scanner/Chart.yaml index 5b6a0b43c..8b481bcc4 100644 --- a/charts/cluster-scanner/Chart.yaml +++ b/charts/cluster-scanner/Chart.yaml @@ -4,7 +4,7 @@ description: Sysdig Cluster Scanner type: application -version: 0.7.2 +version: 0.8.0 appVersion: "0.1.0" home: https://www.sysdig.com/ diff --git a/charts/cluster-scanner/README.md b/charts/cluster-scanner/README.md index b4136848b..0c6bc58fd 100644 --- a/charts/cluster-scanner/README.md +++ b/charts/cluster-scanner/README.md @@ -25,7 +25,7 @@ $ pre-commit run -a $ helm repo add sysdig https://charts.sysdig.com $ helm repo update $ helm upgrade --install sysdig-cluster-scanner sysdig/cluster-scanner \ - --create-namespace -n sysdig --version=0.7.2 \ + --create-namespace -n sysdig --version=0.8.0 \ --set global.clusterConfig.name=CLUSTER_NAME \ --set global.sysdig.region=SYSDIG_REGION \ --set global.sysdig.accessKey=YOUR-KEY-HERE @@ -55,7 +55,7 @@ To install the chart with the release name `cluster-scanner`, run: ```console $ helm upgrade --install sysdig-cluster-scanner sysdig/cluster-scanner \ - --create-namespace -n sysdig --version=0.7.2 \ + --create-namespace -n sysdig --version=0.8.0 \ --set global.clusterConfig.name=CLUSTER_NAME \ --set global.sysdig.region=SYSDIG_REGION \ --set global.sysdig.accessKey=YOUR-KEY-HERE @@ -161,7 +161,7 @@ Specify each parameter using the **`--set key=value[,key=value]`** argument to ` ```console $ helm upgrade --install sysdig-cluster-scanner sysdig/cluster-scanner \ - --create-namespace -n sysdig --version=0.7.2 \ + --create-namespace -n sysdig --version=0.8.0 \ --set global.sysdig.region="us1" ``` @@ -170,7 +170,7 @@ installing the chart. For example: ```console $ helm upgrade --install sysdig-cluster-scanner sysdig/cluster-scanner \ - --create-namespace -n sysdig --version=0.7.2 \ + --create-namespace -n sysdig --version=0.8.0 \ --values values.yaml ``` diff --git a/charts/cluster-scanner/RELEASE-NOTES.md b/charts/cluster-scanner/RELEASE-NOTES.md index d4c815304..bbb192a0f 100644 --- a/charts/cluster-scanner/RELEASE-NOTES.md +++ b/charts/cluster-scanner/RELEASE-NOTES.md @@ -1,5 +1,5 @@ # What's Changed -### Bug Fixes -- **cluster-scanner** [9b3864ff](https://github.com/sysdiglabs/charts/commit/9b3864fffdc9e8b7e8fdc96f8ed4902f945c34c7): removed unneeded version compatibility checks ([#1404](https://github.com/sysdiglabs/charts/issues/1404)) -#### Full diff: https://github.com/sysdiglabs/charts/compare/cluster-scanner-0.7.1...cluster-scanner-0.7.2 +### New Features +- **cluster-scanner** [23b421c6](https://github.com/sysdiglabs/charts/commit/23b421c60dafe24c2e777f38c490e7f88c2c42a4): Enable platform services only in regions which support them ([#1413](https://github.com/sysdiglabs/charts/issues/1413)) +#### Full diff: https://github.com/sysdiglabs/charts/compare/cluster-scanner-0.7.2...cluster-scanner-0.8.0 diff --git a/charts/cluster-scanner/templates/_helpers.tpl b/charts/cluster-scanner/templates/_helpers.tpl index a26d4e5da..abe723e34 100644 --- a/charts/cluster-scanner/templates/_helpers.tpl +++ b/charts/cluster-scanner/templates/_helpers.tpl @@ -207,10 +207,14 @@ Define the proper imageRegistry to use for imageSbomExtractor {{/* Generates configmap data to enable platform services if onPremCompatibility version is not set, or it is greater than 6.6.0 +It also makes sure that the platform services are enabled in regions which support them when onPremCompatibility is not defined. */}} {{- define "cluster-scanner.enablePlatformServicesConfig" -}} {{- if ( semverCompare ">= 6.6.0" (.Values.onPremCompatibilityVersion | default "6.6.0" )) -}} + {{- $regionsPlatformEnabled := list "us1" "us2" "us3" "au1" "eu1" -}} + {{- if or (has .Values.global.sysdig.region $regionsPlatformEnabled) .Values.onPremCompatibilityVersion -}} enable_platform_services: "true" + {{- end -}} {{- end -}} {{- end -}} diff --git a/charts/cluster-scanner/tests/configmap_test.yaml b/charts/cluster-scanner/tests/configmap_test.yaml index 31ca041ad..865da59ef 100644 --- a/charts/cluster-scanner/tests/configmap_test.yaml +++ b/charts/cluster-scanner/tests/configmap_test.yaml @@ -342,34 +342,74 @@ tests: path: data.no_proxy value: "fake-no-proxy" - - it: "has correct platform services value when onPremCompatibilityVersion is NOT provided" + - it: "has correct platform services value when onPremCompatibilityVersion is NOT provided and region does NOT support platform services" set: global.sysdig.apiHost: "http://test.com" + global.sysdig.region: "" + asserts: + - isNull: + path: data.enable_platform_services + + - it: "has correct platform services value when onPremCompatibilityVersion is NOT provided and region supports platform services" + set: + global.sysdig.apiHost: "http://test.com" + global.sysdig.region: "us1" asserts: - equal: path: data.enable_platform_services value: "true" - - it: "has correct platform services value when onPremCompatibilityVersion is < 6.6" + - it: "has correct platform services value when onPremCompatibilityVersion is < 6.6 and region does NOT support platform services" set: global.sysdig.apiHost: "http://test.com" onPremCompatibilityVersion: "6.5.99" + global.sysdig.region: "" asserts: - isNull: path: data.enable_platform_services - - it: "has correct platform services value when onPremCompatibilityVersion is = 6.5" + - it: "has correct platform services value when onPremCompatibilityVersion is < 6.6 and region supports platform services" + set: + global.sysdig.apiHost: "http://test.com" + onPremCompatibilityVersion: "6.5.99" + global.sysdig.region: "us1" + asserts: + - isNull: + path: data.enable_platform_services + + - it: "has correct platform services value when onPremCompatibilityVersion is = 6.5 and region does NOT support platform services" set: global.sysdig.apiHost: "http://test.com" onPremCompatibilityVersion: "6.5" + global.sysdig.region: "" asserts: - isNull: path: data.enable_platform_services - - it: "has correct platform services value when onPremCompatibilityVersion is = 6.6.0" + - it: "has correct platform services value when onPremCompatibilityVersion is = 6.5 and region supports platform services" + set: + global.sysdig.apiHost: "http://test.com" + onPremCompatibilityVersion: "6.5" + global.sysdig.region: "us1" + asserts: + - isNull: + path: data.enable_platform_services + + - it: "has correct platform services value when onPremCompatibilityVersion is = 6.6.0 and region does NOT support platform services" + set: + global.sysdig.apiHost: "http://test.com" + onPremCompatibilityVersion: "6.6.0" + global.sysdig.region: "" + asserts: + - equal: + path: data.enable_platform_services + value: "true" + + - it: "has correct platform services value when onPremCompatibilityVersion is = 6.6.0 and region supports platform services" set: global.sysdig.apiHost: "http://test.com" onPremCompatibilityVersion: "6.6.0" + global.sysdig.region: "us1" asserts: - equal: path: data.enable_platform_services @@ -393,7 +433,6 @@ tests: path: data.enable_platform_services value: "true" - - it: "fails if onPremCompatibilityVersion is not a valid semver" set: global.sysdig.apiHost: "http://test.com" diff --git a/charts/sysdig-deploy/CHANGELOG.md b/charts/sysdig-deploy/CHANGELOG.md index 1c353f01d..4dfd8e0d8 100644 --- a/charts/sysdig-deploy/CHANGELOG.md +++ b/charts/sysdig-deploy/CHANGELOG.md @@ -10,6 +10,9 @@ Manual edits are supported only below '## Change Log' and should be used exclusively to fix incorrect entries and not to add new ones. ## Change Log +# v1.26.0 +### New Features +* **cluster-scanner** [23b421c6](https://github.com/sysdiglabs/charts/commit/23b421c60dafe24c2e777f38c490e7f88c2c42a4): Enable platform services only in regions which support them ([#1413](https://github.com/sysdiglabs/charts/issues/1413)) # v1.25.0 # v1.24.7 ### Chores diff --git a/charts/sysdig-deploy/Chart.yaml b/charts/sysdig-deploy/Chart.yaml index d318f3e36..c01b7a7a7 100644 --- 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.25.0 +version: 1.26.0 maintainers: - name: AlbertoBarba email: alberto.barba@sysdig.com @@ -42,7 +42,7 @@ dependencies: - name: cluster-scanner # repository: https://charts.sysdig.com repository: file://../cluster-scanner - version: ~0.7.2 + version: ~0.8.0 alias: clusterScanner condition: clusterScanner.enabled - name: kspm-collector diff --git a/charts/sysdig-deploy/RELEASE-NOTES.md b/charts/sysdig-deploy/RELEASE-NOTES.md index 316fe187f..0fa61b28e 100644 --- a/charts/sysdig-deploy/RELEASE-NOTES.md +++ b/charts/sysdig-deploy/RELEASE-NOTES.md @@ -1,3 +1,5 @@ # What's Changed -#### Full diff: https://github.com/sysdiglabs/charts/compare/sysdig-deploy-1.24.7...sysdig-deploy-1.25.0 +### New Features +- **cluster-scanner** [23b421c6](https://github.com/sysdiglabs/charts/commit/23b421c60dafe24c2e777f38c490e7f88c2c42a4): Enable platform services only in regions which support them ([#1413](https://github.com/sysdiglabs/charts/issues/1413)) +#### Full diff: https://github.com/sysdiglabs/charts/compare/sysdig-deploy-1.25.0...sysdig-deploy-1.26.0