[kube-prometheus-stack] Add support for deploying Alertmanager in a custom namespace

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

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 -}}
+    {{- include "kube-prometheus-stack.namespace" . -}}
+  {{- end -}}
+{{- end -}}
+
 {{/*
 Allow kube-state-metrics job name to be overridden
 */}}

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 }}

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 }}

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 }}

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

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 }}

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 }}

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 }}

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 }}

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 }}

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 }}

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 }}

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

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 }}

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

charts/kube-prometheus-stack/values.yaml

@@ -392,6 +392,9 @@ alertmanager:
   ##
   enabled: true
 
+  # Optional: Override the namespace where Alertmanager will be deployed.
+  namespaceOverride: ""
+
   ## Annotations for Alertmanager
   ##
   annotations: {}