From 84fcb27c8b1c4f55e334aa6a48e38cd3da5928cd Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Thu, 2 Nov 2023 12:33:31 +0100 Subject: [PATCH] Added missing release label --- helm/template/Chart.yaml | 4 ++-- helm/template/_values.yaml | 2 ++ helm/template/templates/_podmonitor.yaml | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/helm/template/Chart.yaml b/helm/template/Chart.yaml index d12f247..baabb52 100644 --- a/helm/template/Chart.yaml +++ b/helm/template/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: template description: A Helm library chart containing common templates, keeping application templates short type: library -version: 0.1.22 +version: 0.1.23 maintainers: - name: Jim Martens url: https://2martens.de @@ -11,7 +11,7 @@ sources: annotations: artifacthub.io/changes: | - kind: fixed - description: Fixed type error + description: Added missing pod monitor label artifacthub.io/signKey: | fingerprint: F0F153B65BAD467201D7544E47393ABD1F96B7C8 url: https://mafiasi.de/pks/key/47393ABD1F96B7C8.asc diff --git a/helm/template/_values.yaml b/helm/template/_values.yaml index 31b6d4e..0581e47 100644 --- a/helm/template/_values.yaml +++ b/helm/template/_values.yaml @@ -61,6 +61,8 @@ prometheus: # namespace: the namespace of the Prometheus installation # the value is templated namespace: + # name of helm release or argo cd application + releaseName: # Overwrite with application specific environment variables # Each item has key and value, where the value is parsed as a template diff --git a/helm/template/templates/_podmonitor.yaml b/helm/template/templates/_podmonitor.yaml index 30dd076..3141c5c 100644 --- a/helm/template/templates/_podmonitor.yaml +++ b/helm/template/templates/_podmonitor.yaml @@ -7,6 +7,7 @@ metadata: namespace: {{ tpl (quote .Values.prometheus.namespace) . | default "observability" }} labels: {{- include "template.labels" . | nindent 4 }} + release: {{ .Values.prometheus.releaseName | quote | default "prometheus" }} spec: podMetricsEndpoints: - port: "{{ .Values.application.actuatorPort }}"