diff --git a/charts/policy-reporter/Chart.lock b/charts/policy-reporter/Chart.lock index 77a57036..589e3a5e 100644 --- a/charts/policy-reporter/Chart.lock +++ b/charts/policy-reporter/Chart.lock @@ -1,12 +1,12 @@ dependencies: - name: monitoring repository: "" - version: 2.7.1 + version: 2.7.2 - name: ui repository: "" - version: 2.9.6 + version: 2.9.7 - name: kyvernoPlugin repository: "" - version: 1.5.6 -digest: sha256:f5d6911c70a5472dbf753983c924b6e8dbdf48eba43f4b65dd28d92221440616 -generated: "2023-07-06T16:57:22.253715+02:00" + version: 1.5.7 +digest: sha256:1797cbd9bdbc80961ce2877ff812137bf57eb22abbbbd027db4b733feeaa58e6 +generated: "2023-07-30T11:15:57.408246+02:00" diff --git a/charts/policy-reporter/Chart.yaml b/charts/policy-reporter/Chart.yaml index c52aace5..ae5836ee 100644 --- a/charts/policy-reporter/Chart.yaml +++ b/charts/policy-reporter/Chart.yaml @@ -5,8 +5,8 @@ description: | It creates Prometheus Metrics and can send rule validation events to different targets like Loki, Elasticsearch, Slack or Discord type: application -version: 2.19.4 -appVersion: 2.15.2 +version: 2.19.5 +appVersion: 2.15.4 icon: https://github.com/kyverno/kyverno/raw/main/img/logo.png home: https://kyverno.github.io/policy-reporter @@ -18,10 +18,10 @@ maintainers: dependencies: - name: monitoring condition: monitoring.enabled - version: "2.7.1" + version: "2.7.2" - name: ui condition: ui.enabled - version: "2.9.6" + version: "2.9.7" - name: kyvernoPlugin condition: kyvernoPlugin.enabled - version: "1.5.6" + version: "1.5.7" diff --git a/charts/policy-reporter/README.md b/charts/policy-reporter/README.md index 182ff966..e5bdeb64 100644 --- a/charts/policy-reporter/README.md +++ b/charts/policy-reporter/README.md @@ -1,6 +1,6 @@ # Policy Reporter -![Version: v2.19.2](https://img.shields.io/badge/Version-v2.19.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.15.2](https://img.shields.io/badge/AppVersion-v2.15.2-informational?style=flat-square) +![Version: v2.19.5](https://img.shields.io/badge/Version-v2.19.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.15.4](https://img.shields.io/badge/AppVersion-v2.15.4-informational?style=flat-square) ## Motivation diff --git a/charts/policy-reporter/charts/kyvernoPlugin/Chart.yaml b/charts/policy-reporter/charts/kyvernoPlugin/Chart.yaml index 01f264a8..15df8534 100644 --- a/charts/policy-reporter/charts/kyvernoPlugin/Chart.yaml +++ b/charts/policy-reporter/charts/kyvernoPlugin/Chart.yaml @@ -3,5 +3,5 @@ name: kyvernoPlugin description: Policy Reporter Kyverno Plugin type: application -version: 1.5.6 +version: 1.5.7 appVersion: 1.5.1 \ No newline at end of file diff --git a/charts/policy-reporter/charts/kyvernoPlugin/templates/_helpers.tpl b/charts/policy-reporter/charts/kyvernoPlugin/templates/_helpers.tpl index 21053492..a198d3c4 100644 --- a/charts/policy-reporter/charts/kyvernoPlugin/templates/_helpers.tpl +++ b/charts/policy-reporter/charts/kyvernoPlugin/templates/_helpers.tpl @@ -36,7 +36,7 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} app.kubernetes.io/component: plugin app.kubernetes.io/managed-by: {{ .Release.Service }} -app.kubernetes.io/part-of: {{ include "policyreporter.name" . }} +app.kubernetes.io/part-of: policy-reporter {{- with .Values.global.labels }} {{ toYaml . }} {{- end -}} @@ -56,7 +56,7 @@ Pod labels {{- define "kyvernoplugin.podLabels" -}} helm.sh/chart: {{ include "kyvernoplugin.chart" . }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -app.kubernetes.io/part-of: {{ include "policyreporter.name" . }} +app.kubernetes.io/part-of: policy-reporter {{- end }} {{/* diff --git a/charts/policy-reporter/charts/kyvernoPlugin/values.yaml b/charts/policy-reporter/charts/kyvernoPlugin/values.yaml index 98e1f592..e1dcbcad 100644 --- a/charts/policy-reporter/charts/kyvernoPlugin/values.yaml +++ b/charts/policy-reporter/charts/kyvernoPlugin/values.yaml @@ -182,3 +182,16 @@ networkPolicy: - protocol: TCP port: 6443 ingress: [] + +# Should be set in the parent chart only +global: + # available plugins + plugins: + # enable kyverno for Policy Reporter UI and monitoring + kyverno: false + # overwrite the fullname of all resources including subcharts + fullnameOverride: "" + # configure the namespace of all resources including subcharts + namespace: "" + # additional labels added on each resource + labels: {} diff --git a/charts/policy-reporter/charts/monitoring/Chart.yaml b/charts/policy-reporter/charts/monitoring/Chart.yaml index efe0ec79..a469eb95 100644 --- a/charts/policy-reporter/charts/monitoring/Chart.yaml +++ b/charts/policy-reporter/charts/monitoring/Chart.yaml @@ -3,5 +3,5 @@ name: monitoring description: Policy Reporter Monitoring with predefined ServiceMonitor and Grafana Dashboards type: application -version: 2.7.1 +version: 2.7.2 appVersion: 0.0.0 diff --git a/charts/policy-reporter/charts/monitoring/templates/_helpers.tpl b/charts/policy-reporter/charts/monitoring/templates/_helpers.tpl index 9808e994..25404c02 100644 --- a/charts/policy-reporter/charts/monitoring/templates/_helpers.tpl +++ b/charts/policy-reporter/charts/monitoring/templates/_helpers.tpl @@ -14,11 +14,18 @@ If release name contains chart name it will be used as a full name. {{- end }} {{- end }} +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "monitoring.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + {{/* Common labels */}} {{- define "monitoring.labels" -}} -helm.sh/chart: {{ include "policyreporter.chart" . }} +helm.sh/chart: {{ include "monitoring.chart" . }} {{ include "monitoring.selectorLabels" . }} {{- if .Chart.AppVersion }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} @@ -68,3 +75,11 @@ app.kubernetes.io/instance: {{ .Release.Name }} {{- .Release.Namespace -}} {{- end }} {{- end }} + +{{/* +Policy Reporter Selector labels +*/}} +{{- define "policyreporter.selectorLabels" -}} +app.kubernetes.io/name: policy-reporter +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} diff --git a/charts/policy-reporter/charts/monitoring/values.yaml b/charts/policy-reporter/charts/monitoring/values.yaml index 2c20a03b..7d439f70 100644 --- a/charts/policy-reporter/charts/monitoring/values.yaml +++ b/charts/policy-reporter/charts/monitoring/values.yaml @@ -118,3 +118,16 @@ policyReportOverview: height: 10 failingClusterPolicyRuleTable: height: 10 + +# Should be set in the parent chart only +global: + # available plugins + plugins: + # enable kyverno for Policy Reporter UI and monitoring + kyverno: false + # overwrite the fullname of all resources including subcharts + fullnameOverride: "" + # configure the namespace of all resources including subcharts + namespace: "" + # additional labels added on each resource + labels: {} diff --git a/charts/policy-reporter/charts/ui/Chart.yaml b/charts/policy-reporter/charts/ui/Chart.yaml index f139d3ea..e5e1a777 100644 --- a/charts/policy-reporter/charts/ui/Chart.yaml +++ b/charts/policy-reporter/charts/ui/Chart.yaml @@ -3,5 +3,5 @@ name: ui description: Policy Reporter UI type: application -version: 2.9.6 +version: 2.9.7 appVersion: 1.8.4 diff --git a/charts/policy-reporter/charts/ui/templates/_helpers.tpl b/charts/policy-reporter/charts/ui/templates/_helpers.tpl index 4acef88c..cf814751 100644 --- a/charts/policy-reporter/charts/ui/templates/_helpers.tpl +++ b/charts/policy-reporter/charts/ui/templates/_helpers.tpl @@ -36,7 +36,7 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} app.kubernetes.io/component: ui app.kubernetes.io/managed-by: {{ .Release.Service }} -app.kubernetes.io/part-of: {{ include "policyreporter.name" . }} +app.kubernetes.io/part-of: policy-reporter {{- with .Values.global.labels }} {{ toYaml . }} {{- end -}} @@ -59,7 +59,7 @@ Pod labels {{- define "ui.podLabels" -}} helm.sh/chart: {{ include "ui.chart" . }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -app.kubernetes.io/part-of: {{ include "policyreporter.name" . }} +app.kubernetes.io/part-of: policy-reporter {{- end }} {{/* diff --git a/charts/policy-reporter/charts/ui/values.yaml b/charts/policy-reporter/charts/ui/values.yaml index 19e212e6..6f48b5c3 100644 --- a/charts/policy-reporter/charts/ui/values.yaml +++ b/charts/policy-reporter/charts/ui/values.yaml @@ -207,3 +207,16 @@ topologySpreadConstraints: [] networkPolicy: enabled: false egress: [] + +# Should be set in the parent chart only +global: + # available plugins + plugins: + # enable kyverno for Policy Reporter UI and monitoring + kyverno: false + # overwrite the fullname of all resources including subcharts + fullnameOverride: "" + # configure the namespace of all resources including subcharts + namespace: "" + # additional labels added on each resource + labels: {} diff --git a/charts/policy-reporter/templates/_helpers.tpl b/charts/policy-reporter/templates/_helpers.tpl index 35eaf252..644d1935 100644 --- a/charts/policy-reporter/templates/_helpers.tpl +++ b/charts/policy-reporter/templates/_helpers.tpl @@ -36,7 +36,7 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} app.kubernetes.io/component: reporting app.kubernetes.io/managed-by: {{ .Release.Service }} -app.kubernetes.io/part-of: {{ include "policyreporter.name" . }} +app.kubernetes.io/part-of: policy-reporter {{- with .Values.global.labels }} {{ toYaml . }} {{- end -}} @@ -48,14 +48,14 @@ Pod labels {{- define "policyreporter.podLabels" -}} helm.sh/chart: {{ include "policyreporter.chart" . }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -app.kubernetes.io/part-of: {{ include "policyreporter.name" . }} +app.kubernetes.io/part-of: policy-reporter {{- end }} {{/* Selector labels */}} {{- define "policyreporter.selectorLabels" -}} -app.kubernetes.io/name: {{ include "policyreporter.name" . }} +app.kubernetes.io/name: policy-reporter app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} diff --git a/charts/policy-reporter/values.yaml b/charts/policy-reporter/values.yaml index 2a829aa1..9a079018 100644 --- a/charts/policy-reporter/values.yaml +++ b/charts/policy-reporter/values.yaml @@ -5,7 +5,7 @@ image: registry: ghcr.io repository: kyverno/policy-reporter pullPolicy: IfNotPresent - tag: 2.15.2 + tag: 2.15.4 imagePullSecrets: []