Merge branch 'main' into syft-vs-spdx

Signed-off-by: David Wertenteil <dwertent@armosec.io>
kubescape · Jan 22, 2024 · 3e171ec · 3e171ec
2 parents ac74afe + 9ebf743
commit 3e171ec
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 5 deletions.
diff --git a/.github/workflows/kubescape.yaml b/.github/workflows/kubescape.yaml
@@ -16,6 +16,7 @@ jobs:
         outputFile: results.sarif
         severityThreshold: critical
         account: ${{secrets.KUBESCAPE_ACCOUNT }}
+        accessKey: ${{secrets.KUBESCAPE_ACCESS_KEY }}
     - name: Upload Kubescape scan results to Github Code Scanning
       uses: github/codeql-action/upload-sarif@v2
       with:

diff --git a/charts/kubescape-operator/README.md b/charts/kubescape-operator/README.md
@@ -224,7 +224,6 @@ docker-compose logs uptrace
 | cloudProviderMetadata.aksClientID | string | `nil` | AKS client ID |
 | cloudProviderMetadata.aksClientSecret | string | `nil` | AKS client secret |
 | cloudProviderMetadata.aksTenantID | string | `nil` | AKS tenant ID |
-| triggerNewImageScan | bool | `false` | enable/disable trigger image scan for new images |
 | volumes | object | `[]` | Additional volumes for all containers |
 | volumeMounts | object | `[]` | Additional volumeMounts for all containers |
 

diff --git a/charts/kubescape-operator/templates/configs/cloudapi-configmap.yaml b/charts/kubescape-operator/templates/configs/cloudapi-configmap.yaml
@@ -29,7 +29,6 @@ data:
       "vulnScanURL": "{{ .Values.kubevuln.name }}:{{ .Values.kubevuln.service.port }}",
       "kubevulnURL": "{{ .Values.kubevuln.name }}:{{ .Values.kubevuln.service.port }}",
       "kubescapeURL": "{{ .Values.kubescape.name }}:{{ .Values.kubescape.service.port }}",
-      "triggerNewImageScan": "{{ .Values.triggerNewImageScan }}",
       "clusterName": "{{ regexReplaceAll "\\W+" .Values.clusterName "-" }}",
       "storage": {{ $components.storage.enabled }},
       "relevantImageVulnerabilitiesEnabled": {{ eq .Values.capabilities.relevancy "enable" }},

diff --git a/charts/kubescape-operator/tests/__snapshot__/snapshot_test.yaml.snap b/charts/kubescape-operator/tests/__snapshot__/snapshot_test.yaml.snap
@@ -114,7 +114,6 @@ all capabilities:
           "vulnScanURL": "kubevuln:8080",
           "kubevulnURL": "kubevuln:8080",
           "kubescapeURL": "kubescape:8080",
-          "triggerNewImageScan": "false",
           "clusterName": "kind-kind",
           "storage": true,
           "relevantImageVulnerabilitiesEnabled": true,
@@ -3139,7 +3138,6 @@ default capabilities:
           "vulnScanURL": "kubevuln:8080",
           "kubevulnURL": "kubevuln:8080",
           "kubescapeURL": "kubescape:8080",
-          "triggerNewImageScan": "false",
           "clusterName": "kind-kind",
           "storage": true,
           "relevantImageVulnerabilitiesEnabled": true,
@@ -6164,7 +6162,6 @@ minimal capabilities:
           "vulnScanURL": "kubevuln:8080",
           "kubevulnURL": "kubevuln:8080",
           "kubescapeURL": "kubescape:8080",
-          "triggerNewImageScan": "false",
           "clusterName": "kind-kind",
           "storage": true,
           "relevantImageVulnerabilitiesEnabled": true,