From 9e1610443f87e4f7e232220a1e2500db9b8365eb Mon Sep 17 00:00:00 2001 From: Thomas Philipona Date: Mon, 16 Oct 2023 20:35:08 +0200 Subject: [PATCH] Fix am --- .../templates/_user-am-servicemonitor.yaml | 2 +- .../user-monitoring/templates/_user-am.yaml | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/charts/user-monitoring/templates/_user-am-servicemonitor.yaml b/charts/user-monitoring/templates/_user-am-servicemonitor.yaml index f21f31c..21c11a0 100644 --- a/charts/user-monitoring/templates/_user-am-servicemonitor.yaml +++ b/charts/user-monitoring/templates/_user-am-servicemonitor.yaml @@ -1,4 +1,4 @@ -{{- define "alertmanager.sm" }} +{{- define "alertmanager.servicemonitor" }} --- apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor diff --git a/charts/user-monitoring/templates/_user-am.yaml b/charts/user-monitoring/templates/_user-am.yaml index a705937..9d34b6c 100644 --- a/charts/user-monitoring/templates/_user-am.yaml +++ b/charts/user-monitoring/templates/_user-am.yaml @@ -23,4 +23,30 @@ spec: resources: requests: storage: 100Mi +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + annotations: + haproxy.org/auth-secret: basic-auth + haproxy.org/auth-type: basic-auth + haproxy.org/auth-realm: Authentication Required + name: {{ .Values.user }}-alertmanager +spec: + ingressClassName: haproxy + rules: + - host: {{ .Values.user }}-alertmanager.training.cluster.acend.ch + http: + paths: + - backend: + service: + name: alertmanager-operated + port: + number: 9093 + path: / + pathType: ImplementationSpecific + tls: + - hosts: + - {{ .Values.user }}-alertmanager.training.cluster.acend.ch + secretName: acend-wildcard {{- end }} \ No newline at end of file