helm chart cleanup

Signed-off-by: Frank Jogeleit <[email protected]>
kyverno · Oct 5, 2024 · 12da466 · 12da466
1 parent 344f4ef
commit 12da466
Show file tree

Hide file tree

Showing 12 changed files with 981 additions and 864 deletions.
diff --git a/charts/policy-reporter/README.md b/charts/policy-reporter/README.md
diff --git a/charts/policy-reporter/README.md.gotmpl b/charts/policy-reporter/README.md.gotmpl
@@ -6,7 +6,7 @@
 
 ## Documentation
 
-You can find detailed Information and Screens about Features and Configurations in the [Documentation](https://kyverno.github.io/policy-reporter/guide/02-getting-started#core--policy-reporter-ui).
+You can find detailed Information and Screens about Features and Configurations in the [Documentation](https://kyverno.github.io/policy-reporter-docs).
 
 ## Installation with Helm v3
 
@@ -31,20 +31,13 @@ helm install policy-reporter policy-reporter/policy-reporter -n policy-reporter
 You can use the Policy Reporter as standalone Application along with the optional UI SubChart.
 
 ### Installation with Policy Reporter UI and Kyverno Plugin enabled
+
 ```bash
-helm install policy-reporter policy-reporter/policy-reporter --set kyvernoPlugin.enabled=true --set ui.enabled=true --set ui.plugins.kyverno=true -n policy-reporter --create-namespace
+helm install policy-reporter policy-reporter/policy-reporter --set plugin.kyverno.enabled=true --set ui.enabled=true -n policy-reporter --create-namespace
 kubectl port-forward service/policy-reporter-ui 8082:8080 -n policy-reporter
 ```
 Open `http://localhost:8082/` in your browser.
 
-Check the [Documentation](https://kyverno.github.io/policy-reporter/guide/02-getting-started#core--policy-reporter-ui) for Screens and additional Information
-
-## Resources
-
-* [[Video] 37. #EveryoneCanContribute cafe: Policy reporter for Kyverno](https://youtu.be/1mKywg9f5Fw)
-* [[Video] Rawkode Live: Hands on Policy Reporter](https://www.youtube.com/watch?v=ZrOtTELNLyg)
-* [[Blog] Monitor Security and Best Practices with Kyverno and Policy Reporter](https://blog.webdev-jogeleit.de/blog/monitor-security-with-kyverno-and-policy-reporter/)
-
 
 {{ template "chart.valuesSection" . }}
 

diff --git a/charts/policy-reporter/configs/core.tmpl b/charts/policy-reporter/configs/core.tmpl
@@ -169,7 +169,6 @@ sourceConfig:
 logging:
   encoding: {{ .Values.logging.encoding }}
   logLevel: {{ include "policyreporter.logLevel" . }}
-  development: {{ .Values.logging.development }}
 
 api:
   logging: {{ .Values.api.logging }}

diff --git a/charts/policy-reporter/configs/kyverno-plugin.tmpl b/charts/policy-reporter/configs/kyverno-plugin.tmpl
@@ -11,7 +11,7 @@ logging:
   logLevel: {{ .Values.plugin.kyverno.logging.logLevel }}
 
 server:
-  logging: {{ .Values.plugin.kyverno.server.logging }}
+  logging: {{ .Values.plugin.kyverno.logging.server }}
   basicAuth:
     username: {{ .Values.basicAuth.username }}
     password: {{ .Values.basicAuth.password }}

diff --git a/charts/policy-reporter/configs/trivy-plugin.tmpl b/charts/policy-reporter/configs/trivy-plugin.tmpl
@@ -3,7 +3,7 @@ logging:
   logLevel: {{ .Values.plugin.trivy.logging.logLevel }}
 
 server:
-  logging: {{ .Values.plugin.trivy.server.logging }}
+  logging: {{ .Values.plugin.trivy.logging.server }}
   basicAuth:
     username: {{ .Values.basicAuth.username }}
     password: {{ .Values.basicAuth.password }}

diff --git a/charts/policy-reporter/configs/ui.tmpl b/charts/policy-reporter/configs/ui.tmpl
@@ -3,13 +3,14 @@ namespace: {{ .Release.Namespace }}
 tempDir: {{ .Values.ui.tempDir }}
 
 logging:
-  enabled: {{ .Values.ui.logging.enabled }}
+  api: {{ .Values.ui.logging.api }}
+  server: {{ .Values.ui.logging.server }}
   encoding: {{ .Values.ui.logging.encoding }}
   logLevel: {{ .Values.ui.logging.logLevel }}
 
 server:
   port: {{ .Values.ui.server.port }}
-  logging: {{ .Values.ui.server.logging }}
+  cors: {{ .Values.ui.server.cors }}
   overwriteHost: {{ .Values.ui.server.overwriteHost }}
 
 ui:

diff --git a/charts/policy-reporter/templates/deployment.yaml b/charts/policy-reporter/templates/deployment.yaml
@@ -12,9 +12,9 @@ metadata:
 spec:
   replicas: {{ .Values.replicaCount }}
   revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
-  {{- if .Values.deploymentStrategy }}
+  {{- with .Values.plugin.kyverno.updateStrategy }}
   strategy:
-    {{- toYaml .Values.deploymentStrategy | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
   selector:
     matchLabels: