diff --git a/apps.yaml b/apps.yaml index f67e77a4e5..e59fb31d9a 100644 --- a/apps.yaml +++ b/apps.yaml @@ -360,7 +360,7 @@ appsInfo: integration: When enabled, Velero can be used to automatically create backups of APL platform services. Based on the selected provider, APL installs required plug-ins. APL also installs the Restic integration for Velero to back up and restore almost any type of Kubernetes volume. policy-reporter: title: policy-reporter - appVersion: 3.4.0 + appVersion: 3.4.2 repo: https://github.com/kyverno/policy-reporter maintainers: Frank Jogeleit license: Apache 2.0 diff --git a/chart/chart-index/Chart.yaml b/chart/chart-index/Chart.yaml index 54b073efb4..6e4413805f 100644 --- a/chart/chart-index/Chart.yaml +++ b/chart/chart-index/Chart.yaml @@ -115,5 +115,5 @@ dependencies: version: 5.4.1 repository: https://vmware-tanzu.github.io/helm-charts/ - name: policy-reporter - version: 3.4.0 + version: 3.4.2 repository: https://kyverno.github.io/policy-reporter diff --git a/charts/policy-reporter/Chart.yaml b/charts/policy-reporter/Chart.yaml index ed5e0a17c6..be638d8b28 100644 --- a/charts/policy-reporter/Chart.yaml +++ b/charts/policy-reporter/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 3.4.0 +appVersion: 3.4.2 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.4.0 +version: 3.4.2 diff --git a/charts/policy-reporter/README.md b/charts/policy-reporter/README.md index dd04a9f69a..2752830ca4 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.4.0](https://img.shields.io/badge/Version-3.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.4.0](https://img.shields.io/badge/AppVersion-3.4.0-informational?style=flat-square) +![Version: 3.4.2](https://img.shields.io/badge/Version-3.4.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.4.2](https://img.shields.io/badge/AppVersion-3.4.2-informational?style=flat-square) ## Documentation @@ -426,6 +426,7 @@ Open `http://localhost:8082/` in your browser. | ui.sidecarContainers | object | `{}` | Add sidecar containers to the UI deployment sidecarContainers: oauth-proxy: image: quay.io/oauth2-proxy/oauth2-proxy:v7.6.0 args: - --upstream=http://127.0.0.1:8080 - --http-address=0.0.0.0:8081 - ... ports: - containerPort: 8081 name: oauth-proxy protocol: TCP resources: {} | | ui.podAnnotations | object | `{}` | Additional annotations to add to each pod | | ui.podLabels | object | `{}` | Additional labels to add to each pod | +| ui.selectorLabels | object | `{}` | Custom selector labels, overwrites the default set | | ui.updateStrategy | object | `{}` | Deployment update strategy. Ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy | | ui.revisionHistoryLimit | int | `10` | The number of revisions to keep | | ui.podSecurityContext | object | `{"runAsGroup":1234,"runAsUser":1234}` | Security context for the pod | diff --git a/charts/policy-reporter/templates/ui/_helpers.tpl b/charts/policy-reporter/templates/ui/_helpers.tpl index 536e2cde0c..8b866db15d 100644 --- a/charts/policy-reporter/templates/ui/_helpers.tpl +++ b/charts/policy-reporter/templates/ui/_helpers.tpl @@ -42,9 +42,13 @@ helm.sh/chart: {{ include "ui.chart" . }} Selector labels */}} {{- define "ui.selectorLabels" -}} +{{- if .Values.ui.selectorLabels }} +{{- toYaml .Values.ui.selectorLabels }} +{{- else -}} app.kubernetes.io/name: {{ include "ui.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} +{{- end }} {{/* Create the name of the service account to use diff --git a/charts/policy-reporter/templates/ui/networkpolicy.yaml b/charts/policy-reporter/templates/ui/networkpolicy.yaml index 9278f7822b..328b5cc7b9 100644 --- a/charts/policy-reporter/templates/ui/networkpolicy.yaml +++ b/charts/policy-reporter/templates/ui/networkpolicy.yaml @@ -46,8 +46,8 @@ spec: - protocol: TCP port: {{ .Values.plugin.trivy.service.port }} {{- end }} - {{- with .Values.networkPolicy.egress }} + {{- with .Values.ui.networkPolicy.egress }} {{- toYaml . | nindent 2 }} {{- end }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/policy-reporter/values.yaml b/charts/policy-reporter/values.yaml index 5f20f56d03..ea045c0434 100644 --- a/charts/policy-reporter/values.yaml +++ b/charts/policy-reporter/values.yaml @@ -1136,6 +1136,9 @@ ui: # -- Additional labels to add to each pod podLabels: {} + # -- Custom selector labels, overwrites the default set + selectorLabels: {} + # -- Deployment update strategy. # Ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy updateStrategy: {}