update zora chart

undistro · Jun 6, 2024 · 06b2e80 · 06b2e80
1 parent 7b57870
commit 06b2e80
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/charts/zora/Chart.yaml b/charts/zora/Chart.yaml
@@ -17,7 +17,7 @@ name: zora
 description: A multi-plugin solution that reports misconfigurations and vulnerabilities by scanning your cluster at scheduled times.
 icon: https://zora-docs.undistro.io/v0.7/assets/logo.svg
 type: application
-version: 0.9.0
-appVersion: "v0.9.0"
+version: 0.9.1
+appVersion: "v0.9.1"
 sources:
   - https://github.com/undistro/zora
diff --git a/charts/zora/README.md b/charts/zora/README.md
@@ -1,6 +1,6 @@
 # Zora Helm Chart
 
-![Version: 0.9.0](https://img.shields.io/badge/Version-0.9.0-informational?style=flat-square&color=3CA9DD) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square&color=3CA9DD) ![AppVersion: v0.9.0](https://img.shields.io/badge/AppVersion-v0.9.0-informational?style=flat-square&color=3CA9DD)
+![Version: 0.9.1](https://img.shields.io/badge/Version-0.9.1-informational?style=flat-square&color=3CA9DD) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square&color=3CA9DD) ![AppVersion: v0.9.1](https://img.shields.io/badge/AppVersion-v0.9.1-informational?style=flat-square&color=3CA9DD)
 
 A multi-plugin solution that reports misconfigurations and vulnerabilities by scanning your cluster at scheduled times.
 
@@ -13,7 +13,7 @@ helm repo add undistro https://charts.undistro.io --force-update
 helm repo update undistro
 helm upgrade --install zora undistro/zora \
   -n zora-system \
-  --version 0.9.0 \
+  --version 0.9.1 \
   --create-namespace \
   --wait \
   --set clusterName="$(kubectl config current-context)"

diff --git a/charts/zora/templates/operator/deployment.yaml b/charts/zora/templates/operator/deployment.yaml
@@ -103,7 +103,7 @@ spec:
             - --worker-image={{ printf "%s:%s" .Values.scan.worker.image.repository (.Values.scan.worker.image.tag | default .Chart.AppVersion) }}
             - --cronjob-clusterrolebinding-name=zora-plugins-rolebinding
             - --cronjob-serviceaccount-name=zora-plugins
-            - --trivy-db-pvc={{- if .Values.scan.plugins.trivy.persistence.enabled }}trivy-db{{- end }}
+            - --trivy-db-pvc={{- if .Values.scan.plugins.trivy.persistence.enabled }}trivy-db-cache{{- end }}
 {{- if .Values.scan.plugins.annotations}}
             - --cronjob-serviceaccount-annotations={{ $first := true }}{{- range $key, $value := .Values.scan.plugins.annotations }}{{if not $first}},{{else}}{{$first = false}}{{end}}{{ $key }}={{$value}}{{- end }}
 {{- end }}

diff --git a/charts/zora/templates/plugins/trivy-job.yaml b/charts/zora/templates/plugins/trivy-job.yaml
@@ -24,11 +24,13 @@ spec:
       volumes:
         - name: trivy-db
           persistentVolumeClaim:
-            claimName: trivy-db
+            claimName: trivy-db-cache
       containers:
         - name: trivy-download-db
           image: "{{ .Values.scan.plugins.trivy.image.repository }}:{{ .Values.scan.plugins.trivy.image.tag }}"
-          imagePullPolicy: IfNotPresent
+          {{- if .Values.scan.plugins.trivy.image.pullPolicy }}
+          imagePullPolicy: "{{ .Values.scan.plugins.trivy.image.pullPolicy }}"
+          {{- end }}
           securityContext:
             allowPrivilegeEscalation: false
             privileged: false
@@ -49,7 +51,8 @@ spec:
                 {{- if .Values.scan.plugins.trivy.persistence.downloadJavaDB }}
                 --download-java-db-only \
                 {{- end }}
-                --download-db-only
+                --download-db-only \
+              && chgrp -R 0 /tmp/trivy-cache/* && chmod -R g+rwX /tmp/trivy-cache/*
           env:
             - name: SSL_CERT_DIR
               value: "/etc/ssl/:/run/secrets/kubernetes.io/serviceaccount/"
@@ -60,4 +63,4 @@ spec:
               value: {{ .Values.noProxy | quote }}
             {{- end }}
       restartPolicy: OnFailure
-{{- end }}
+{{- end }}
diff --git a/charts/zora/templates/plugins/trivy-pvc.yaml b/charts/zora/templates/plugins/trivy-pvc.yaml
@@ -16,7 +16,7 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: trivy-db
+  name: trivy-db-cache
 spec:
   {{- if .Values.scan.plugins.trivy.persistence.storageClass }}
   storageClassName: {{ .Values.scan.plugins.trivy.persistence.storageClass | quote }}
@@ -26,4 +26,4 @@ spec:
   resources:
     requests:
       storage: {{ .Values.scan.plugins.trivy.persistence.storageRequest | quote }}
-{{- end }}
+{{- end }}