From 0e692eaf30281379d390c840862122c5a42d2c28 Mon Sep 17 00:00:00 2001
From: Marcus Noble <github@marcusnoble.co.uk>
Date: Sat, 30 Mar 2024 17:14:51 +0000
Subject: [PATCH] Use implicit mapping for external domains

Signed-off-by: Marcus Noble <github@marcusnoble.co.uk>
---
 manifests/auth-proxy/auth-ingress.yaml     |  4 ++--
 manifests/auth-proxy/auth-proxy.yaml       | 18 ------------------
 manifests/auth-proxy/non-auth-ingress.yaml |  2 +-
 manifests/auth-proxy/proxy.yaml            | 10 ++++++----
 4 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/manifests/auth-proxy/auth-ingress.yaml b/manifests/auth-proxy/auth-ingress.yaml
index 3a57dc4..12af45d 100644
--- a/manifests/auth-proxy/auth-ingress.yaml
+++ b/manifests/auth-proxy/auth-ingress.yaml
@@ -20,9 +20,9 @@ spec:
         pathType: ImplementationSpecific
         backend:
           service:
-            name: auth-proxy-v2
+            name: tailscale-proxy
             port:
-              name: http
+              name: auth
 
 ---
 apiVersion: networking.k8s.io/v1
diff --git a/manifests/auth-proxy/auth-proxy.yaml b/manifests/auth-proxy/auth-proxy.yaml
index b7248bf..a69f39c 100644
--- a/manifests/auth-proxy/auth-proxy.yaml
+++ b/manifests/auth-proxy/auth-proxy.yaml
@@ -177,21 +177,3 @@ spec:
   type: ClusterIP
 
 ---
-
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: auth-proxy-v2
-  namespace: auth-proxy
-  labels:
-    app: auth-proxy-v2
-spec:
-  ports:
-  - name: http
-    port: 80
-    protocol: TCP
-    targetPort: 8181
-  selector:
-    app: internal-proxy
-  type: ClusterIP
diff --git a/manifests/auth-proxy/non-auth-ingress.yaml b/manifests/auth-proxy/non-auth-ingress.yaml
index dcc3ed0..22d88c9 100644
--- a/manifests/auth-proxy/non-auth-ingress.yaml
+++ b/manifests/auth-proxy/non-auth-ingress.yaml
@@ -22,4 +22,4 @@ spec:
           service:
             name: tailscale-proxy
             port:
-              name: http
+              name: non-auth
diff --git a/manifests/auth-proxy/proxy.yaml b/manifests/auth-proxy/proxy.yaml
index b396140..eb8fde2 100644
--- a/manifests/auth-proxy/proxy.yaml
+++ b/manifests/auth-proxy/proxy.yaml
@@ -13,9 +13,7 @@ data:
       "loki.auth-proxy.svc": "loki-write.cluster.local",
       "loki.auth-proxy.svc:80": "loki-write.cluster.local",
       "loki-distributed.auth-proxy.svc": "loki-loki.cluster.local",
-      "loki-distributed.auth-proxy.svc:80": "loki-loki.cluster.local",
-      "hello-world.cluster.fun": "hello-world.cluster.fun",
-      "hello.cluster.fun": "hello.cluster.fun"
+      "loki-distributed.auth-proxy.svc:80": "loki-loki.cluster.local"
     }
 ---
 apiVersion: apps/v1
@@ -120,10 +118,14 @@ metadata:
     app: internal-proxy
 spec:
   ports:
-  - name: http
+  - name: non-auth
     port: 80
     protocol: TCP
     targetPort: 8080
+  - name: auth
+    port: 81
+    protocol: TCP
+    targetPort: 8181
   selector:
     app: internal-proxy
   type: ClusterIP