Use correct Helm chart version in scanner / parser images

J12934 · J12934 · commit ecf959b25af3 · 2020-09-18T15:29:25.000+02:00
diff --git a/scanners/amass/Chart.yaml b/scanners/amass/Chart.yaml
@@ -4,7 +4,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: 0.1.0
+version: latest
 appVersion: 3.10.3
 
 keywords:
diff --git a/scanners/amass/templates/amass-parse-definition.yaml b/scanners/amass/templates/amass-parse-definition.yaml
@@ -4,4 +4,4 @@ metadata:
   name: "amass-jsonl"
 spec:
   handlesResultsType: amass-jsonl
-  image: "{{ .Values.parserImage.registry }}/{{ .Values.parserImage.repository }}:{{ .Values.parserImage.tag }}"
+  image: "{{ .Values.parserImage.repository }}:{{ .Values.parserImage.tag | default .Chart.Version }}"
diff --git a/scanners/amass/values.yaml b/scanners/amass/values.yaml
@@ -1,7 +1,7 @@
 parserImage:
-  registry: docker.io
-  repository: scbexperimental/parser-amass
-  tag: latest
+  repository: docker.io/scbexperimental/parser-amass
+  # parserImage.tag - defaults to the charts version
+  tag: null
 
 scannerJob:
   resources: {}
diff --git a/scanners/kube-hunter/Chart.yaml b/scanners/kube-hunter/Chart.yaml
@@ -4,8 +4,8 @@ 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: 0.1.0
-appVersion: 0.1.0
+version: latest
+appVersion: v0.3.0
 
 keywords:
   - security
diff --git a/scanners/kube-hunter/templates/kube-hunter-parse-definition.yaml b/scanners/kube-hunter/templates/kube-hunter-parse-definition.yaml
@@ -4,4 +4,4 @@ metadata:
   name: "kube-hunter-json"
 spec:
   handlesResultsType: kube-hunter-json
-  image: "{{ .Values.parserImage.registry }}/{{ .Values.parserImage.repository }}:{{ .Values.parserImage.tag }}"
+  image: "{{ .Values.parserImage.repository }}:{{ .Values.parserImage.tag | default .Chart.Version }}"
diff --git a/scanners/kube-hunter/values.yaml b/scanners/kube-hunter/values.yaml
@@ -1,7 +1,7 @@
 parserImage:
-  registry: docker.io
-  repository: scbexperimental/parser-kube-hunter
-  tag: latest
+  repository: docker.io/scbexperimental/parser-kube-hunter
+  # parserImage.tag - defaults to the charts version
+  tag: null
 
 scannerJob:
   resources: {}
diff --git a/scanners/nikto/Chart.yaml b/scanners/nikto/Chart.yaml
@@ -4,7 +4,8 @@ description: A Helm chart for the Nikto security scanner that integrates with th
 
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: 0.1.0
+version: latest
+# appVersion - Nikto doesn't really version its releases
 appVersion: latest
 
 keywords:
diff --git a/scanners/nikto/templates/nikto-parse-definition.yaml b/scanners/nikto/templates/nikto-parse-definition.yaml
@@ -4,4 +4,4 @@ metadata:
   name: "nikto-json"
 spec:
   handlesResultsType: nikto-json
-  image: "{{ .Values.parserImage.registry }}/{{ .Values.parserImage.repository }}:{{ .Values.parserImage.tag }}"
+  image: "{{ .Values.parserImage.repository }}:{{ .Values.parserImage.tag | default .Chart.Version }}"
diff --git a/scanners/nikto/values.yaml b/scanners/nikto/values.yaml
@@ -1,7 +1,7 @@
 parserImage:
-  registry: docker.io
-  repository: scbexperimental/parser-nikto
-  tag: latest
+  repository: docker.io/scbexperimental/parser-nikto
+  # parserImage.tag - defaults to the charts version
+  tag: null
 
 scannerJob:
   resources: {}
diff --git a/scanners/nmap/Chart.yaml b/scanners/nmap/Chart.yaml
@@ -4,7 +4,7 @@ description: A Helm chart for the NMAP security Scanner that integrates with the
 
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: 0.1.0
+version: latest
 appVersion: 7.80-r2
 
 keywords:
