Moved grafana ingress to auth-proxy

Signed-off-by: Marcus Noble <github@marcusnoble.co.uk>

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

manifests/monitoring/ingess.yaml

@@ -1,69 +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
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: prometheus-credentials
-  namespace: monitoring
-  annotations:
-    kube-1password: m7c2n5gqybiyxj6ylydju2nljm
-    kube-1password/vault: Kubernetes
-    kube-1password/password-key: auth
-type: Opaque
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: prometheus-cloud
-  namespace: monitoring
-  labels:
-    app: prometheus-cloud
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt
-    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
-    nginx.ingress.kubernetes.io/auth-type: basic
-    nginx.ingress.kubernetes.io/auth-secret: prometheus-credentials
-    nginx.ingress.kubernetes.io/auth-secret-type: auth-file
-spec:
-  ingressClassName: nginx
-  tls:
-  - hosts:
-    - prometheus-cloud.cluster.fun
-    secretName: prometheus-cloud-ingress
-  rules:
-  - host: prometheus-cloud.cluster.fun
-    http:
-      paths:
-      - path: /
-        pathType: ImplementationSpecific
-        backend:
-          service:
-            name: prometheus-server
-            port:
-              number: 80