Merge branch 'master' into gcr

.github/workflows/k8s-apis-deprecation.yml

@@ -39,7 +39,7 @@ jobs:
 
       - name: "🛠️ Setup Pluto"
         # Pluto in the docs suggest to use master but would be better to tag a release version
-        uses: FairwindsOps/pluto/[email protected].5
+        uses: FairwindsOps/pluto/[email protected].6
 
       - name: "🔍 Inspecting ${{ matrix.charts_name }} against k8s ${{ matrix.k8s_version }}"
         id: inspecting

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.3
+### Bug Fixes
+* **cluster-scanner** [09c0c714](https://github.com/sysdiglabs/charts/commit/09c0c714333f9ba7c28954b5a688a22092e5db88): corrected onPremCompatibilityVersion to 7.0.0 ([#1466](https://github.com/sysdiglabs/charts/issues/1466))
 # v0.8.2
 ### New Features
 * **cluster-scanner** [e25f85b5](https://github.com/sysdiglabs/charts/commit/e25f85b5fa53b153a11c5f716a499daee4c70c3b): Enable platform services in US4 [SSPROD-32841] ([#1460](https://github.com/sysdiglabs/charts/issues/1460))

charts/cluster-scanner/Chart.yaml

@@ -4,7 +4,7 @@ description: Sysdig Cluster Scanner
 
 type: application
 
-version: 0.8.2
+version: 0.8.3
 
 appVersion: "0.1.0"
 home: https://www.sysdig.com/

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.8.2  \
+      --create-namespace -n sysdig --version=0.8.3  \
       --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.8.2 \
+       --create-namespace -n sysdig --version=0.8.3 \
        --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.8.2 \
+    --create-namespace -n sysdig --version=0.8.3 \
     --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.8.2 \
+    --create-namespace -n sysdig --version=0.8.3 \
     --values values.yaml
 ```
 

charts/cluster-scanner/RELEASE-NOTES.md

@@ -1,5 +1,5 @@
 # What's Changed
 
-### New Features
-- **cluster-scanner** [e25f85b5](https://github.com/sysdiglabs/charts/commit/e25f85b5fa53b153a11c5f716a499daee4c70c3b): Enable platform services in US4 [SSPROD-32841] ([#1460](https://github.com/sysdiglabs/charts/issues/1460))
-#### Full diff: https://github.com/sysdiglabs/charts/compare/cluster-scanner-0.8.1...cluster-scanner-0.8.2
+### Bug Fixes
+- **cluster-scanner** [09c0c714](https://github.com/sysdiglabs/charts/commit/09c0c714333f9ba7c28954b5a688a22092e5db88): corrected onPremCompatibilityVersion to 7.0.0 ([#1466](https://github.com/sysdiglabs/charts/issues/1466))
+#### Full diff: https://github.com/sysdiglabs/charts/compare/cluster-scanner-0.8.2...cluster-scanner-0.8.3

charts/cluster-scanner/templates/_helpers.tpl

@@ -206,11 +206,11 @@ Define the proper imageRegistry to use for imageSbomExtractor
 {{- end -}}
 
 {{/*
-Generates configmap data to enable platform services if onPremCompatibility version is not set, or it is greater than 6.6.0
+Generates configmap data to enable platform services if onPremCompatibility version is not set, or it is greater than 7.0.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" )) -}}
+{{- if ( semverCompare ">= 7.0.0" (.Values.onPremCompatibilityVersion | default "7.0.0" )) -}}
     {{- $regionsPlatformEnabled := list "us1" "us2" "us3" "us4" "au1" "eu1" -}}
     {{- if or (has .Values.global.sysdig.region $regionsPlatformEnabled) .Values.onPremCompatibilityVersion -}}
 enable_platform_services: "true"

charts/cluster-scanner/tests/configmap_test.yaml

@@ -359,7 +359,7 @@ tests:
           path: data.enable_platform_services
           value: "true"
 
-  - it: "has correct platform services value when onPremCompatibilityVersion is < 6.6 and region does NOT support platform services"
+  - it: "has correct platform services value when onPremCompatibilityVersion is < 7.0 and region does NOT support platform services"
     set:
       global.sysdig.apiHost: "http://test.com"
       onPremCompatibilityVersion: "6.5.99"
@@ -368,7 +368,7 @@ tests:
       - isNull:
           path: data.enable_platform_services
 
-  - it: "has correct platform services value when onPremCompatibilityVersion is < 6.6 and region supports platform services"
+  - it: "has correct platform services value when onPremCompatibilityVersion is < 7.0 and region supports platform services"
     set:
       global.sysdig.apiHost: "http://test.com"
       onPremCompatibilityVersion: "6.5.99"
@@ -395,20 +395,20 @@ tests:
       - 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"
+  - it: "has correct platform services value when onPremCompatibilityVersion is = 7.0.0 and region does NOT support platform services"
     set:
       global.sysdig.apiHost: "http://test.com"
-      onPremCompatibilityVersion: "6.6.0"
+      onPremCompatibilityVersion: "7.0.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"
+  - it: "has correct platform services value when onPremCompatibilityVersion is = 7.0.0 and region supports platform services"
     set:
       global.sysdig.apiHost: "http://test.com"
-      onPremCompatibilityVersion: "6.6.0"
+      onPremCompatibilityVersion: "7.0.0"
       global.sysdig.region: "us1"
     asserts:
       - equal:
@@ -418,16 +418,16 @@ tests:
   - it: "has correct platform services value when onPremCompatibilityVersion is just a major.minor version"
     set:
       global.sysdig.apiHost: "http://test.com"
-      onPremCompatibilityVersion: "6.6"
+      onPremCompatibilityVersion: "7.0"
     asserts:
       - equal:
           path: data.enable_platform_services
           value: "true"
 
-  - it: "has correct platform services value when onPremCompatibilityVersion is > 6.6.0"
+  - it: "has correct platform services value when onPremCompatibilityVersion is > 7.0.0"
     set:
       global.sysdig.apiHost: "http://test.com"
-      onPremCompatibilityVersion: "6.6.1"
+      onPremCompatibilityVersion: "7.0.1"
     asserts:
       - equal:
           path: data.enable_platform_services

charts/sysdig-deploy/CHANGELOG.md

@@ -10,6 +10,12 @@ 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.29.6
+### Bug Fixes
+* **cluster-scanner** [09c0c714](https://github.com/sysdiglabs/charts/commit/09c0c714333f9ba7c28954b5a688a22092e5db88): corrected onPremCompatibilityVersion to 7.0.0 ([#1466](https://github.com/sysdiglabs/charts/issues/1466))
+# v1.29.5
+### Chores
+* **sysdig-deploy** [a1fd1d5f](https://github.com/sysdiglabs/charts/commit/a1fd1d5fb8a96e8e09be367b728ef3cea3b522db): Automatic version bump due to updated dependencies ([#1463](https://github.com/sysdiglabs/charts/issues/1463))
 # v1.29.4
 ### Chores
 * **sysdig-deploy** [300e22e0](https://github.com/sysdiglabs/charts/commit/300e22e0bdbcdc5fcbe4cd2bf31fdb72d98d6bb7): Automatic version bump due to updated dependencies ([#1457](https://github.com/sysdiglabs/charts/issues/1457))

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.4
+version: 1.29.6
 maintainers:
   - name: AlbertoBarba
     email: [email protected]
@@ -42,7 +42,7 @@ dependencies:
   - name: cluster-scanner
     # repository: https://charts.sysdig.com
     repository: file://../cluster-scanner
-    version: ~0.8.1
+    version: ~0.8.3
     alias: clusterScanner
     condition: clusterScanner.enabled
   - name: kspm-collector

charts/sysdig-deploy/RELEASE-NOTES.md

@@ -1,5 +1,5 @@
 # What's Changed
 
-### Chores
-- **sysdig-deploy** [300e22e0](https://github.com/sysdiglabs/charts/commit/300e22e0bdbcdc5fcbe4cd2bf31fdb72d98d6bb7): Automatic version bump due to updated dependencies ([#1457](https://github.com/sysdiglabs/charts/issues/1457))
-#### Full diff: https://github.com/sysdiglabs/charts/compare/sysdig-deploy-1.29.3...sysdig-deploy-1.29.4
+### Bug Fixes
+- **cluster-scanner** [09c0c714](https://github.com/sysdiglabs/charts/commit/09c0c714333f9ba7c28954b5a688a22092e5db88): corrected onPremCompatibilityVersion to 7.0.0 ([#1466](https://github.com/sysdiglabs/charts/issues/1466))
+#### Full diff: https://github.com/sysdiglabs/charts/compare/sysdig-deploy-1.29.5...sysdig-deploy-1.29.6

charts/sysdig-deploy/ci/test-values.yaml.template

@@ -4,3 +4,7 @@ global:
   sysdig:
     accessKey: ${SECURE_AGENT_TOKEN}
     secureAPIToken: ${SECURE_API_TOKEN}
+nodeAnalyzer:
+  nodeAnalyzer:
+    benchmarkRunner:
+      deploy: false