diff --git a/scanners/nmap/templates/nmap-parse-definition.yaml b/scanners/nmap/templates/nmap-parse-definition.yaml
@@ -4,4 +4,4 @@ metadata:
   name: "nmap-xml"
 spec:
   handlesResultsType: nmap-xml
-  image: "{{ .Values.parserImage.registry }}/{{ .Values.parserImage.repository }}:{{ .Values.parserImage.tag }}"
+  image: "{{ .Values.parserImage.repository }}:{{ .Values.parserImage.tag | default .Chart.Version }}"
diff --git a/scanners/nmap/values.yaml b/scanners/nmap/values.yaml
@@ -1,7 +1,7 @@
 parserImage:
-  registry: docker.io
-  repository: scbexperimental/parser-nmap
-  tag: latest
+  repository: docker.io/scbexperimental/parser-nmap
+  # parserImage.tag - defaults to the charts version
+  tag: null
 
 scannerJob:
   resources: {}
diff --git a/scanners/ssh_scan/Chart.yaml b/scanners/ssh_scan/Chart.yaml
@@ -4,8 +4,8 @@ description: A Helm chart for the SSH_Scan security scanner that integrates with
 
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: 0.1.0
-appVersion: latest
+version: latest
+appVersion: "0.0.43"
 
 keywords:
   - security
diff --git a/scanners/ssh_scan/templates/ssh-scan-parse-definition.yaml b/scanners/ssh_scan/templates/ssh-scan-parse-definition.yaml
@@ -4,4 +4,4 @@ metadata:
   name: "ssh-scan-json"
 spec:
   handlesResultsType: ssh-scan-json
-  image: "{{ .Values.parserImage.registry }}/{{ .Values.parserImage.repository }}:{{ .Values.parserImage.tag }}"
+  image: "{{ .Values.parserImage.repository }}:{{ .Values.parserImage.tag | default .Chart.Version }}"
diff --git a/scanners/ssh_scan/values.yaml b/scanners/ssh_scan/values.yaml
@@ -1,7 +1,7 @@
 parserImage:
-  registry: docker.io
-  repository: scbexperimental/parser-ssh-scan
-  tag: latest
+  repository: docker.io/scbexperimental/parser-ssh-scan
+  # parserImage.tag - defaults to the charts version
+  tag: null
 
 scannerJob:
   resources: {}
diff --git a/scanners/sslyze/Chart.yaml b/scanners/sslyze/Chart.yaml
@@ -4,8 +4,8 @@ description: A Helm chart for the SSLyze security scanner that integrates with t
 
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: 0.1.0
-appVersion: 3.0.6
+version: latest
+appVersion: v3.0.6
 
 keywords:
   - security
diff --git a/scanners/sslyze/templates/sslyze-parse-definition.yaml b/scanners/sslyze/templates/sslyze-parse-definition.yaml
@@ -1,7 +1,7 @@
-apiVersion: 'execution.experimental.securecodebox.io/v1'
+apiVersion: "execution.experimental.securecodebox.io/v1"
 kind: ParseDefinition
 metadata:
-  name: 'sslyze-json'
+  name: "sslyze-json"
 spec:
   handlesResultsType: sslyze-json
-  image: "{{ .Values.parserImage.registry }}/{{ .Values.parserImage.repository }}:{{ .Values.parserImage.tag }}"
+  image: "{{ .Values.parserImage.repository }}:{{ .Values.parserImage.tag | default .Chart.Version }}"
diff --git a/scanners/sslyze/values.yaml b/scanners/sslyze/values.yaml
@@ -1,7 +1,7 @@
 parserImage:
-  registry: docker.io
-  repository: scbexperimental/parser-sslyze
-  tag: latest
+  repository: docker.io/scbexperimental/parser-sslyze
+  # parserImage.tag - defaults to the charts version
+  tag: null
 
 scannerJob:
   resources: {}
diff --git a/scanners/test-scan/Chart.yaml b/scanners/test-scan/Chart.yaml
@@ -4,7 +4,7 @@ description: A Helm chart to test the secureCodeBox operator
 
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: 0.1.0
+version: latest
 
 keywords:
   - security
diff --git a/scanners/test-scan/templates/test-scan-parse-definition.yaml b/scanners/test-scan/templates/test-scan-parse-definition.yaml
@@ -4,4 +4,4 @@ metadata:
   name: "test-txt"
 spec:
   handlesResultsType: test-txt
