From e44a173b5554b58852ad407f5a7d09f0fd083539 Mon Sep 17 00:00:00 2001 From: Christian Hopf Date: Tue, 12 Dec 2023 10:31:39 +0100 Subject: [PATCH] feat: add extraVolumeMounts and reports mount (#178) * feat: add extraVolumeMounts and reports mount Signed-off-by: Christian Kotzbauer * fix: add newline Signed-off-by: Christian Kotzbauer * fix: use other source Signed-off-by: Christian Kotzbauer --------- Signed-off-by: Christian Kotzbauer --- charts/sbom-operator/Chart.yaml | 2 +- charts/sbom-operator/templates/deployment.yaml | 3 +++ charts/sbom-operator/values.yaml | 2 ++ charts/vulnerability-operator/Chart.yaml | 2 +- charts/vulnerability-operator/ci/git.yaml | 2 ++ .../vulnerability-operator/templates/deployment.yaml | 11 +++++++++++ charts/vulnerability-operator/values.yaml | 4 ++++ 7 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 charts/vulnerability-operator/ci/git.yaml diff --git a/charts/sbom-operator/Chart.yaml b/charts/sbom-operator/Chart.yaml index a4dc1d2..34f34b6 100644 --- a/charts/sbom-operator/Chart.yaml +++ b/charts/sbom-operator/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: Catalogue all images of a Kubernetes cluster to multiple targets with Syft name: sbom-operator -version: 0.30.0 +version: 0.30.1 appVersion: 0.29.0 home: https://github.com/ckotzbauer/sbom-operator sources: diff --git a/charts/sbom-operator/templates/deployment.yaml b/charts/sbom-operator/templates/deployment.yaml index 99df210..588d2aa 100644 --- a/charts/sbom-operator/templates/deployment.yaml +++ b/charts/sbom-operator/templates/deployment.yaml @@ -74,6 +74,9 @@ spec: name: work - mountPath: /tmp name: tmp + {{- if .Values.extraVolumeMounts }} +{{- toYaml .Values.extraVolumeMounts | nindent 12 }} + {{- end }} volumes: - name: work emptyDir: {} diff --git a/charts/sbom-operator/values.yaml b/charts/sbom-operator/values.yaml index a7a753f..32e8b35 100644 --- a/charts/sbom-operator/values.yaml +++ b/charts/sbom-operator/values.yaml @@ -53,3 +53,5 @@ tolerations: [] affinity: {} extraVolumes: [] + +extraVolumeMounts: [] diff --git a/charts/vulnerability-operator/Chart.yaml b/charts/vulnerability-operator/Chart.yaml index 379bd56..cd9d26c 100644 --- a/charts/vulnerability-operator/Chart.yaml +++ b/charts/vulnerability-operator/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: Scans SBOMs for vulnerabilities name: vulnerability-operator -version: 0.23.0 +version: 0.23.1 appVersion: 0.21.0 home: https://github.com/ckotzbauer/vulnerability-operator sources: diff --git a/charts/vulnerability-operator/ci/git.yaml b/charts/vulnerability-operator/ci/git.yaml new file mode 100644 index 0000000..dc3f43e --- /dev/null +++ b/charts/vulnerability-operator/ci/git.yaml @@ -0,0 +1,2 @@ +args: + sources: kubernetes diff --git a/charts/vulnerability-operator/templates/deployment.yaml b/charts/vulnerability-operator/templates/deployment.yaml index ce3bd3b..d8f725d 100644 --- a/charts/vulnerability-operator/templates/deployment.yaml +++ b/charts/vulnerability-operator/templates/deployment.yaml @@ -62,6 +62,10 @@ spec: resources: {{ toYaml .Values.resources | indent 12 }} volumeMounts: + {{- if .Values.useReportsEmptyDir }} + - mountPath: /reports + name: reports + {{- end }} - mountPath: /work name: work - mountPath: /tmp @@ -70,7 +74,14 @@ spec: - mountPath: /vuln name: grype {{- end }} + {{- if .Values.extraVolumeMounts }} +{{- toYaml .Values.extraVolumeMounts | nindent 12 }} + {{- end }} volumes: + {{- if .Values.useReportsEmptyDir }} + - name: reports + emptyDir: {} + {{- end }} - name: work emptyDir: {} - name: tmp diff --git a/charts/vulnerability-operator/values.yaml b/charts/vulnerability-operator/values.yaml index aec7235..bed998c 100644 --- a/charts/vulnerability-operator/values.yaml +++ b/charts/vulnerability-operator/values.yaml @@ -12,6 +12,8 @@ args: {} envVars: {} +useReportsEmptyDir: true + ignoreRules: "" # ignore: # # This is the full set of supported rule fields: @@ -107,3 +109,5 @@ tolerations: [] affinity: {} extraVolumes: [] + +extraVolumeMounts: []