From 15001dc6ad9a20e41596dfad598a3f91b70b5ab2 Mon Sep 17 00:00:00 2001
From: Andrei Kvapil <kvapss@gmail.com>
Date: Mon, 7 Oct 2024 21:12:53 +0200
Subject: [PATCH] Fix ingress for grafana and alerta (#401)

Signed-off-by: Andrei Kvapil <kvapss@gmail.com>

Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
---
 packages/extra/monitoring/templates/alerta/alerta.yaml   | 8 ++++----
 packages/extra/monitoring/templates/grafana/grafana.yaml | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/extra/monitoring/templates/alerta/alerta.yaml b/packages/extra/monitoring/templates/alerta/alerta.yaml
index 18932f56..30aa2493 100644
--- a/packages/extra/monitoring/templates/alerta/alerta.yaml
+++ b/packages/extra/monitoring/templates/alerta/alerta.yaml
@@ -148,18 +148,18 @@ metadata:
   labels:
     app: alerta
   annotations:
-    acme.cert-manager.io/http01-ingress-class: {{ $ingress }}
     {{- if ne $issuerType "cloudflare" }} 
-    acme.cert-manager.io/http01-ingress-class: {{ $ingress }}  
+    acme.cert-manager.io/http01-ingress-class: {{ $ingress }}
     {{- end }} 
+    cert-manager.io/cluster-issuer: letsencrypt-prod
 spec:
   ingressClassName: {{ $ingress }}
   tls:
     - hosts:
-        - "{{ .Values.host | default (printf "alerta.%s" $host) }}"
+        - "{{ printf "alerta.%s" (.Values.host | default $host) }}"
       secretName: alerta-tls
   rules:
-    - host: "{{ .Values.host | default (printf "alerta.%s" $host) }}"
+    - host: "{{ printf "alerta.%s" (.Values.host | default $host) }}"
       http:
         paths:
           - path: /
diff --git a/packages/extra/monitoring/templates/grafana/grafana.yaml b/packages/extra/monitoring/templates/grafana/grafana.yaml
index 4e1e65a6..bce84d13 100644
--- a/packages/extra/monitoring/templates/grafana/grafana.yaml
+++ b/packages/extra/monitoring/templates/grafana/grafana.yaml
@@ -25,7 +25,7 @@ spec:
       password: ${GF_DATABASE_PASSWORD}
       #ssl_mode: require
     server:
-      root_url: "https://{{ .Values.host | default (printf "grafana.%s" $host) }}"
+      root_url: "https://{{ printf "grafana.%s" (.Values.host | default $host) }}"
     security:
       admin_user: user
       admin_password: ${GF_PASSWORD}
@@ -100,7 +100,7 @@ spec:
     spec:
       ingressClassName: "{{ $ingress }}"
       rules:
-        - host: "{{ .Values.host | default (printf "grafana.%s" $host) }}"
+        - host: "{{ printf "grafana.%s" (.Values.host | default $host) }}"
           http:
             paths:
               - backend:
@@ -112,5 +112,5 @@ spec:
                 pathType: Prefix
       tls:
       - hosts:
-        - "{{ .Values.host | default (printf "grafana.%s" $host) }}"
+        - "{{ printf "grafana.%s" (.Values.host | default $host) }}"
         secretName: grafana-ingress-tls