fix(helm): Fix label rendering in the monitoring subchart (#619)

Signed-off-by: Frank Jogeleit <[email protected]>
kyverno · Dec 3, 2024 · fe579fc · fe579fc
1 parent ac73a25
commit fe579fc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/charts/policy-reporter/Chart.yaml b/charts/policy-reporter/Chart.yaml
@@ -5,7 +5,7 @@ description: |
   It creates Prometheus Metrics and can send rule validation events to different targets like Loki, Elasticsearch, Slack or Discord
 
 type: application
-version: 3.0.0-rc.12
+version: 3.0.0-rc.13
 appVersion: 3.0.0-rc.7
 
 icon: https://github.com/kyverno/kyverno/raw/main/img/logo.png

diff --git 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.0.0-rc.12](https://img.shields.io/badge/Version-3.0.0--rc.12-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0-rc.7](https://img.shields.io/badge/AppVersion-3.0.0--rc.7-informational?style=flat-square)
+![Version: 3.0.0-rc.13](https://img.shields.io/badge/Version-3.0.0--rc.13-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0-rc.7](https://img.shields.io/badge/AppVersion-3.0.0--rc.7-informational?style=flat-square)
 
 ## Documentation
 

diff --git a/charts/policy-reporter/templates/monitoring/_helpers.tpl b/charts/policy-reporter/templates/monitoring/_helpers.tpl
@@ -23,18 +23,16 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "monitoring.labels" -}}
-{{- if not .Values.static }}
-helm.sh/chart: {{ include "monitoring.chart" . }}
-{{- end -}}
 {{ include "monitoring.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/component: monitoring
+app.kubernetes.io/part-of: kyverno
 {{- if not .Values.static }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+helm.sh/chart: {{ include "monitoring.chart" . }}
 {{- end }}
-app.kubernetes.io/part-of: kyverno
 {{- with .Values.global.labels }}
 {{ toYaml . }}
 {{- end -}}