Expose Zap image as helm config value

J12934 · rfelber · commit b84357cd9648 · 2020-10-19T11:28:51.000+02:00
diff --git a/scanners/zap/Chart.yaml b/scanners/zap/Chart.yaml
@@ -5,7 +5,7 @@ description: A Helm chart for the OWASP ZAP security scanner that integrates wit
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
 version: latest
-appVersion: v2.9.0
+appVersion: "w2020-10-13"
 kubeVersion: ">=v1.11.0"
 
 keywords:
diff --git a/scanners/zap/templates/zap-scan-type.yaml b/scanners/zap/templates/zap-scan-type.yaml
@@ -16,7 +16,7 @@ spec:
           restartPolicy: Never
           containers:
             - name: zap-baseline
-              image: owasp/zap2docker-weekly:w2020-09-29
+              image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
               command:
                 - "zap-baseline.py"
                 # Force Zap to always return a zero exit code. k8s would otherwise try to restart zap.
@@ -57,7 +57,7 @@ spec:
           restartPolicy: Never
           containers:
             - name: zap-api-scan
-              image: owasp/zap2docker-weekly:w2020-09-29
+              image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
               command:
                 - "zap-api-scan.py"
                 # Force Zap to always return a zero exit code. k8s would otherwise try to restart zap.
@@ -98,7 +98,7 @@ spec:
           restartPolicy: Never
           containers:
             - name: zap-full-scan
-              image: owasp/zap2docker-weekly:w2020-09-29
+              image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
               command:
                 - "zap-full-scan.py"
                 # Force Zap to always return a zero exit code. k8s would otherwise try to restart zap.
diff --git a/scanners/zap/values.yaml b/scanners/zap/values.yaml
@@ -1,3 +1,9 @@
+image:
+  # image.repository -- Container Image to run the scan
+  repository: owasp/zap2docker-weekly
+  # image.tag - defaults to the charts appVersion
+  tag: null
+
 parserImage:
   # parserImage.repository -- Parser image repository
   repository: docker.io/scbexperimental/parser-zap
