Merge pull request #22 from stefannica/2.0-baseline

Remove trivy helm chart changes from the 2.0 baseline
SUSE · Aug 5, 2020 · 99715cf · 99715cf
2 parents cc5ffeb + 3e59193
commit 99715cf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/harbor-helm/templates/trivy/trivy-sts.yaml b/harbor-helm/templates/trivy/trivy-sts.yaml
@@ -30,6 +30,10 @@ spec:
 {{ toYaml .Values.trivy.podAnnotations | indent 8 }}
 {{- end }}
     spec:
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 10000
+        fsGroup: 10000
       automountServiceAccountToken: false
       containers:
         - name: trivy

diff --git a/harbor-helm/values.yaml b/harbor-helm/values.yaml
@@ -534,9 +534,9 @@ trivy:
   enabled: false
   image:
     # repository the repository for Trivy adapter image
-    repository: registry.suse.de/devel/caps/registry/containers/registry/harbor-trivy-adapter
+    repository: goharbor/trivy-adapter-photon
     # tag the tag for Trivy adapter image
-    tag: 2.0.0-rev1
+    tag: v2.0.0
   # replicas the number of Pod replicas
   replicas: 1
   # debugMode the flag to enable Trivy debug mode with more verbose scanning log