diff --git a/chart/chart-index/Chart.yaml b/chart/chart-index/Chart.yaml index dcdc5adb0d..32adb69c0a 100644 --- a/chart/chart-index/Chart.yaml +++ b/chart/chart-index/Chart.yaml @@ -92,7 +92,7 @@ dependencies: version: 0.117.0 repository: https://open-telemetry.github.io/opentelemetry-helm-charts - name: policy-reporter - version: 3.7.4 + version: 3.8.1 repository: https://kyverno.github.io/policy-reporter - name: prometheus-blackbox-exporter version: 11.15.1 diff --git a/charts/policy-reporter/Chart.yaml b/charts/policy-reporter/Chart.yaml index c391b6b71b..7cd598cc57 100644 --- a/charts/policy-reporter/Chart.yaml +++ b/charts/policy-reporter/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 3.7.4 +appVersion: 3.8.1 description: 'Policy Reporter watches for PolicyReport Resources. It creates Prometheus Metrics and can send rule validation events to different targets like Loki, Elasticsearch, Slack or Discord ' @@ -12,4 +12,4 @@ name: policy-reporter sources: - https://github.com/kyverno/policy-reporter type: application -version: 3.7.4 +version: 3.8.1 diff --git a/charts/policy-reporter/README.md b/charts/policy-reporter/README.md index ec84888d40..53ba51211b 100644 --- a/charts/policy-reporter/README.md +++ b/charts/policy-reporter/README.md @@ -3,7 +3,7 @@ Policy Reporter watches for PolicyReport Resources. It creates Prometheus Metrics and can send rule validation events to different targets like Loki, Elasticsearch, Slack or Discord -![Version: 3.7.4](https://img.shields.io/badge/Version-3.7.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.7.4](https://img.shields.io/badge/AppVersion-3.7.4-informational?style=flat-square) +![Version: 3.8.1](https://img.shields.io/badge/Version-3.8.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.8.1](https://img.shields.io/badge/AppVersion-3.8.1-informational?style=flat-square) ## Documentation @@ -396,7 +396,7 @@ Open `http://localhost:8082/` in your browser. | ui.image.registry | string | `"ghcr.io"` | Image registry | | ui.image.repository | string | `"kyverno/policy-reporter-ui"` | Image repository | | ui.image.pullPolicy | string | `"IfNotPresent"` | Image PullPolicy | -| ui.image.tag | string | `"2.5.1"` | Image tag | +| ui.image.tag | string | `"2.6.1"` | Image tag | | ui.crds.customBoard | bool | `false` | Install UI CustomBoard CRDs | | ui.replicaCount | int | `1` | Deployment replica count | | ui.priorityClassName | string | `""` | Deployment priorityClassName | @@ -492,7 +492,7 @@ 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.6.0"` | Image tag | +| plugin.kyverno.image.tag | string | `"0.6.2"` | Image tag | | plugin.kyverno.replicaCount | int | `1` | Deployment replica count | | plugin.kyverno.priorityClassName | string | `""` | Deployment priorityClassName | | plugin.kyverno.logging.api | bool | `false` | Enables external API request logging | @@ -565,11 +565,11 @@ 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.4.12"` | Image tag Defaults to `Chart.AppVersion` if omitted | +| plugin.trivy.image.tag | string | `"0.4.15"` | Image tag Defaults to `Chart.AppVersion` if omitted | | plugin.trivy.cli.image.registry | string | `"ghcr.io"` | Image registry | | plugin.trivy.cli.image.repository | string | `"aquasecurity/trivy"` | Image repository | | plugin.trivy.cli.image.pullPolicy | string | `"IfNotPresent"` | Image PullPolicy | -| plugin.trivy.cli.image.tag | string | `"0.69.3"` | Image tag Defaults to `Chart.AppVersion` if omitted | +| plugin.trivy.cli.image.tag | string | `"0.72.0"` | Image tag Defaults to `Chart.AppVersion` if omitted | | plugin.trivy.extraArgs | object | `{}` | Additional container args. | | plugin.trivy.cveawg.disable | bool | `false` | disable external CVEAWG API calls. | | plugin.trivy.github.disable | bool | `false` | disable GitHub API calls. | @@ -633,6 +633,7 @@ Open `http://localhost:8082/` in your browser. | plugin.trivy.extraConfig | object | `{}` | Extra configuration options appended to trivy plugin settings | | monitoring.enabled | bool | `false` | Enables the Prometheus Operator integration | | monitoring.annotations | object | `{}` | Key/value pairs that are attached to all resources. | +| monitoring.serviceMonitor.enabled | bool | `true` | | | monitoring.serviceMonitor.honorLabels | bool | `false` | HonorLabels chooses the metrics labels on collisions with target labels | | monitoring.serviceMonitor.namespace | string | `nil` | Allow to override the namespace for serviceMonitor | | monitoring.serviceMonitor.labels | object | `{}` | Labels to match the serviceMonitorSelector of the Prometheus Resource | diff --git a/charts/policy-reporter/templates/httproute.yaml b/charts/policy-reporter/templates/httproute.yaml index 769609679d..3219aedec8 100644 --- a/charts/policy-reporter/templates/httproute.yaml +++ b/charts/policy-reporter/templates/httproute.yaml @@ -42,7 +42,9 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} backendRefs: - - name: {{ $fullName }} + - group: '' + kind: Service + name: {{ $fullName }} port: {{ $svcPort }} weight: 1 {{- end }} diff --git a/charts/policy-reporter/templates/monitoring/servicemonitor.yaml b/charts/policy-reporter/templates/monitoring/servicemonitor.yaml index 130fb82110..5aae1a45b6 100644 --- a/charts/policy-reporter/templates/monitoring/servicemonitor.yaml +++ b/charts/policy-reporter/templates/monitoring/servicemonitor.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.monitoring.enabled }} +{{- if and .Values.monitoring.enabled .Values.monitoring.serviceMonitor.enabled }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: diff --git a/charts/policy-reporter/templates/plugins/kyverno/httproute.yaml b/charts/policy-reporter/templates/plugins/kyverno/httproute.yaml index c4863a9700..88a384c8aa 100644 --- a/charts/policy-reporter/templates/plugins/kyverno/httproute.yaml +++ b/charts/policy-reporter/templates/plugins/kyverno/httproute.yaml @@ -36,7 +36,9 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} backendRefs: - - name: {{ $fullName }} + - group: '' + kind: Service + name: {{ $fullName }} port: {{ $svcPort }} weight: 1 {{- end }} diff --git a/charts/policy-reporter/templates/ui/httproute.yaml b/charts/policy-reporter/templates/ui/httproute.yaml index dab4250bc6..fc15e17cb6 100644 --- a/charts/policy-reporter/templates/ui/httproute.yaml +++ b/charts/policy-reporter/templates/ui/httproute.yaml @@ -36,7 +36,9 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} backendRefs: - - name: {{ $fullName }} + - group: '' + kind: Service + name: {{ $fullName }} port: {{ $svcPort }} weight: 1 {{- end }} diff --git a/charts/policy-reporter/values.yaml b/charts/policy-reporter/values.yaml index d09588d026..795d6b37e4 100644 --- a/charts/policy-reporter/values.yaml +++ b/charts/policy-reporter/values.yaml @@ -1003,7 +1003,7 @@ ui: # -- (string) Image PullPolicy pullPolicy: IfNotPresent # -- (string) Image tag - tag: "2.5.1" + tag: "2.6.1" crds: # -- Install UI CustomBoard CRDs @@ -1383,7 +1383,7 @@ plugin: # -- (string) Image PullPolicy pullPolicy: IfNotPresent # -- (string) Image tag - tag: "0.6.0" + tag: "0.6.2" # -- Deployment replica count replicaCount: 1 @@ -1633,7 +1633,7 @@ plugin: pullPolicy: IfNotPresent # -- (string) Image tag # Defaults to `Chart.AppVersion` if omitted - tag: "0.4.12" + tag: "0.4.15" cli: image: @@ -1645,7 +1645,7 @@ plugin: pullPolicy: IfNotPresent # -- (string) Image tag # Defaults to `Chart.AppVersion` if omitted - tag: "0.69.3" + tag: "0.72.0" # -- Additional container args. extraArgs: {} @@ -1870,6 +1870,7 @@ monitoring: annotations: {} serviceMonitor: + enabled: true # -- HonorLabels chooses the metrics labels on collisions with target labels honorLabels: false # -- Allow to override the namespace for serviceMonitor