Skip to content

Commit 46312f0

Browse files
authored
Merge pull request #469 from EndPositive/bugfix/nmap-release-name
Add `scanner.appendName` to chart values
2 parents ce699bd + 2ca9a3e commit 46312f0

52 files changed

Lines changed: 93 additions & 19 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

scanners/amass/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ Special command line options:
4949
| scanner.extraVolumes | list | `[{"configMap":{"name":"amass-config"},"name":"amass-config"}]` | Optional Volumes mapped into each scanJob (see: https://kubernetes.io/docs/concepts/storage/volumes/) |
5050
| scanner.image.repository | string | `"caffix/amass"` | Container Image to run the scan |
5151
| scanner.image.tag | string | `nil` | defaults to the charts appVersion |
52+
| scanner.nameAppend | string | `nil` | append a string to the default scantype name. |
5253
| scanner.resources | object | `{}` | CPU/memory resource requests/limits (see: https://kubernetes.io/docs/tasks/configure-pod-container/assign-memory-resource/, https://kubernetes.io/docs/tasks/configure-pod-container/assign-cpu-resource/) |
5354
| scanner.securityContext | object | `{}` | Optional securityContext set on scanner container (see: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) |
5455
| scanner.ttlSecondsAfterFinished | string | `nil` | seconds after which the kubernetes job for the scanner will be deleted. Requires the Kubernetes TTLAfterFinished controller: https://kubernetes.io/docs/concepts/workloads/controllers/ttlafterfinished/ |

scanners/amass/templates/amass-scan-type.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
apiVersion: "execution.securecodebox.io/v1"
55
kind: ScanType
66
metadata:
7-
name: "amass"
7+
name: "amass{{ .Values.scanner.nameAppend | default ""}}"
88
spec:
99
extractResults:
1010
# amass saves it's result now in json but in "json lines" format

scanners/amass/values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ scanner:
1919
repository: caffix/amass
2020
# scanner.image.tag -- defaults to the charts appVersion
2121
tag: null
22+
23+
# scanner.nameAppend -- append a string to the default scantype name.
24+
nameAppend: null
25+
2226
# scanner.ttlSecondsAfterFinished -- seconds after which the kubernetes job for the scanner will be deleted. Requires the Kubernetes TTLAfterFinished controller: https://kubernetes.io/docs/concepts/workloads/controllers/ttlafterfinished/
2327
ttlSecondsAfterFinished: null
2428
# scanner.backoffLimit -- There are situations where you want to fail a scan Job after some amount of retries due to a logical error in configuration etc. To do so, set backoffLimit to specify the number of retries before considering a scan Job as failed. (see: https://kubernetes.io/docs/concepts/workloads/controllers/job/#pod-backoff-failure-policy)

scanners/angularjs-csti-scanner/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ options.scope.request_methods = [
143143
| scanner.extraVolumes | list | `[]` | Optional Volumes mapped into each scanJob (see: https://kubernetes.io/docs/concepts/storage/volumes/) |
144144
| scanner.image.repository | string | `"docker.io/securecodebox/scanner-angularjs-csti-scanner"` | Container Image to run the scan |
145145
| scanner.image.tag | string | `nil` | defaults to the charts version |
146+
| scanner.nameAppend | string | `nil` | append a string to the default scantype name. |
146147
| scanner.resources | object | `{}` | CPU/memory resource requests/limits (see: https://kubernetes.io/docs/tasks/configure-pod-container/assign-memory-resource/, https://kubernetes.io/docs/tasks/configure-pod-container/assign-cpu-resource/) |
147148
| scanner.securityContext | object | `{}` | Optional securityContext set on scanner container (see: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) |
148149
| scanner.ttlSecondsAfterFinished | string | `nil` | seconds after which the kubernetes job for the scanner will be deleted. Requires the Kubernetes TTLAfterFinished controller: https://kubernetes.io/docs/concepts/workloads/controllers/ttlafterfinished/ |

scanners/angularjs-csti-scanner/templates/angularjs-csti-scanner-scan-type.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
apiVersion: "execution.securecodebox.io/v1"
66
kind: ScanType
77
metadata:
8-
name: "angularjs-csti-scanner"
8+
name: "angularjs-csti-scanner{{ .Values.scanner.nameAppend | default ""}}"
99
spec:
1010
extractResults:
1111
type: acstis-log

scanners/angularjs-csti-scanner/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ scanner:
1919
# scanner.image.tag -- defaults to the charts version
2020
tag: null
2121

22+
# scanner.nameAppend -- append a string to the default scantype name.
23+
nameAppend: null
24+
2225
# scanner.ttlSecondsAfterFinished -- seconds after which the kubernetes job for the scanner will be deleted. Requires the Kubernetes TTLAfterFinished controller: https://kubernetes.io/docs/concepts/workloads/controllers/ttlafterfinished/
2326
ttlSecondsAfterFinished: null
2427

scanners/git-repo-scanner/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ on the Gitlab server are going to be discovered.
7575
| scanner.extraVolumes | list | `[]` | Optional Volumes mapped into each scanJob (see: https://kubernetes.io/docs/concepts/storage/volumes/) |
7676
| scanner.image.repository | string | `"docker.io/securecodebox/scanner-git-repo-scanner"` | Container Image to run the scan |
7777
| scanner.image.tag | string | `nil` | defaults to the charts version |
78+
| scanner.nameAppend | string | `nil` | append a string to the default scantype name. |
7879
| scanner.resources | object | `{}` | CPU/memory resource requests/limits (see: https://kubernetes.io/docs/tasks/configure-pod-container/assign-memory-resource/, https://kubernetes.io/docs/tasks/configure-pod-container/assign-cpu-resource/) |
7980
| scanner.securityContext | object | `{}` | Optional securityContext set on scanner container (see: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) |
8081
| scanner.ttlSecondsAfterFinished | string | `nil` | seconds after which the kubernetes job for the scanner will be deleted. Requires the Kubernetes TTLAfterFinished controller: https://kubernetes.io/docs/concepts/workloads/controllers/ttlafterfinished/ |

scanners/git-repo-scanner/templates/git-repo-scanner-scan-type.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
apiVersion: "execution.securecodebox.io/v1"
66
kind: ScanType
77
metadata:
8-
name: "git-repo-scanner"
8+
name: "git-repo-scanner{{ .Values.scanner.nameAppend | default ""}}"
99
spec:
1010
extractResults:
1111
type: git-repo-scanner-json

scanners/git-repo-scanner/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ scanner:
2121
# scanner.image.tag -- defaults to the charts version
2222
tag: null
2323

24+
# scanner.nameAppend -- append a string to the default scantype name.
25+
nameAppend: null
26+
2427
# scanner.ttlSecondsAfterFinished -- seconds after which the kubernetes job for the scanner will be deleted. Requires the Kubernetes TTLAfterFinished controller: https://kubernetes.io/docs/concepts/workloads/controllers/ttlafterfinished/
2528
ttlSecondsAfterFinished: null
2629
# scanner.backoffLimit -- There are situations where you want to fail a scan Job after some amount of retries due to a logical error in configuration etc. To do so, set backoffLimit to specify the number of retries before considering a scan Job as failed. (see: https://kubernetes.io/docs/concepts/workloads/controllers/job/#pod-backoff-failure-policy)

scanners/gitleaks/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ For more information on how to use cascades take a look at
141141
| scanner.extraVolumes | list | `[{"configMap":{"name":"gitleaks-config"},"name":"gitleaks-config"}]` | Optional Volumes mapped into each scanJob (see: https://kubernetes.io/docs/concepts/storage/volumes/) |
142142
| scanner.image.repository | string | `"docker.io/securecodebox/scanner-gitleaks"` | Container Image to run the scan |
143143
| scanner.image.tag | string | `nil` | defaults to the app version |
144+
| scanner.nameAppend | string | `nil` | append a string to the default scantype name. |
144145
| scanner.resources | object | `{}` | CPU/memory resource requests/limits (see: https://kubernetes.io/docs/tasks/configure-pod-container/assign-memory-resource/, https://kubernetes.io/docs/tasks/configure-pod-container/assign-cpu-resource/) |
145146
| scanner.securityContext | object | `{}` | Optional securityContext set on scanner container (see: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) |
146147
| scanner.ttlSecondsAfterFinished | string | `nil` | seconds after which the kubernetes job for the scanner will be deleted. Requires the Kubernetes TTLAfterFinished controller: https://kubernetes.io/docs/concepts/workloads/controllers/ttlafterfinished/ |

0 commit comments

Comments
 (0)