From c43f4b2d3351122dd0c4aa001dcf25dcffe84a02 Mon Sep 17 00:00:00 2001
From: Eoin Farrell <me@eoinfarrell.dev>
Date: Fri, 24 May 2024 10:58:40 +0100
Subject: [PATCH] [kube-prometheus-stack] Correctly set version to
 alertManagerSpec.version (#4561)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jan-Otto Kröpke <github@jkroepke.de>
---
 charts/kube-prometheus-stack/Chart.yaml                         | 2 +-
 .../templates/alertmanager/alertmanager.yaml                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml
index 79ad3f2edc8b..9aaefc90b7a2 100644
--- a/charts/kube-prometheus-stack/Chart.yaml
+++ b/charts/kube-prometheus-stack/Chart.yaml
@@ -23,7 +23,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 58.7.1
+version: 58.7.2
 appVersion: v0.73.2
 kubeVersion: ">=1.19.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus
diff --git a/charts/kube-prometheus-stack/templates/alertmanager/alertmanager.yaml b/charts/kube-prometheus-stack/templates/alertmanager/alertmanager.yaml
index 7bd16476fa73..19008893bc31 100644
--- a/charts/kube-prometheus-stack/templates/alertmanager/alertmanager.yaml
+++ b/charts/kube-prometheus-stack/templates/alertmanager/alertmanager.yaml
@@ -23,7 +23,7 @@ spec:
   {{- else }}
   image: "{{ $registry }}/{{ .Values.alertmanager.alertmanagerSpec.image.repository }}"
   {{- end }}
-  version: {{ .Values.alertmanager.alertmanagerSpec.image.tag }}
+  version: {{ default .Values.alertmanager.alertmanagerSpec.image.tag .Values.alertmanager.alertmanagerSpec.version }}
   {{- if .Values.alertmanager.alertmanagerSpec.image.sha }}
   sha: {{ .Values.alertmanager.alertmanagerSpec.image.sha }}
   {{- end }}