From 8eb0d58f0e338746b9e6eff6b5c4802e19fe0713 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 30 Aug 2021 14:53:23 +0200 Subject: [PATCH 1/5] Renaming file because of typo, fixing inconsistencies No pun intended Signed-off-by: Sebastian --- ...e-definition.yaml => typo3scan-parse-definition.yaml} | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) rename scanners/typo3scan/templates/{typ3scan-parse-definition.yaml => typo3scan-parse-definition.yaml} (54%) diff --git a/scanners/typo3scan/templates/typ3scan-parse-definition.yaml b/scanners/typo3scan/templates/typo3scan-parse-definition.yaml similarity index 54% rename from scanners/typo3scan/templates/typ3scan-parse-definition.yaml rename to scanners/typo3scan/templates/typo3scan-parse-definition.yaml index 10f8c37285..f15e0894b4 100644 --- a/scanners/typo3scan/templates/typ3scan-parse-definition.yaml +++ b/scanners/typo3scan/templates/typo3scan-parse-definition.yaml @@ -1,12 +1,13 @@ # SPDX-FileCopyrightText: 2021 iteratec GmbH # # SPDX-License-Identifier: Apache-2.0 -apiVersion: execution.securecodebox.io/v1 + +apiVersion: "execution.securecodebox.io/v1" kind: ParseDefinition metadata: - name: typo3scan-json + name: "typo3scan-json" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} env: - {{- toYaml .Values.parser.env | nindent 4 }} \ No newline at end of file + {{- toYaml .Values.parser.env | nindent 4 }} From 15f15bfa49fa81fa108243a563a4f8183118f353 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 30 Aug 2021 14:54:36 +0200 Subject: [PATCH 2/5] Fixing inconsistencies Replacing ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} with ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} Signed-off-by: Sebastian --- scanners/amass/templates/amass-parse-definition.yaml | 2 +- .../templates/angularjs-csti-scanner-parse-definition.yaml | 2 +- .../templates/git-repo-scanner-parse-definition.yaml | 2 +- scanners/gitleaks/templates/gitleaks-parse-definition.yaml | 2 +- scanners/kubeaudit/templates/kubeaudit-parse-definition.yaml | 2 +- scanners/nikto/templates/nikto-parse-definition.yaml | 2 +- scanners/nmap/templates/nmap-parse-definition.yaml | 2 +- .../screenshooter/templates/screenshooter-parse-definition.yaml | 2 +- scanners/sslyze/templates/sslyze-parse-definition.yaml | 2 +- scanners/test-scan/templates/test-scan-parse-definition.yaml | 2 +- scanners/trivy/templates/trivy-parse-definition.yaml | 2 +- scanners/wpscan/templates/wpscan-parse-definition.yaml | 2 +- .../zap-advanced/templates/zap-advanced-parse-definition.yaml | 2 +- scanners/zap/templates/zap-parse-definition.yaml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/scanners/amass/templates/amass-parse-definition.yaml b/scanners/amass/templates/amass-parse-definition.yaml index e4df09b611..8681296c84 100644 --- a/scanners/amass/templates/amass-parse-definition.yaml +++ b/scanners/amass/templates/amass-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "amass-jsonl" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/angularjs-csti-scanner/templates/angularjs-csti-scanner-parse-definition.yaml b/scanners/angularjs-csti-scanner/templates/angularjs-csti-scanner-parse-definition.yaml index 190aee8ae1..cf82f9c1d8 100644 --- a/scanners/angularjs-csti-scanner/templates/angularjs-csti-scanner-parse-definition.yaml +++ b/scanners/angularjs-csti-scanner/templates/angularjs-csti-scanner-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "acstis-log" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/git-repo-scanner/templates/git-repo-scanner-parse-definition.yaml b/scanners/git-repo-scanner/templates/git-repo-scanner-parse-definition.yaml index 152f4c618d..7dbbbe1280 100644 --- a/scanners/git-repo-scanner/templates/git-repo-scanner-parse-definition.yaml +++ b/scanners/git-repo-scanner/templates/git-repo-scanner-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "git-repo-scanner-json" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/gitleaks/templates/gitleaks-parse-definition.yaml b/scanners/gitleaks/templates/gitleaks-parse-definition.yaml index 88fed722f5..3a4b737a70 100644 --- a/scanners/gitleaks/templates/gitleaks-parse-definition.yaml +++ b/scanners/gitleaks/templates/gitleaks-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "gitleaks-json" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/kubeaudit/templates/kubeaudit-parse-definition.yaml b/scanners/kubeaudit/templates/kubeaudit-parse-definition.yaml index 02bc06ac35..a7068725c9 100644 --- a/scanners/kubeaudit/templates/kubeaudit-parse-definition.yaml +++ b/scanners/kubeaudit/templates/kubeaudit-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "kubeaudit-jsonl" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/nikto/templates/nikto-parse-definition.yaml b/scanners/nikto/templates/nikto-parse-definition.yaml index 0b0fb7f8c8..17a307f445 100644 --- a/scanners/nikto/templates/nikto-parse-definition.yaml +++ b/scanners/nikto/templates/nikto-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "nikto-json" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/nmap/templates/nmap-parse-definition.yaml b/scanners/nmap/templates/nmap-parse-definition.yaml index 4e9c111c69..9c505050c4 100644 --- a/scanners/nmap/templates/nmap-parse-definition.yaml +++ b/scanners/nmap/templates/nmap-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "nmap-xml" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/screenshooter/templates/screenshooter-parse-definition.yaml b/scanners/screenshooter/templates/screenshooter-parse-definition.yaml index 151716e830..6e9e0a1e24 100644 --- a/scanners/screenshooter/templates/screenshooter-parse-definition.yaml +++ b/scanners/screenshooter/templates/screenshooter-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "screenshot-png" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/sslyze/templates/sslyze-parse-definition.yaml b/scanners/sslyze/templates/sslyze-parse-definition.yaml index 06f290a8b0..8ee1ba6a7f 100644 --- a/scanners/sslyze/templates/sslyze-parse-definition.yaml +++ b/scanners/sslyze/templates/sslyze-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "sslyze-json" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/test-scan/templates/test-scan-parse-definition.yaml b/scanners/test-scan/templates/test-scan-parse-definition.yaml index e60d8e63b8..89e1161e45 100644 --- a/scanners/test-scan/templates/test-scan-parse-definition.yaml +++ b/scanners/test-scan/templates/test-scan-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "test-txt" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/trivy/templates/trivy-parse-definition.yaml b/scanners/trivy/templates/trivy-parse-definition.yaml index 18150449b6..26c1c066f7 100644 --- a/scanners/trivy/templates/trivy-parse-definition.yaml +++ b/scanners/trivy/templates/trivy-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "trivy-json" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/wpscan/templates/wpscan-parse-definition.yaml b/scanners/wpscan/templates/wpscan-parse-definition.yaml index dd2602f424..d13f56db59 100644 --- a/scanners/wpscan/templates/wpscan-parse-definition.yaml +++ b/scanners/wpscan/templates/wpscan-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "wpscan-json" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/zap-advanced/templates/zap-advanced-parse-definition.yaml b/scanners/zap-advanced/templates/zap-advanced-parse-definition.yaml index b2a825bafd..de48fd303e 100644 --- a/scanners/zap-advanced/templates/zap-advanced-parse-definition.yaml +++ b/scanners/zap-advanced/templates/zap-advanced-parse-definition.yaml @@ -10,6 +10,6 @@ metadata: {{- include "zap.labels" . | nindent 4 }} spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/zap/templates/zap-parse-definition.yaml b/scanners/zap/templates/zap-parse-definition.yaml index 8f139d7472..0ba00b8ca9 100644 --- a/scanners/zap/templates/zap-parse-definition.yaml +++ b/scanners/zap/templates/zap-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "zap-xml" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} From b44ce803a5d9b5dbf15e9e28bc2b42c8a6fd9293 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 30 Aug 2021 18:41:01 +0200 Subject: [PATCH 3/5] Fixing inconsistencies (the other way round) Replacing ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} with ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} Signed-off-by: Sebastian --- scanners/amass/templates/amass-parse-definition.yaml | 2 +- .../templates/angularjs-csti-scanner-parse-definition.yaml | 2 +- .../templates/git-repo-scanner-parse-definition.yaml | 2 +- scanners/gitleaks/templates/gitleaks-parse-definition.yaml | 2 +- .../kube-hunter/templates/kube-hunter-parse-definition.yaml | 2 +- scanners/kubeaudit/templates/kubeaudit-parse-definition.yaml | 2 +- scanners/ncrack/templates/ncrack-parse-definition.yaml | 2 +- scanners/nikto/templates/nikto-parse-definition.yaml | 2 +- scanners/nmap/templates/nmap-parse-definition.yaml | 2 +- scanners/nuclei/templates/nuclei-parse-definition.yaml | 2 +- .../screenshooter/templates/screenshooter-parse-definition.yaml | 2 +- scanners/ssh-scan/templates/ssh-scan-parse-definition.yaml | 2 +- scanners/sslyze/templates/sslyze-parse-definition.yaml | 2 +- scanners/test-scan/templates/test-scan-parse-definition.yaml | 2 +- scanners/trivy/templates/trivy-parse-definition.yaml | 2 +- scanners/typo3scan/templates/typo3scan-parse-definition.yaml | 2 +- scanners/wpscan/templates/wpscan-parse-definition.yaml | 2 +- .../zap-advanced/templates/zap-advanced-parse-definition.yaml | 2 +- scanners/zap/templates/zap-parse-definition.yaml | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/scanners/amass/templates/amass-parse-definition.yaml b/scanners/amass/templates/amass-parse-definition.yaml index 8681296c84..e4df09b611 100644 --- a/scanners/amass/templates/amass-parse-definition.yaml +++ b/scanners/amass/templates/amass-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "amass-jsonl" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/angularjs-csti-scanner/templates/angularjs-csti-scanner-parse-definition.yaml b/scanners/angularjs-csti-scanner/templates/angularjs-csti-scanner-parse-definition.yaml index cf82f9c1d8..190aee8ae1 100644 --- a/scanners/angularjs-csti-scanner/templates/angularjs-csti-scanner-parse-definition.yaml +++ b/scanners/angularjs-csti-scanner/templates/angularjs-csti-scanner-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "acstis-log" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/git-repo-scanner/templates/git-repo-scanner-parse-definition.yaml b/scanners/git-repo-scanner/templates/git-repo-scanner-parse-definition.yaml index 7dbbbe1280..152f4c618d 100644 --- a/scanners/git-repo-scanner/templates/git-repo-scanner-parse-definition.yaml +++ b/scanners/git-repo-scanner/templates/git-repo-scanner-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "git-repo-scanner-json" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/gitleaks/templates/gitleaks-parse-definition.yaml b/scanners/gitleaks/templates/gitleaks-parse-definition.yaml index 3a4b737a70..88fed722f5 100644 --- a/scanners/gitleaks/templates/gitleaks-parse-definition.yaml +++ b/scanners/gitleaks/templates/gitleaks-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "gitleaks-json" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/kube-hunter/templates/kube-hunter-parse-definition.yaml b/scanners/kube-hunter/templates/kube-hunter-parse-definition.yaml index 0cc14fb272..172a5b7cff 100644 --- a/scanners/kube-hunter/templates/kube-hunter-parse-definition.yaml +++ b/scanners/kube-hunter/templates/kube-hunter-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "kube-hunter-json" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/kubeaudit/templates/kubeaudit-parse-definition.yaml b/scanners/kubeaudit/templates/kubeaudit-parse-definition.yaml index a7068725c9..02bc06ac35 100644 --- a/scanners/kubeaudit/templates/kubeaudit-parse-definition.yaml +++ b/scanners/kubeaudit/templates/kubeaudit-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "kubeaudit-jsonl" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/ncrack/templates/ncrack-parse-definition.yaml b/scanners/ncrack/templates/ncrack-parse-definition.yaml index 39f9852eb1..f08ad7230f 100644 --- a/scanners/ncrack/templates/ncrack-parse-definition.yaml +++ b/scanners/ncrack/templates/ncrack-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "ncrack-xml" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/nikto/templates/nikto-parse-definition.yaml b/scanners/nikto/templates/nikto-parse-definition.yaml index 17a307f445..0b0fb7f8c8 100644 --- a/scanners/nikto/templates/nikto-parse-definition.yaml +++ b/scanners/nikto/templates/nikto-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "nikto-json" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/nmap/templates/nmap-parse-definition.yaml b/scanners/nmap/templates/nmap-parse-definition.yaml index 9c505050c4..4e9c111c69 100644 --- a/scanners/nmap/templates/nmap-parse-definition.yaml +++ b/scanners/nmap/templates/nmap-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "nmap-xml" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/nuclei/templates/nuclei-parse-definition.yaml b/scanners/nuclei/templates/nuclei-parse-definition.yaml index f365848e8a..7aaf7462c8 100644 --- a/scanners/nuclei/templates/nuclei-parse-definition.yaml +++ b/scanners/nuclei/templates/nuclei-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "nuclei-json" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/screenshooter/templates/screenshooter-parse-definition.yaml b/scanners/screenshooter/templates/screenshooter-parse-definition.yaml index 6e9e0a1e24..151716e830 100644 --- a/scanners/screenshooter/templates/screenshooter-parse-definition.yaml +++ b/scanners/screenshooter/templates/screenshooter-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "screenshot-png" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/ssh-scan/templates/ssh-scan-parse-definition.yaml b/scanners/ssh-scan/templates/ssh-scan-parse-definition.yaml index 1c85658dc7..042e970fb6 100644 --- a/scanners/ssh-scan/templates/ssh-scan-parse-definition.yaml +++ b/scanners/ssh-scan/templates/ssh-scan-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "ssh-scan-json" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/sslyze/templates/sslyze-parse-definition.yaml b/scanners/sslyze/templates/sslyze-parse-definition.yaml index 8ee1ba6a7f..06f290a8b0 100644 --- a/scanners/sslyze/templates/sslyze-parse-definition.yaml +++ b/scanners/sslyze/templates/sslyze-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "sslyze-json" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/test-scan/templates/test-scan-parse-definition.yaml b/scanners/test-scan/templates/test-scan-parse-definition.yaml index 89e1161e45..e60d8e63b8 100644 --- a/scanners/test-scan/templates/test-scan-parse-definition.yaml +++ b/scanners/test-scan/templates/test-scan-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "test-txt" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/trivy/templates/trivy-parse-definition.yaml b/scanners/trivy/templates/trivy-parse-definition.yaml index 26c1c066f7..18150449b6 100644 --- a/scanners/trivy/templates/trivy-parse-definition.yaml +++ b/scanners/trivy/templates/trivy-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "trivy-json" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/typo3scan/templates/typo3scan-parse-definition.yaml b/scanners/typo3scan/templates/typo3scan-parse-definition.yaml index f15e0894b4..50e70d533a 100644 --- a/scanners/typo3scan/templates/typo3scan-parse-definition.yaml +++ b/scanners/typo3scan/templates/typo3scan-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "typo3scan-json" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/wpscan/templates/wpscan-parse-definition.yaml b/scanners/wpscan/templates/wpscan-parse-definition.yaml index d13f56db59..dd2602f424 100644 --- a/scanners/wpscan/templates/wpscan-parse-definition.yaml +++ b/scanners/wpscan/templates/wpscan-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "wpscan-json" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/zap-advanced/templates/zap-advanced-parse-definition.yaml b/scanners/zap-advanced/templates/zap-advanced-parse-definition.yaml index de48fd303e..b2a825bafd 100644 --- a/scanners/zap-advanced/templates/zap-advanced-parse-definition.yaml +++ b/scanners/zap-advanced/templates/zap-advanced-parse-definition.yaml @@ -10,6 +10,6 @@ metadata: {{- include "zap.labels" . | nindent 4 }} spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} diff --git a/scanners/zap/templates/zap-parse-definition.yaml b/scanners/zap/templates/zap-parse-definition.yaml index 0ba00b8ca9..8f139d7472 100644 --- a/scanners/zap/templates/zap-parse-definition.yaml +++ b/scanners/zap/templates/zap-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "zap-xml" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} From 23717200e8a3532533bb560cf89e88b19b7fe0f8 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 31 Aug 2021 11:35:36 +0200 Subject: [PATCH 4/5] Resetting zap parse definition Because of failing ci pipeline integration tests Signed-off-by: Sebastian --- scanners/zap/templates/zap-parse-definition.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scanners/zap/templates/zap-parse-definition.yaml b/scanners/zap/templates/zap-parse-definition.yaml index 8f139d7472..0ba00b8ca9 100644 --- a/scanners/zap/templates/zap-parse-definition.yaml +++ b/scanners/zap/templates/zap-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "zap-xml" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }} From b5b16d68e8d87e599d4dfe3ea35cf6c457fa4178 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 31 Aug 2021 13:27:04 +0200 Subject: [PATCH 5/5] Revert "Resetting zap parse definition" This reverts commit 23717200e8a3532533bb560cf89e88b19b7fe0f8. Signed-off-by: Sebastian --- scanners/zap/templates/zap-parse-definition.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scanners/zap/templates/zap-parse-definition.yaml b/scanners/zap/templates/zap-parse-definition.yaml index 0ba00b8ca9..8f139d7472 100644 --- a/scanners/zap/templates/zap-parse-definition.yaml +++ b/scanners/zap/templates/zap-parse-definition.yaml @@ -8,6 +8,6 @@ metadata: name: "zap-xml" spec: image: "{{ .Values.parser.image.repository }}:{{ .Values.parser.image.tag | default .Chart.Version }}" - ttlSecondsAfterFinished: {{ .Values.parser.image.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.parser.ttlSecondsAfterFinished }} env: {{- toYaml .Values.parser.env | nindent 4 }}