From 8780c1ad343c727837a8270f50cb6dfb70b66c47 Mon Sep 17 00:00:00 2001
From: Chris Werner Rau <cwr@teuto.net>
Date: Mon, 10 Nov 2025 14:55:07 +0100
Subject: [PATCH] fix(base-cluster/monitoring): alertmanager condition

---
 .../kube-prometheus-stack/_alertmanager-config.yaml           | 2 +-
 .../kube-prometheus-stack/alertmanager-networkpolicy.yaml     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_alertmanager-config.yaml b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_alertmanager-config.yaml
index d1378ed4af..03a5f34a08 100644
--- a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_alertmanager-config.yaml
+++ b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_alertmanager-config.yaml
@@ -1,5 +1,5 @@
 {{ define "base-cluster.prometheus-stack.alertmanager.enabled" -}}
-  {{- not (empty .Values.monitoring.prometheus.alertmanager.receivers) -}}
+  {{- not (empty .Values.monitoring.prometheus.alertmanager.receivers) | ternary true "" -}}
 {{- end -}}
 
 {{- define "base-cluster.prometheus-stack.alertmanager.validateReceiverInRoute" -}}
diff --git a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/alertmanager-networkpolicy.yaml b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/alertmanager-networkpolicy.yaml
index 202d7ba536..9a1bd0cd4a 100644
--- a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/alertmanager-networkpolicy.yaml
+++ b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/alertmanager-networkpolicy.yaml
@@ -1,4 +1,4 @@
-{{- if eq (include "common.networkPolicy.type" .) "cilium" }}
+{{- if and (include "base-cluster.prometheus-stack.alertmanager.enabled" .) (eq (include "common.networkPolicy.type" .) "cilium") -}}
 apiVersion: cilium.io/v2
 kind: CiliumNetworkPolicy
 metadata:
@@ -30,4 +30,4 @@ spec:
             - port: {{ $port | quote }}
       {{- end }}
     {{- end }}
-{{- end }}
+{{- end -}}