fix clusterWide: devopstales/trivy-operator#17

devopstales · Feb 8, 2022 · 2c21948 · 2c21948
1 parent 0fb96be
commit 2c21948
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/charts/trivy-operator/templates/3-deployment.yaml b/charts/trivy-operator/templates/3-deployment.yaml
@@ -38,6 +38,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
+        - name: LOG_LEVEL
+          value: "{{ .Values.log_level }}"
 {{- if .Values.githubToken.enabled }}
         - name: GITHUB_TOKEN
           value: "{{ .Values.githubToken.token }}"

diff --git a/charts/trivy-operator/templates/4-namespace-scanner.yaml b/charts/trivy-operator/templates/4-namespace-scanner.yaml
@@ -8,6 +8,7 @@ spec:
   crontab: "{{ .Values.namespaceScanner.crontab }}"
   clusterWide: "{{ .Values.namespaceScanner.clusterWide }}"
   namespace_selector: "{{ .Values.namespaceScanner.namespaceSelector }}"
+  clusterWide: {{ .Values.namespaceScanner.clusterWide | default "false" }}
   {{- if .Values.registryAuth.enabled }}
   {{- with .Values.registryAuth.registry }}
   registry:

diff --git a/charts/trivy-operator/values.yaml b/charts/trivy-operator/values.yaml
@@ -3,10 +3,7 @@ image:
   pullPolicy: Always
   tag: "2.3"
 
-env:
-  vars:
-    - name: LOG_LEVEL
-      value: "INFO"
+log_level: "INFO"
 
 imagePullSecrets: []
 podSecurityContext: