More helm chart fixes

.dockerignore

@@ -1 +1,4 @@
 images/trivy-scan-*
+pool/
+trivy-reports/
+helm-charts/

helm-chart/Chart.yaml

@@ -4,5 +4,5 @@ apiVersion: v2
 name: trivy-runner
 description: A Helm chart for trivy runner
 type: application
-version: 0.1.2
+version: 0.2.1
 appVersion: 1.0.1

helm-chart/templates/_helpers.tpl

@@ -89,7 +89,7 @@ Errbit variables. For now we reuse main Rails app Errbit keys
 {{- end -}}
 
 {{- define "trivy-runner.scanworkerEnv" -}}
-{{- if .Values.scanworker.pushToCatalog }}
+{{- if .Values.pushworker.enabled }}
 - name: PUSH_TO_CATALOG
   value: "true"
 {{- end }}
@@ -128,10 +128,6 @@ Errbit variables. For now we reuse main Rails app Errbit keys
 
 - name: REPORTS_APP_DIR
   value: /pool/reports
-{{- if .Values.pushworker.enabled }}
-- name: PUSH_TO_CATALOG
-  value: "1"
-{{- end }}
 {{- end -}}
 
 {{/*

helm-chart/templates/deployment.yaml

@@ -8,7 +8,6 @@ metadata:
     {{- include "trivy-runner.selectorLabels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.replicas }}
-  serviceAccountName: {{ include "trivy-runner.serviceAccountName" . }}
   strategy:
     type: Recreate
   selector:
@@ -19,6 +18,7 @@ spec:
       labels:
         {{- include "trivy-runner.selectorLabels" . | nindent 8 }}
     spec:
+      serviceAccountName: {{ include "trivy-runner.serviceAccountName" . }}
       securityContext:
         fsGroup: 1000
         runAsUser: 1000

helm-chart/templates/extra-objects.yaml

@@ -0,0 +1,4 @@
+{{ range .Values.extraObjects }}
+---
+{{ tpl (toYaml .) $ }}
+{{ end }}

helm-chart/values.yaml

@@ -14,7 +14,7 @@ image:
   pullPolicy: Always
   registry: registry.opensuse.org
   repository: systemsmanagement/scc/containers/containers/scc/trivy-runner
-  tag: v1.0
+  tag: "1.0"
 
 serviceAccount:
   create: true
@@ -60,7 +60,7 @@ redis:
   resources:
     limits:
       cpu: 120m
-      memory: 256M
+      memory: 128M
     requests:
       cpu: 100m
       memory: 128M
@@ -69,7 +69,7 @@ getsizeworker:
   resources:
     limits:
       cpu: 120m
-      memory: 512M
+      memory: 256M
     requests:
       cpu: 100m
       memory: 64M
@@ -78,7 +78,7 @@ pullworker:
   resources:
     limits:
       cpu: 120m
-      memory: 512M
+      memory: 256M
     requests:
       cpu: 100m
       memory: 64M
@@ -95,7 +95,6 @@ pushworker:
       memory: 32M
 
 scanworker:
-  pushToCatalog: false
   scanParallelism: 0 # autodetect
   scanTimeout: "5m"
 
@@ -111,16 +110,18 @@ webapi:
   resources:
     limits:
       cpu: 120m
-      memory: 256M
+      memory: 128M
     requests:
       cpu: 100m
-      memory: 128M
+      memory: 32M
 
 redisexporter:
   resources:
     limits:
       cpu: 120m
-      memory: 256M
+      memory: 128M
     requests:
       cpu: 100m
-      memory: 128M
+      memory: 64M
+
+extraObjects: []