Code-review changes:

- Removes customisation of the CA cert since this is generated by `kubewarden-controller` and there's no way to provide a custom one. - Aligns `--print` flag with kubewarden/audit-scanner#103
kubewarden · Sep 7, 2023 · dfce163 · dfce163
1 parent 3cf87d5
commit dfce163
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/charts/kubewarden-controller/chart-values.yaml b/charts/kubewarden-controller/chart-values.yaml
@@ -111,7 +111,5 @@ auditScanner:
   # Additional namespaces that the audit scanner will not scan:
   skipAdditionalNamespaces: []
   logLevel: info
-  # File path to CA cert in PEM format of PolicyServer endpoints
-  policyServerCa: "/pki/policy-server-root-ca-pem"
-  # Prints the result of scan in JSON to stdout
-  enableJsonReport: true
+  # Output result of scan to stdout in JSON upon completion
+  outputScan: true
diff --git a/charts/kubewarden-controller/templates/_helpers.tpl b/charts/kubewarden-controller/templates/_helpers.tpl
@@ -104,9 +104,9 @@ Create the name of the service account to use for kubewarden-controller
 - --loglevel
 - {{- .Values.auditScanner.logLevel }}
 - --extra-ca
-- {{- .Values.auditScanner.policyServerCa }}
-{{- if .Values.auditScanner.enableJsonReport }}
-- --print
+- "/pki/policy-server-root-ca-pem"
+{{- if .Values.auditScanner.outputScan }}
+- --output-scan
 {{- end }}
 {{- range .Values.global.skipNamespaces }}
 - {{ printf "-i" }}

diff --git a/charts/kubewarden-controller/values.yaml b/charts/kubewarden-controller/values.yaml
@@ -147,7 +147,5 @@ auditScanner:
   # Additional namespaces that the audit scanner will not scan:
   skipAdditionalNamespaces: []
   logLevel: info
-  # File path to CA cert in PEM format of PolicyServer endpoints
-  policyServerCa: "/pki/policy-server-root-ca-pem"
-  # Prints the result of scan in JSON to stdout
-  enableJsonReport: true
+  # Output result of scan to stdout in JSON upon completion
+  outputScan: true