-  image: "{{ .Values.parserImage.registry }}/{{ .Values.parserImage.repository }}:{{ .Values.parserImage.tag }}"
+  image: "{{ .Values.parserImage.repository }}:{{ .Values.parserImage.tag | default .Chart.Version }}"
diff --git a/scanners/test-scan/values.yaml b/scanners/test-scan/values.yaml
@@ -1,7 +1,7 @@
 parserImage:
-  registry: docker.io
-  repository: scbexperimental/parser-test-scan
-  tag: latest
+  repository: docker.io/scbexperimental/parser-test-scan
+  # parserImage.tag - defaults to the charts version
+  tag: null
 
 scannerJob:
   resources: {}
diff --git a/scanners/trivy/Chart.yaml b/scanners/trivy/Chart.yaml
@@ -4,8 +4,8 @@ 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: 0.1.0
-appVersion: latest
+version: latest
+appVersion: v0.6.0
 
 keywords:
   - security
diff --git a/scanners/trivy/templates/trivy-parse-definition.yaml b/scanners/trivy/templates/trivy-parse-definition.yaml
@@ -4,4 +4,4 @@ metadata:
   name: "trivy-json"
 spec:
   handlesResultsType: trivy-json
-  image: "{{ .Values.parserImage.registry }}/{{ .Values.parserImage.repository }}:{{ .Values.parserImage.tag }}"
+  image: "{{ .Values.parserImage.repository }}:{{ .Values.parserImage.tag | default .Chart.Version }}"
diff --git a/scanners/trivy/values.yaml b/scanners/trivy/values.yaml
@@ -1,7 +1,7 @@
 parserImage:
-  registry: docker.io
-  repository: scbexperimental/parser-trivy
-  tag: latest
+  repository: docker.io/scbexperimental/parser-trivy
+  # parserImage.tag - defaults to the charts version
+  tag: null
 
 scannerJob:
   resources: {}
diff --git a/scanners/wpscan/Chart.yaml b/scanners/wpscan/Chart.yaml
@@ -4,7 +4,7 @@ description: A Helm chart for the WordPress security scanner that integrates wit
 
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: 0.1.0
+version: latest
 appVersion: latest
 
 keywords:
diff --git a/scanners/wpscan/templates/wpscan-parse-definition.yaml b/scanners/wpscan/templates/wpscan-parse-definition.yaml
@@ -4,4 +4,4 @@ metadata:
   name: "wpscan-json"
 spec:
   handlesResultsType: wpscan-json
-  image: "{{ .Values.parserImage.registry }}/{{ .Values.parserImage.repository }}:{{ .Values.parserImage.tag }}"
+  image: "{{ .Values.parserImage.repository }}:{{ .Values.parserImage.tag | default .Chart.Version }}"
diff --git a/scanners/wpscan/values.yaml b/scanners/wpscan/values.yaml
@@ -1,7 +1,7 @@
 parserImage:
-  registry: docker.io
-  repository: scbexperimental/parser-wpscan
-  tag: latest
+  repository: docker.io/scbexperimental/parser-wpscan
+  # parserImage.tag - defaults to the charts version
+  tag: null
 
 scannerJob:
   resources: {}
diff --git a/scanners/zap/Chart.yaml b/scanners/zap/Chart.yaml
@@ -4,8 +4,8 @@ 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: 0.1.0
-appVersion: latest
+version: latest
+appVersion: v2.9.0
 
 keywords:
   - security
diff --git a/scanners/zap/templates/zap-parse-definition.yaml b/scanners/zap/templates/zap-parse-definition.yaml
@@ -4,4 +4,4 @@ metadata:
   name: "zap-json"
 spec:
   handlesResultsType: zap-json
-  image: "{{ .Values.parserImage.registry }}/{{ .Values.parserImage.repository }}:{{ .Values.parserImage.tag }}"
+  image: "{{ .Values.parserImage.repository }}:{{ .Values.parserImage.tag | default .Chart.Version }}"
diff --git a/scanners/zap/values.yaml b/scanners/zap/values.yaml
@@ -1,7 +1,7 @@
 parserImage:
-  registry: docker.io
-  repository: scbexperimental/parser-zap
-  tag: latest
+  repository: docker.io/scbexperimental/parser-zap
+  # parserImage.tag - defaults to the charts version
+  tag: null
 
 scannerJob:
   resources: {}
