From d89e59e335e9e10a0cd54909661c46d857f4f354 Mon Sep 17 00:00:00 2001 From: Lukas Fischer Date: Fri, 13 Oct 2023 13:17:11 +0200 Subject: [PATCH] #2024 Use ZAP Docker images from SSP repo ZAP switched from OWASP to the Software Security Project, which means their containers are published under a different organisation now. Alternatively they also publish their containers to GHCR under https://github.com/zaproxy/zaproxy/pkgs/container/zaproxy Signed-off-by: Lukas Fischer --- .../tests/__snapshot__/scanner_test.yaml.snap | 2 +- scanners/zap-advanced/values.yaml | 2 +- scanners/zap/tests/__snapshot__/scanner_test.yaml.snap | 8 ++++---- scanners/zap/values.yaml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scanners/zap-advanced/tests/__snapshot__/scanner_test.yaml.snap b/scanners/zap-advanced/tests/__snapshot__/scanner_test.yaml.snap index 38acdd7172..9f5770a1db 100644 --- a/scanners/zap-advanced/tests/__snapshot__/scanner_test.yaml.snap +++ b/scanners/zap-advanced/tests/__snapshot__/scanner_test.yaml.snap @@ -148,7 +148,7 @@ matches the snapshot: - api.disablekey=true env: [] envFrom: [] - image: owasp/zap2docker-stable:0.0.0 + image: softwaresecurityproject/zap-stable:0.0.0 imagePullPolicy: IfNotPresent name: zap-sidecar ports: diff --git a/scanners/zap-advanced/values.yaml b/scanners/zap-advanced/values.yaml index 85b2b045bd..716664e4d7 100644 --- a/scanners/zap-advanced/values.yaml +++ b/scanners/zap-advanced/values.yaml @@ -127,7 +127,7 @@ scanner: zapContainer: image: # -- Container Image to run the scan - repository: owasp/zap2docker-stable + repository: softwaresecurityproject/zap-stable # -- defaults to the charts appVersion tag: null # -- Image pull policy. One of Always, Never, IfNotPresent. Defaults to Always if :latest tag is specified, or IfNotPresent otherwise. More info: https://kubernetes.io/docs/concepts/containers/images#updating-images diff --git a/scanners/zap/tests/__snapshot__/scanner_test.yaml.snap b/scanners/zap/tests/__snapshot__/scanner_test.yaml.snap index 414defe8b1..8d4379a29f 100644 --- a/scanners/zap/tests/__snapshot__/scanner_test.yaml.snap +++ b/scanners/zap/tests/__snapshot__/scanner_test.yaml.snap @@ -88,7 +88,7 @@ matches the snapshot: - ../../home/securecodebox/zap-results.xml env: [] envFrom: [] - image: owasp/zap2docker-stable:0.0.0 + image: softwaresecurityproject/zap-stable:0.0.0 imagePullPolicy: IfNotPresent name: zap-baseline-scan resources: @@ -139,7 +139,7 @@ matches the snapshot: - ../../home/securecodebox/zap-results.xml env: [] envFrom: [] - image: owasp/zap2docker-stable:0.0.0 + image: softwaresecurityproject/zap-stable:0.0.0 name: zap-api-scan resources: foo: bar @@ -187,7 +187,7 @@ matches the snapshot: - ../../home/securecodebox/zap-results.xml env: [] envFrom: [] - image: owasp/zap2docker-stable:0.0.0 + image: softwaresecurityproject/zap-stable:0.0.0 imagePullPolicy: IfNotPresent name: zap-full-scan resources: @@ -234,7 +234,7 @@ matches the snapshot: - -cmd env: [] envFrom: [] - image: owasp/zap2docker-stable:0.0.0 + image: softwaresecurityproject/zap-stable:0.0.0 imagePullPolicy: IfNotPresent name: zap-automation-scan resources: diff --git a/scanners/zap/values.yaml b/scanners/zap/values.yaml index d9bfed3856..d391bd2eaa 100644 --- a/scanners/zap/values.yaml +++ b/scanners/zap/values.yaml @@ -35,7 +35,7 @@ parser: scanner: image: # scanner.image.repository -- Container Image to run the scan - repository: owasp/zap2docker-stable + repository: softwaresecurityproject/zap-stable # scanner.image.tag -- defaults to the charts appVersion tag: null # -- Image pull policy. One of Always, Never, IfNotPresent. Defaults to Always if :latest tag is specified, or IfNotPresent otherwise. More info: https://kubernetes.io/docs/concepts/containers/images#updating-images