Expose all scanner images consistently via helm values

J12934 · rfelber · commit fe33618c8378 · 2020-10-19T11:28:51.000+02:00
diff --git a/scanners/amass/Chart.yaml b/scanners/amass/Chart.yaml
@@ -5,7 +5,7 @@ description: A Helm chart for the Amass security scanner that integrates with th
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
 version: latest
-appVersion: 3.10.4
+appVersion: "v3.10.4"
 kubeVersion: ">=v1.11.0"
 
 keywords:
diff --git a/scanners/amass/helm2.Chart.yaml b/scanners/amass/helm2.Chart.yaml
@@ -5,7 +5,7 @@ description: A Helm chart for the Amass security scanner that integrates with th
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
 version: latest
-appVersion: 3.10.4
+appVersion: "v3.10.4"
 kubeVersion: ">=v1.11.0"
 
 keywords:
diff --git a/scanners/amass/templates/amass-scan-type.yaml b/scanners/amass/templates/amass-scan-type.yaml
@@ -18,7 +18,7 @@ spec:
           restartPolicy: OnFailure
           containers:
             - name: amass
-              image: "caffix/amass:v{{ .Chart.AppVersion }}"
+              image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
               command:
                 - "amass"
                 - "enum"
diff --git a/scanners/amass/values.yaml b/scanners/amass/values.yaml
@@ -1,3 +1,9 @@
+image:
+  # image.repository -- Container Image to run the scan
+  repository: caffix/amass
+  # image.tag - defaults to the charts appVersion
+  tag: null
+
 parserImage:
   # parserImage.repository -- Parser image repository
   repository: docker.io/scbexperimental/parser-amass
diff --git a/scanners/kube-hunter/Chart.yaml b/scanners/kube-hunter/Chart.yaml
@@ -5,7 +5,7 @@ description: A Helm chart for the kube-hunter security scanner that integrates w
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
 version: latest
-appVersion: v0.3.0
+appVersion: "0.3.0"
 kubeVersion: ">=v1.11.0"
 
 keywords:
diff --git a/scanners/kube-hunter/helm2.Chart.yaml b/scanners/kube-hunter/helm2.Chart.yaml
@@ -5,7 +5,7 @@ description: A Helm chart for the kube-hunter security scanner that integrates w
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
 version: latest
-appVersion: v0.3.0
+appVersion: "0.3.0"
 kubeVersion: ">=v1.11.0"
 
 keywords:
diff --git a/scanners/kube-hunter/values.yaml b/scanners/kube-hunter/values.yaml
@@ -1,3 +1,9 @@
+image:
+  # image.repository -- Container Image to run the scan
+  repository: docker.io/securecodebox/scanner-kube-hunter
+  # image.tag -- defaults to the charts version
+  tag: null
+
 parserImage:
   # parserImage.repository -- Parser image repository
   repository: docker.io/scbexperimental/parser-kube-hunter
diff --git a/scanners/nikto/templates/nikto-scan-type.yaml b/scanners/nikto/templates/nikto-scan-type.yaml
@@ -16,7 +16,7 @@ spec:
           restartPolicy: Never
           containers:
             - name: nikto
-              image: securecodebox/scannner-nikto:latest
+              image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
               command:
                 # Nikto Entrypoint Script to avoid problems nikto exiting with a non zero exit code
                 # This would cause the kubernetes job to fail no matter what
diff --git a/scanners/nikto/values.yaml b/scanners/nikto/values.yaml
@@ -1,3 +1,9 @@
+image:
+  # image.repository -- Container Image to run the scan
+  repository: securecodebox/scannner-nikto
+  # image.tag - defaults to the charts appVersion
+  tag: null
+
 parserImage:
   # parserImage.repository -- Parser image repository
   repository: docker.io/scbexperimental/parser-nikto
diff --git a/scanners/nmap/values.yaml b/scanners/nmap/values.yaml
@@ -1,3 +1,9 @@
+image:
+  # image.repository -- Container Image to run the scan
+  repository: docker.io/securecodebox/scanner-nmap
+  # image.tag - defaults to the charts version
+  tag: null
+
 parserImage:
   # parserImage.repository -- Parser image repository
   repository: docker.io/scbexperimental/parser-nmap
diff --git a/scanners/ssh_scan/templates/ssh-scan-scan-type.yaml b/scanners/ssh_scan/templates/ssh-scan-scan-type.yaml
@@ -17,7 +17,7 @@ spec:
           restartPolicy: OnFailure
           containers:
             - name: ssh-scan
