From e8b4b5a00ba78eb0db44eb03f361fae261619e0f Mon Sep 17 00:00:00 2001
From: Jon <jonathon.lockwood@networkedweb.com>
Date: Sun, 4 Feb 2024 17:07:31 +0930
Subject: [PATCH] fix(ingress): move from values to template for dynomagic
 setup

!8
---
 templates/Ingress-Multi.yaml | 50 +++++++++++++++++++++++++++++++++---
 values.yaml                  | 48 ++++++++++------------------------
 2 files changed, 59 insertions(+), 39 deletions(-)

diff --git a/templates/Ingress-Multi.yaml b/templates/Ingress-Multi.yaml
index cbe93ca..874e2c0 100644
--- a/templates/Ingress-Multi.yaml
+++ b/templates/Ingress-Multi.yaml
@@ -1,4 +1,4 @@
-{{ if .Values.nfc_monitoring.alert_manager.ingress.enabled | default "false" -}}
+{{ if .Values.nfc_monitoring.alert_manager.ingress.enabled -}}
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -8,7 +8,21 @@ metadata:
   annotations:
     {{ toYaml $.Values.nfc_monitoring.alert_manager.ingress.annotations | nindent 4 }}
 spec:
-  {{ toYaml $.Values.nfc_monitoring.alert_manager.ingress.spec | nindent 2 }}
+  tls:
+    - hosts:
+        - {{ .Values.nfc_monitoring.alert_manager.ingress.hostname }}
+      secretName: certificate-tls-alert-manager
+  rules:
+    - host:  {{ .Values.nfc_monitoring.alert_manager.ingress.hostname }}
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: alertmanager-{{ $.Release.Name }}
+                port:
+                  name: web
 
 {{ end }}
 
@@ -23,7 +37,21 @@ metadata:
   annotations:
     {{ toYaml $.Values.nfc_monitoring.grafana.ingress.annotations | nindent 4 }}
 spec:
-  {{ toYaml $.Values.nfc_monitoring.grafana.ingress.spec | nindent 2 }}
+  tls:
+    - hosts:
+        - {{ .Values.nfc_monitoring.grafana.ingress.hostname }}
+      secretName: certificate-tls-grafana
+  rules:
+    - host:  {{ .Values.nfc_monitoring.grafana.ingress.hostname }}
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: grafana
+                port:
+                  name: grafana-http
 
 {{ end }}
 {{ end }}
@@ -38,6 +66,20 @@ metadata:
   annotations:
     {{ toYaml $.Values.nfc_monitoring.prometheus.ingress.annotations | nindent 4 }}
 spec:
-  {{ toYaml $.Values.nfc_monitoring.prometheus.ingress.spec | nindent 2 }}
+  tls:
+    - hosts:
+        - {{ .Values.nfc_monitoring.prometheus.ingress.hostname }}
+      secretName: certificate-tls-prometheus
+  rules:
+    - host:  {{ .Values.nfc_monitoring.prometheus.ingress.hostname }}
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: prometheus-{{ $.Release.Name }}
+                port:
+                  name: web
 
 {{ end }}
diff --git a/values.yaml b/values.yaml
index 32dc5ed..0aeb57b 100644
--- a/values.yaml
+++ b/values.yaml
@@ -26,23 +26,11 @@ nfc_monitoring:
       annotations:
         cert-manager.io/cluster-issuer: "selfsigned-issuer"
         nginx.ingress.kubernetes.io/ssl-redirect: "true"
-      # enabled: false # Optional, boolean.
-      spec:
-        tls:
-          - hosts:
-              - alert-manager.local
-            secretName: certificate-tls-alert-manager
-        rules:
-          - host:  alert-manager.local
-            http:
-              paths:
-                - path: /
-                  pathType: Prefix
-                  backend:
-                    service:
-                      name: alertmanager-main
-                      port:
-                        name: web
+      
+      enabled: false
+
+      hostname: alert-manager.local
+
     
     labels:
       app.kubernetes.io/component: alert-router
@@ -84,23 +72,11 @@ nfc_monitoring:
       annotations:
         cert-manager.io/cluster-issuer: "selfsigned-issuer"
         nginx.ingress.kubernetes.io/ssl-redirect: "true"
-      # enabled: false # Optional, boolean.
-      spec:
-        tls:
-          - hosts:
-              - grafana.local
-            secretName: certificate-tls-grafana
-        rules:
-          - host:  grafana.local
-            http:
-              paths:
-                - path: /
-                  pathType: Prefix
-                  backend:
-                    service:
-                      name: grafana
-                      port:
-                        name: grafana-http
+      
+      enabled: true
+      
+      hostname:  grafana.local
+
 
     labels:
       app.kubernetes.io/component: graphing
@@ -268,6 +244,9 @@ nfc_monitoring:
     # How many replicas to deploy
     replicas: 1
 
+    # alertmanagers:
+    #   - name: 
+
     # Configure prometheus to write metrics to remote host
     # below example config uses a secret named "prometheus-remote-write" with two keys username and password.
     # Documentation: https://prometheus-operator.dev/docs/operator/api/#monitoring.coreos.com/v1.RemoteWriteSpec
@@ -738,7 +717,6 @@ nfc_monitoring:
                   podSelector:
                     matchLabels:
                       app.kubernetes.io/component: prometheus
-                      app.kubernetes.io/instance: k8s
                       app.kubernetes.io/name: prometheus
               ports:
                 - port: 12345