From bdf95f0bf53467bad9b625eec45727b1a8a6e8ce Mon Sep 17 00:00:00 2001
From: Marcus Noble <github@marcusnoble.co.uk>
Date: Sat, 6 Apr 2024 13:23:52 +0100
Subject: [PATCH] Moved grafana ingress to auth-proxy

Signed-off-by: Marcus Noble <github@marcusnoble.co.uk>
---
 manifests/auth-proxy/auth-ingress.yaml | 11 ++++++++++
 manifests/monitoring/ingess.yaml       | 28 --------------------------
 2 files changed, 11 insertions(+), 28 deletions(-)
 delete mode 100644 manifests/monitoring/ingess.yaml

diff --git a/manifests/auth-proxy/auth-ingress.yaml b/manifests/auth-proxy/auth-ingress.yaml
index dfc6c02..f8cb6ac 100644
--- a/manifests/auth-proxy/auth-ingress.yaml
+++ b/manifests/auth-proxy/auth-ingress.yaml
@@ -26,6 +26,7 @@ spec:
     - transmission.cluster.fun
     - tekton.cluster.fun
     - changedetection.cluster.fun
+    - grafana.cluster.fun
     secretName: auth-proxy-ingress
   rules:
   - host: downloads.cluster.fun
@@ -188,3 +189,13 @@ spec:
             name: tailscale-proxy
             port:
               name: auth
+  - host: grafana.cluster.fun
+    http:
+      paths:
+      - path: /
+        pathType: ImplementationSpecific
+        backend:
+          service:
+            name: tailscale-proxy
+            port:
+              name: auth
diff --git a/manifests/monitoring/ingess.yaml b/manifests/monitoring/ingess.yaml
deleted file mode 100644
index ca5b0ee..0000000
--- a/manifests/monitoring/ingess.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: grafana
-  namespace: auth-proxy
-  labels:
-    app: grafana
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt
-    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
-spec:
-  ingressClassName: nginx
-  tls:
-  - hosts:
-    - grafana.cluster.fun
-    secretName: grafana-ingress
-  rules:
-  - host: grafana.cluster.fun
-    http:
-      paths:
-      - path: /
-        pathType: ImplementationSpecific
-        backend:
-          service:
-            name: auth-proxy
-            port:
-              number: 80
----