-              image: mozilla/ssh_scan@sha256:ebd76f798159844c0baca6b78cc324ba1966b11eb4f45118397a59d01f764c97
+              image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
               command:
                 - "/app/bin/ssh_scan"
                 - "--output"
diff --git a/scanners/ssh_scan/values.yaml b/scanners/ssh_scan/values.yaml
@@ -1,3 +1,9 @@
+image:
+  # image.repository -- Container Image to run the scan
+  repository: mozilla/ssh_scan
+  # image.tag - defaults to the charts appVersion
+  tag: "latest@sha256:ebd76f798159844c0baca6b78cc324ba1966b11eb4f45118397a59d01f764c97"
+
 parserImage:
   # parserImage.repository -- Parser image repository
   repository: docker.io/scbexperimental/parser-ssh-scan
diff --git a/scanners/sslyze/templates/sslyze-scan-type.yaml b/scanners/sslyze/templates/sslyze-scan-type.yaml
@@ -16,7 +16,7 @@ spec:
           restartPolicy: OnFailure
           containers:
             - name: sslyze
-              image: nablac0d3/sslyze@sha256:ff2c5c626401b1961736a5b2ae6e35a41d213e8b2712102100abf5ee46dcca71
+              image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
               command:
                 - 'sslyze'
                 - '--json_out'
diff --git a/scanners/sslyze/values.yaml b/scanners/sslyze/values.yaml
@@ -1,3 +1,9 @@
+image:
+  # image.repository -- Container Image to run the scan
+  repository: nablac0d3/sslyze
+  # image.tag - defaults to the charts appVersion
+  tag: "latest@sha256:ff2c5c626401b1961736a5b2ae6e35a41d213e8b2712102100abf5ee46dcca71"
+
 parserImage:
   # parserImage.repository -- Parser image repository
   repository: docker.io/scbexperimental/parser-sslyze
diff --git a/scanners/trivy/Chart.yaml b/scanners/trivy/Chart.yaml
@@ -5,7 +5,7 @@ description: A Helm chart for the trivy security scanner that integrates with th
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
 version: latest
-appVersion: v0.6.0
+appVersion: "0.6.0"
 kubeVersion: ">=v1.11.0"
 
 keywords:
diff --git a/scanners/trivy/helm2.Chart.yaml b/scanners/trivy/helm2.Chart.yaml
@@ -5,7 +5,7 @@ description: A Helm chart for the trivy security scanner that integrates with th
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
 version: latest
-appVersion: v0.6.0
+appVersion: "0.6.0"
 kubeVersion: ">=v1.11.0"
 
 keywords:
diff --git a/scanners/trivy/templates/trivy-scan-type.yaml b/scanners/trivy/templates/trivy-scan-type.yaml
@@ -17,7 +17,7 @@ spec:
           restartPolicy: OnFailure
           containers:
             - name: trivy
-              image: aquasec/trivy:0.6.0@sha256:61d42dbc030001463048f2f59fa034310fc114c7dee90b9dd9a9e3765dea7f5e
+              image: aquasec/trivy
               command:
                 - "trivy"
                 # Suppress progress bar, as it pollutes non interactive terminal logs
diff --git a/scanners/trivy/values.yaml b/scanners/trivy/values.yaml
@@ -1,3 +1,9 @@
+image:
+  # image.repository -- Container Image to run the scan
+  repository: aquasec/trivy
+  # image.tag - defaults to the charts appVersion
+  tag: "0.6.0@sha256:61d42dbc030001463048f2f59fa034310fc114c7dee90b9dd9a9e3765dea7f5e"
+
 parserImage:
   # parserImage.repository -- Parser image repository
   repository: docker.io/scbexperimental/parser-trivy
diff --git a/scanners/wpscan/templates/wpscan-scan-type.yaml b/scanners/wpscan/templates/wpscan-scan-type.yaml
@@ -17,7 +17,7 @@ spec:
           restartPolicy: OnFailure
           containers:
             - name: wpscan
-              image: wpscanteam/wpscan:latest
+              image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
               command:
                 - "wpscan"
                 - "-o"
diff --git a/scanners/wpscan/values.yaml b/scanners/wpscan/values.yaml
@@ -1,3 +1,9 @@
+image:
+  # image.repository -- Container Image to run the scan
+  repository: wpscanteam/wpscan
+  # image.tag - defaults to the charts appVersion
+  tag: null
+
 parserImage:
   # parserImage.repository -- Parser image repository
   repository: docker.io/scbexperimental/parser-wpscan
