From 20234470d792a5d335f4f1402a18fef55d58e210 Mon Sep 17 00:00:00 2001 From: Anselm Eberhardt Date: Mon, 2 Dec 2024 08:59:33 +0100 Subject: [PATCH 1/2] Enable usage of serviceMonitor.additionalLabels Up to now the field was present in the values.yaml but did not get used in the servicemonitor template. Signed-off-by: Anselm Eberhardt --- charts/jiralert/Chart.yaml | 2 +- charts/jiralert/templates/servicemonitor.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/jiralert/Chart.yaml b/charts/jiralert/Chart.yaml index 2900efa5bb6c..5228065cef45 100755 --- a/charts/jiralert/Chart.yaml +++ b/charts/jiralert/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: jiralert description: A Helm chart for Kubernetes to install jiralert type: application -version: 1.7.1 +version: 1.7.2 appVersion: "v1.3.0" home: "https://github.com/prometheus-community/jiralert" keywords: diff --git a/charts/jiralert/templates/servicemonitor.yaml b/charts/jiralert/templates/servicemonitor.yaml index 65d9fa9c4486..fdee76593a67 100644 --- a/charts/jiralert/templates/servicemonitor.yaml +++ b/charts/jiralert/templates/servicemonitor.yaml @@ -8,6 +8,9 @@ metadata: {{- end }} labels: {{- include "jiralert.labels" . | nindent 4 }} + {{- with .Values.serviceMonitor.additionalLabels }} +{{- toYaml . | nindent 4 }} + {{- end }} spec: endpoints: - port: http From 2f288dc5ab948753a465eb9f245e9f8f0a1db237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Mon, 2 Dec 2024 10:03:22 +0100 Subject: [PATCH 2/2] Update charts/jiralert/templates/servicemonitor.yaml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan-Otto Kröpke --- charts/jiralert/templates/servicemonitor.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/jiralert/templates/servicemonitor.yaml b/charts/jiralert/templates/servicemonitor.yaml index fdee76593a67..392063d98dbb 100644 --- a/charts/jiralert/templates/servicemonitor.yaml +++ b/charts/jiralert/templates/servicemonitor.yaml @@ -9,7 +9,7 @@ metadata: labels: {{- include "jiralert.labels" . | nindent 4 }} {{- with .Values.serviceMonitor.additionalLabels }} -{{- toYaml . | nindent 4 }} + {{- toYaml . | nindent 4 }} {{- end }} spec: endpoints: