From 1924bc55851c3bdc4e74198af89ec616348707dd Mon Sep 17 00:00:00 2001
From: Mohamed Shafiq <mohamed.shafiq@elastisys.com>
Date: Tue, 8 Apr 2025 14:23:47 +0200
Subject: [PATCH 1/6] added custom namespace for alertmanager

Signed-off-by: Mohamed Shafiq <mohamed.shafiq@elastisys.com>
---
 charts/kube-prometheus-stack/templates/_helpers.tpl   | 11 +++++++++++
 .../templates/alertmanager/alertmanager.yaml          |  2 +-
 .../templates/alertmanager/extrasecret.yaml           |  2 +-
 .../templates/alertmanager/ingress.yaml               |  2 +-
 .../templates/alertmanager/ingressperreplica.yaml     |  2 +-
 .../templates/alertmanager/networkpolicy.yaml         |  2 +-
 .../templates/alertmanager/podDisruptionBudget.yaml   |  2 +-
 .../templates/alertmanager/psp-role.yaml              |  2 +-
 .../templates/alertmanager/psp-rolebinding.yaml       |  4 ++--
 .../templates/alertmanager/route.yaml                 |  2 +-
 .../templates/alertmanager/secret.yaml                |  2 +-
 .../templates/alertmanager/service.yaml               |  2 +-
 .../templates/alertmanager/serviceaccount.yaml        |  2 +-
 .../templates/alertmanager/servicemonitor.yaml        |  2 +-
 .../templates/alertmanager/serviceperreplica.yaml     |  2 +-
 charts/kube-prometheus-stack/values.yaml              |  3 +++
 16 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/charts/kube-prometheus-stack/templates/_helpers.tpl b/charts/kube-prometheus-stack/templates/_helpers.tpl
index b6d2e512075a..d0924f083509 100644
--- a/charts/kube-prometheus-stack/templates/_helpers.tpl
+++ b/charts/kube-prometheus-stack/templates/_helpers.tpl
@@ -159,6 +159,17 @@ Use the grafana namespace override for multi-namespace deployments in combined c
   {{- end -}}
 {{- end -}}
 
+{{/*
+Use the Alertmanager namespace override for multi-namespace deployments in combined charts
+*/}}
+{{- define "kube-prometheus-stack-alertmanager.namespace" -}}
+  {{- if .Values.alertmanager.namespaceOverride -}}
+    {{- .Values.alertmanager.namespaceOverride -}}
+  {{- else -}}
+    {{- .Release.Namespace -}}
+  {{- end -}}
+{{- end -}}
+
 {{/*
 Allow kube-state-metrics job name to be overridden
 */}}
diff --git a/charts/kube-prometheus-stack/templates/alertmanager/alertmanager.yaml b/charts/kube-prometheus-stack/templates/alertmanager/alertmanager.yaml
index c7cc401138a7..b80c8d541a7e 100644
--- a/charts/kube-prometheus-stack/templates/alertmanager/alertmanager.yaml
+++ b/charts/kube-prometheus-stack/templates/alertmanager/alertmanager.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: Alertmanager
 metadata:
   name: {{ template "kube-prometheus-stack.alertmanager.crname" . }}
-  namespace: {{ template "kube-prometheus-stack.namespace" . }}
+  namespace: {{ template "kube-prometheus-stack-alertmanager.namespace" . }}
   labels:
     app: {{ template "kube-prometheus-stack.name" . }}-alertmanager
 {{ include "kube-prometheus-stack.labels" . | indent 4 }}
diff --git a/charts/kube-prometheus-stack/templates/alertmanager/extrasecret.yaml b/charts/kube-prometheus-stack/templates/alertmanager/extrasecret.yaml
index ecd8f47021c4..22118bf22b71 100644
--- a/charts/kube-prometheus-stack/templates/alertmanager/extrasecret.yaml
+++ b/charts/kube-prometheus-stack/templates/alertmanager/extrasecret.yaml
@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ default $secretName .Values.alertmanager.extraSecret.name }}
-  namespace: {{ template "kube-prometheus-stack.namespace" . }}
+  namespace: {{ template "kube-prometheus-stack-alertmanager.namespace" . }}
 {{- if .Values.alertmanager.extraSecret.annotations }}
   annotations:
 {{ toYaml .Values.alertmanager.extraSecret.annotations | indent 4 }}
diff --git a/charts/kube-prometheus-stack/templates/alertmanager/ingress.yaml b/charts/kube-prometheus-stack/templates/alertmanager/ingress.yaml
index be9f5aa279c4..0464fd59fdd0 100644
--- a/charts/kube-prometheus-stack/templates/alertmanager/ingress.yaml
+++ b/charts/kube-prometheus-stack/templates/alertmanager/ingress.yaml
@@ -11,7 +11,7 @@ apiVersion: {{ include "kube-prometheus-stack.ingress.apiVersion" . }}
 kind: Ingress
 metadata:
   name: {{ $serviceName }}
-  namespace: {{ template "kube-prometheus-stack.namespace" . }}
+  namespace: {{ template "kube-prometheus-stack-alertmanager.namespace" . }}
 {{- if .Values.alertmanager.ingress.annotations }}
   annotations:
     {{- tpl (toYaml .Values.alertmanager.ingress.annotations) . | nindent 4 }}
diff --git a/charts/kube-prometheus-stack/templates/alertmanager/ingressperreplica.yaml b/charts/kube-prometheus-stack/templates/alertmanager/ingressperreplica.yaml
index b2e00a416290..c47cf5cb73df 100644
--- a/charts/kube-prometheus-stack/templates/alertmanager/ingressperreplica.yaml
+++ b/charts/kube-prometheus-stack/templates/alertmanager/ingressperreplica.yaml
@@ -9,7 +9,7 @@ apiVersion: v1
 kind: List
 metadata:
   name: {{ include "kube-prometheus-stack.fullname" $ }}-alertmanager-ingressperreplica
-  namespace: {{ template "kube-prometheus-stack.namespace" . }}
+  namespace: {{ template "kube-prometheus-stack-alertmanager.namespace" . }}
 items:
 {{ range $i, $e := until $count }}
   - kind: Ingress
diff --git a/charts/kube-prometheus-stack/templates/alertmanager/networkpolicy.yaml b/charts/kube-prometheus-stack/templates/alertmanager/networkpolicy.yaml
index 320e6a70dea1..d2dbc8ca0915 100644
--- a/charts/kube-prometheus-stack/templates/alertmanager/networkpolicy.yaml
+++ b/charts/kube-prometheus-stack/templates/alertmanager/networkpolicy.yaml
@@ -3,7 +3,7 @@ apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
   name: {{ template "kube-prometheus-stack.fullname" . }}-alertmanager
-  namespace: {{ template "kube-prometheus-stack.namespace" . }}
+  namespace: {{ template "kube-prometheus-stack-alertmanager.namespace" . }}
   labels:
     app: {{ template "kube-prometheus-stack.name" . }}-alertmanager
     {{- include "kube-prometheus-stack.labels" . | nindent 4 }}
diff --git a/charts/kube-prometheus-stack/templates/alertmanager/podDisruptionBudget.yaml b/charts/kube-prometheus-stack/templates/alertmanager/podDisruptionBudget.yaml
index b18340312531..50e994ea6e23 100644
--- a/charts/kube-prometheus-stack/templates/alertmanager/podDisruptionBudget.yaml
+++ b/charts/kube-prometheus-stack/templates/alertmanager/podDisruptionBudget.yaml
@@ -3,7 +3,7 @@ apiVersion: {{ include "kube-prometheus-stack.pdb.apiVersion" . }}
 kind: PodDisruptionBudget
 metadata:
   name: {{ template "kube-prometheus-stack.fullname" . }}-alertmanager
-  namespace: {{ template "kube-prometheus-stack.namespace" . }}
+  namespace: {{ template "kube-prometheus-stack-alertmanager.namespace" . }}
   labels:
     app: {{ template "kube-prometheus-stack.name" . }}-alertmanager
 {{ include "kube-prometheus-stack.labels" . | indent 4 }}
diff --git a/charts/kube-prometheus-stack/templates/alertmanager/psp-role.yaml b/charts/kube-prometheus-stack/templates/alertmanager/psp-role.yaml
index e8da52e0f45e..02b448d6c8d3 100644
--- a/charts/kube-prometheus-stack/templates/alertmanager/psp-role.yaml
+++ b/charts/kube-prometheus-stack/templates/alertmanager/psp-role.yaml
@@ -4,7 +4,7 @@ kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ template "kube-prometheus-stack.fullname" . }}-alertmanager
-  namespace: {{ template "kube-prometheus-stack.namespace" . }}
+  namespace: {{ template "kube-prometheus-stack-alertmanager.namespace" . }}
   labels:
     app: {{ template "kube-prometheus-stack.name" . }}-alertmanager
 {{ include "kube-prometheus-stack.labels" . | indent 4 }}
diff --git a/charts/kube-prometheus-stack/templates/alertmanager/psp-rolebinding.yaml b/charts/kube-prometheus-stack/templates/alertmanager/psp-rolebinding.yaml
index 71a8ec41dc7f..9568e464e6d4 100644
--- a/charts/kube-prometheus-stack/templates/alertmanager/psp-rolebinding.yaml
+++ b/charts/kube-prometheus-stack/templates/alertmanager/psp-rolebinding.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ template "kube-prometheus-stack.fullname" . }}-alertmanager
-  namespace: {{ template "kube-prometheus-stack.namespace" . }}
+  namespace: {{ template "kube-prometheus-stack-alertmanager.namespace" . }}
   labels:
     app: {{ template "kube-prometheus-stack.name" . }}-alertmanager
 {{ include "kube-prometheus-stack.labels" . | indent 4 }}
@@ -15,6 +15,6 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ template "kube-prometheus-stack.alertmanager.serviceAccountName" . }}
-    namespace: {{ template "kube-prometheus-stack.namespace" . }}
+    namespace: {{ template "kube-prometheus-stack-alertmanager.namespace" . }}
 {{- end }}
 {{- end }}
diff --git a/charts/kube-prometheus-stack/templates/alertmanager/route.yaml b/charts/kube-prometheus-stack/templates/alertmanager/route.yaml
index ea2684d2edd8..167c058a749f 100644
--- a/charts/kube-prometheus-stack/templates/alertmanager/route.yaml
+++ b/charts/kube-prometheus-stack/templates/alertmanager/route.yaml
@@ -12,7 +12,7 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   name: {{ $serviceName }}{{ if ne $name "main" }}-{{ $name }}{{ end }}
-  namespace: {{ template "kube-prometheus-stack.namespace" $ }}
+  namespace: {{ template "kube-prometheus-stack-alertmanager.namespace" $ }}
   labels:
     app: {{ template "kube-prometheus-stack.name" $ }}-alertmanager
     {{- include "kube-prometheus-stack.labels" $ | nindent 4 }}
diff --git a/charts/kube-prometheus-stack/templates/alertmanager/secret.yaml b/charts/kube-prometheus-stack/templates/alertmanager/secret.yaml
index c3549f89b6dc..6cf39e9ad50b 100644
--- a/charts/kube-prometheus-stack/templates/alertmanager/secret.yaml
+++ b/charts/kube-prometheus-stack/templates/alertmanager/secret.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: alertmanager-{{ template "kube-prometheus-stack.alertmanager.crname" . }}
-  namespace: {{ template "kube-prometheus-stack.namespace" . }}
+  namespace: {{ template "kube-prometheus-stack-alertmanager.namespace" . }}
 {{- if .Values.alertmanager.secret.annotations }}
   annotations:
 {{ toYaml .Values.alertmanager.secret.annotations | indent 4 }}
diff --git a/charts/kube-prometheus-stack/templates/alertmanager/service.yaml b/charts/kube-prometheus-stack/templates/alertmanager/service.yaml
index 96fc76fbc0bb..e82c51756e32 100644
--- a/charts/kube-prometheus-stack/templates/alertmanager/service.yaml
+++ b/charts/kube-prometheus-stack/templates/alertmanager/service.yaml
@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "kube-prometheus-stack.fullname" . }}-alertmanager
-  namespace: {{ template "kube-prometheus-stack.namespace" . }}
+  namespace: {{ template "kube-prometheus-stack-alertmanager.namespace" . }}
   labels:
     app: {{ template "kube-prometheus-stack.name" . }}-alertmanager
     self-monitor: {{ .Values.alertmanager.serviceMonitor.selfMonitor | quote }}
diff --git a/charts/kube-prometheus-stack/templates/alertmanager/serviceaccount.yaml b/charts/kube-prometheus-stack/templates/alertmanager/serviceaccount.yaml
index 745ced8bdedf..51f78906ae0d 100644
--- a/charts/kube-prometheus-stack/templates/alertmanager/serviceaccount.yaml
+++ b/charts/kube-prometheus-stack/templates/alertmanager/serviceaccount.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ template "kube-prometheus-stack.alertmanager.serviceAccountName" . }}
-  namespace: {{ template "kube-prometheus-stack.namespace" . }}
+  namespace: {{ template "kube-prometheus-stack-alertmanager.namespace" . }}
   labels:
     app: {{ template "kube-prometheus-stack.name" . }}-alertmanager
     app.kubernetes.io/name: {{ template "kube-prometheus-stack.name" . }}-alertmanager
diff --git a/charts/kube-prometheus-stack/templates/alertmanager/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/alertmanager/servicemonitor.yaml
index f2d924f8bf2d..16608083eb15 100644
--- a/charts/kube-prometheus-stack/templates/alertmanager/servicemonitor.yaml
+++ b/charts/kube-prometheus-stack/templates/alertmanager/servicemonitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "kube-prometheus-stack.fullname" . }}-alertmanager
-  namespace: {{ template "kube-prometheus-stack.namespace" . }}
+  namespace: {{ template "kube-prometheus-stack-alertmanager.namespace" . }}
   labels:
     app: {{ template "kube-prometheus-stack.name" . }}-alertmanager
 {{ include "kube-prometheus-stack.labels" . | indent 4 }}
diff --git a/charts/kube-prometheus-stack/templates/alertmanager/serviceperreplica.yaml b/charts/kube-prometheus-stack/templates/alertmanager/serviceperreplica.yaml
index 75a13bdf9729..6322df838fb3 100644
--- a/charts/kube-prometheus-stack/templates/alertmanager/serviceperreplica.yaml
+++ b/charts/kube-prometheus-stack/templates/alertmanager/serviceperreplica.yaml
@@ -5,7 +5,7 @@ apiVersion: v1
 kind: List
 metadata:
   name: {{ include "kube-prometheus-stack.fullname" $ }}-alertmanager-serviceperreplica
-  namespace: {{ template "kube-prometheus-stack.namespace" . }}
+  namespace: {{ template "kube-prometheus-stack-alertmanager.namespace" . }}
 items:
 {{- range $i, $e := until $count }}
   - apiVersion: v1
diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml
index bf02f9a02e75..22b0f788afde 100644
--- a/charts/kube-prometheus-stack/values.yaml
+++ b/charts/kube-prometheus-stack/values.yaml
@@ -391,6 +391,9 @@ alertmanager:
   ## Deploy alertmanager
   ##
   enabled: true
+  
+  # Optional: Override the namespace where Alertmanager will be deployed. 
+  namespaceOverride: ""
 
   ## Annotations for Alertmanager
   ##

From 24ae8fcbf1a794735417d6e22a2f2d79bff82a1b Mon Sep 17 00:00:00 2001
From: Mohamed Shafiq <mohamed.shafiq@elastisys.com>
Date: Tue, 8 Apr 2025 14:25:49 +0200
Subject: [PATCH 2/6] bumped chart version

Signed-off-by: Mohamed Shafiq <mohamed.shafiq@elastisys.com>
---
 charts/kube-prometheus-stack/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml
index b46f53ad7c16..535ff2478207 100644
--- a/charts/kube-prometheus-stack/Chart.yaml
+++ b/charts/kube-prometheus-stack/Chart.yaml
@@ -31,7 +31,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 70.4.2
+version: 70.4.3
 appVersion: v0.81.0
 kubeVersion: ">=1.19.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus

