update chart config

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

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/charts/policy-reporter/README.md b/charts/policy-reporter/README.md
@@ -49,7 +49,7 @@ Open `http://localhost:8082/` in your browser.
 | image.registry | string | `"ghcr.io"` | Image registry |
 | image.repository | string | `"kyverno/policy-reporter"` | Image repository |
 | image.pullPolicy | string | `"IfNotPresent"` | Image pullPolicy |
-| image.tag | string | `"0dfbaa0"` | Image tag |
+| image.tag | string | `"12da466"` | Image tag |
 | imagePullSecrets | list | `[]` | Image pullSecrets |
 | priorityClassName | string | `""` | Deployment priorityClassName |
 | replicaCount | int | `1` | Deployment replica count |
@@ -402,8 +402,9 @@ Open `http://localhost:8082/` in your browser.
 | plugin.kyverno.image.registry | string | `"ghcr.io"` | Image registry |
 | plugin.kyverno.image.repository | string | `"kyverno/policy-reporter/kyverno-plugin"` | Image repository |
 | plugin.kyverno.image.pullPolicy | string | `"IfNotPresent"` | Image PullPolicy |
-| plugin.kyverno.image.tag | string | `"0.2.2"` | Image tag Defaults to `Chart.AppVersion` if omitted |
+| plugin.kyverno.image.tag | string | `"0.3.0"` | Image tag Defaults to `Chart.AppVersion` if omitted |
 | plugin.kyverno.replicaCount | int | `1` | Deployment replica count |
+| plugin.kyverno.logging.api | bool | `false` | Enables external API request logging |
 | plugin.kyverno.logging.server | bool | `false` | Enables Server access logging |
 | plugin.kyverno.logging.encoding | string | `"console"` | log encoding possible encodings are console and json |
 | plugin.kyverno.logging.logLevel | int | `0` | log level default info |
@@ -459,8 +460,9 @@ Open `http://localhost:8082/` in your browser.
 | plugin.trivy.image.registry | string | `"ghcr.io"` | Image registry |
 | plugin.trivy.image.repository | string | `"kyverno/policy-reporter/trivy-plugin"` | Image repository |
 | plugin.trivy.image.pullPolicy | string | `"IfNotPresent"` | Image PullPolicy |
-| plugin.trivy.image.tag | string | `"0.0.3"` | Image tag Defaults to `Chart.AppVersion` if omitted |
+| plugin.trivy.image.tag | string | `"0.2.0"` | Image tag Defaults to `Chart.AppVersion` if omitted |
 | plugin.trivy.replicaCount | int | `1` | Deployment replica count |
+| plugin.trivy.logging.api | bool | `false` | Enables external API request logging |
 | plugin.trivy.logging.server | bool | `false` | Enables Server access logging |
 | plugin.trivy.logging.encoding | string | `"console"` | log encoding possible encodings are console and json |
 | plugin.trivy.logging.logLevel | int | `0` | log level default info |

diff --git a/charts/policy-reporter/configs/kyverno-plugin.tmpl b/charts/policy-reporter/configs/kyverno-plugin.tmpl
@@ -7,11 +7,12 @@ leaderElection:
   lockName: {{ .Values.plugin.kyverno.leaderElection.lockName }}
 
 logging:
+  api: {{ .Values.plugin.kyverno.logging.api }}
+  server: {{ .Values.plugin.kyverno.logging.server }}
   encoding: {{ .Values.plugin.kyverno.logging.encoding }}
   logLevel: {{ .Values.plugin.kyverno.logging.logLevel }}
 
 server:
-  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
@@ -1,9 +1,10 @@
 logging:
+  api: {{ .Values.plugin.trivy.logging.api }}
+  server: {{ .Values.plugin.trivy.logging.server }}
   encoding: {{ .Values.plugin.trivy.logging.encoding }}
   logLevel: {{ .Values.plugin.trivy.logging.logLevel }}
 
 server:
-  logging: {{ .Values.plugin.trivy.logging.server }}
   basicAuth:
     username: {{ .Values.basicAuth.username }}
     password: {{ .Values.basicAuth.password }}

diff --git a/charts/policy-reporter/templates/cluster-secret.yaml b/charts/policy-reporter/templates/cluster-secret.yaml
@@ -15,11 +15,11 @@ data:
   {{- $password := .Values.basicAuth.password }}
   host: {{ printf "http://%s:%d" (include "policyreporter.fullname" .) (.Values.service.port | int) | b64enc }}
   {{- if .Values.plugin.kyverno.enabled }}
-  {{- $host := printf "http://%s:%d/api" (include "kyverno-plugin.fullname" .) (.Values.plugin.kyverno.service.port | int) }}
+  {{- $host := printf "http://%s:%d" (include "kyverno-plugin.fullname" .) (.Values.plugin.kyverno.service.port | int) }}
   plugin.kyverno: {{ (printf "{\"host\":\"%s\", \"name\":\"kyverno\", \"username\":\"%s\", \"password\":\"%s\"}" $host $username $password) | b64enc }}
   {{- end }}
   {{- if .Values.plugin.trivy.enabled }}
-  {{- $host := printf "http://%s:%d/api/vulnr" (include "trivy-plugin.fullname" .) (.Values.plugin.trivy.service.port | int) }}
+  {{- $host := printf "http://%s:%d/vulnr" (include "trivy-plugin.fullname" .) (.Values.plugin.trivy.service.port | int) }}
   plugin.trivy: {{ (printf "{\"host\":\"%s\", \"name\":\"Trivy Vulnerability\", \"username\":\"%s\", \"password\":\"%s\"}" $host $username $password) | b64enc }}
   username: {{ $username | b64enc }}
   password: {{ $password | b64enc }}

diff --git a/charts/policy-reporter/values.yaml b/charts/policy-reporter/values.yaml
@@ -15,7 +15,7 @@ image:
   # -- (string) Image pullPolicy
   pullPolicy: IfNotPresent
   # -- (string) Image tag
-  tag: 0dfbaa0
+  tag: 12da466
 
 # -- Image pullSecrets
 imagePullSecrets: []
@@ -1102,12 +1102,14 @@ plugin:
       pullPolicy: IfNotPresent
         # -- (string) Image tag
         # Defaults to `Chart.AppVersion` if omitted
-      tag: "0.2.2"
+      tag: "0.3.0"
 
     # -- Deployment replica count
     replicaCount: 1
 
     logging:
+      # -- Enables external API request logging
+      api: false
       # -- Enables Server access logging
       server: false
       # -- log encoding
@@ -1291,12 +1293,14 @@ plugin:
       pullPolicy: IfNotPresent
         # -- (string) Image tag
         # Defaults to `Chart.AppVersion` if omitted
-      tag: "0.0.3"
+      tag: "0.2.0"
 
     # -- Deployment replica count
     replicaCount: 1
 
     logging:
+      # -- Enables external API request logging
+      api: false
       # -- Enables Server access logging
       server: false
       # -- log encoding