From 094644667c3351e297628befe3dbb4fc41320772 Mon Sep 17 00:00:00 2001
From: Mohamed Shafiq <mohamed.shafiq@elastisys.com>
Date: Wed, 9 Apr 2025 11:20:23 +0200
Subject: [PATCH 3/6] added pr comment change

Signed-off-by: Mohamed Shafiq <mohamed.shafiq@elastisys.com>
---
 charts/kube-prometheus-stack/templates/_helpers.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/kube-prometheus-stack/templates/_helpers.tpl b/charts/kube-prometheus-stack/templates/_helpers.tpl
index d0924f083509..38471b159cd6 100644
--- a/charts/kube-prometheus-stack/templates/_helpers.tpl
+++ b/charts/kube-prometheus-stack/templates/_helpers.tpl
@@ -166,7 +166,7 @@ Use the Alertmanager namespace override for multi-namespace deployments in combi
   {{- if .Values.alertmanager.namespaceOverride -}}
     {{- .Values.alertmanager.namespaceOverride -}}
   {{- else -}}
-    {{- .Release.Namespace -}}
+    {{- include "kube-prometheus-stack.namespace" . -}}
   {{- end -}}
 {{- end -}}
 

From 0202167dbc9b45b9ec6a83e167e9db72462a6017 Mon Sep 17 00:00:00 2001
From: Mohamed Shafiq <mohamed.shafiq@elastisys.com>
Date: Thu, 10 Apr 2025 15:00:27 +0200
Subject: [PATCH 4/6] fixed ci issue

Signed-off-by: Mohamed Shafiq <mohamed.shafiq@elastisys.com>
---
 charts/kube-prometheus-stack/values.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml
index 22b0f788afde..d762a65ad0b3 100644
--- a/charts/kube-prometheus-stack/values.yaml
+++ b/charts/kube-prometheus-stack/values.yaml
@@ -8,7 +8,7 @@ nameOverride: ""
 
 ## Override the deployment namespace
 ##
-namespaceOverride: ""
+namespaceOverride: "monitoring"
 
 ## Provide a k8s version to auto dashboard import script example: kubeTargetVersionOverride: 1.26.6
 ##
@@ -392,7 +392,7 @@ alertmanager:
   ##
   enabled: true
   
-  # Optional: Override the namespace where Alertmanager will be deployed. 
+  # Optional: Override the namespace where Alertmanager will be deployed.
   namespaceOverride: ""
 
   ## Annotations for Alertmanager

From 50b288ac822dcc05d8057989f49d5de1425ce80a Mon Sep 17 00:00:00 2001
From: Mohamed Shafiq <mohamed.shafiq@elastisys.com>
Date: Thu, 10 Apr 2025 23:53:36 +0200
Subject: [PATCH 5/6] fixing ci issues

Signed-off-by: Mohamed Shafiq <mohamed.shafiq@elastisys.com>
---
 charts/kube-prometheus-stack/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml
index d762a65ad0b3..035f6e3d3865 100644
--- a/charts/kube-prometheus-stack/values.yaml
+++ b/charts/kube-prometheus-stack/values.yaml
@@ -391,7 +391,7 @@ alertmanager:
   ## Deploy alertmanager
   ##
   enabled: true
-  
+
   # Optional: Override the namespace where Alertmanager will be deployed.
   namespaceOverride: ""
 

From 907f8a7ea61a18546aabe2016926426e9cabbcf9 Mon Sep 17 00:00:00 2001
From: Mohamed Shafiq <mohamed.shafiq@elastisys.com>
Date: Fri, 11 Apr 2025 09:23:12 +0200
Subject: [PATCH 6/6] removed namespaceoverride

Signed-off-by: Mohamed Shafiq <mohamed.shafiq@elastisys.com>
---
 charts/kube-prometheus-stack/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml
index 035f6e3d3865..1bda50938ce4 100644
--- a/charts/kube-prometheus-stack/values.yaml
+++ b/charts/kube-prometheus-stack/values.yaml
@@ -8,7 +8,7 @@ nameOverride: ""
 
 ## Override the deployment namespace
 ##
-namespaceOverride: "monitoring"
+namespaceOverride: ""
 
 ## Provide a k8s version to auto dashboard import script example: kubeTargetVersionOverride: 1.26.6
 ##