From ab1969bd7b03a1c85f3bf237d277ea8d6312f9de Mon Sep 17 00:00:00 2001
From: Snarf <snarf@snarfnet.net>
Date: Fri, 6 Nov 2026 01:08:46 -0500
Subject: [PATCH] feat: streamline DNS Ingress to pihole1, pihole2, dns1, dns2
 and remove legacy aliases

---
 manifests/aerodrome/dns/dns-stack.yaml | 24 +-----------------------
 manifests/spaceport/dns/dns-stack.yaml | 15 ++-------------
 2 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/manifests/aerodrome/dns/dns-stack.yaml b/manifests/aerodrome/dns/dns-stack.yaml
index c180d02..c3f1335 100644
--- a/manifests/aerodrome/dns/dns-stack.yaml
+++ b/manifests/aerodrome/dns/dns-stack.yaml
@@ -83,7 +83,7 @@ spec:
         - name: DNS_SERVER_SSO_ENABLED
           value: "true"
         - name: DNS_SERVER_SSO_METADATA_ADDRESS
-          value: "https://authentik.snarfnet.net/application/o/technitium/.well-known/openid-configuration"
+          value: "https://authentik.snarfnet.net/application/o/dns1/.well-known/openid-configuration"
         - name: DNS_SERVER_SSO_CLIENT_ID
           value: "technitium-dns-oidc"
         - name: DNS_SERVER_SSO_CLIENT_SECRET
@@ -320,16 +320,6 @@ metadata:
 spec:
   ingressClassName: traefik
   rules:
-  - host: pihole.snarfnet.net
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: pihole-web-vip
-            port:
-              number: 80
   - host: pihole1.snarfnet.net
     http:
       paths:
@@ -342,7 +332,6 @@ spec:
               number: 80
   tls:
   - hosts:
-    - pihole.snarfnet.net
     - pihole1.snarfnet.net
     secretName: tls-snarfnet-wildcard
 ---
@@ -360,16 +349,6 @@ metadata:
 spec:
   ingressClassName: traefik
   rules:
-  - host: technitium.snarfnet.net
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: technitium-web-vip
-            port:
-              number: 5380
   - host: dns1.snarfnet.net
     http:
       paths:
@@ -382,7 +361,6 @@ spec:
               number: 5380
   tls:
   - hosts:
-    - technitium.snarfnet.net
     - dns1.snarfnet.net
     secretName: tls-snarfnet-wildcard
 
diff --git a/manifests/spaceport/dns/dns-stack.yaml b/manifests/spaceport/dns/dns-stack.yaml
index e055a3e..c751374 100644
--- a/manifests/spaceport/dns/dns-stack.yaml
+++ b/manifests/spaceport/dns/dns-stack.yaml
@@ -83,9 +83,9 @@ spec:
         - name: DNS_SERVER_SSO_ENABLED
           value: "true"
         - name: DNS_SERVER_SSO_METADATA_ADDRESS
-          value: "https://authentik.snarfnet.net/application/o/technitium/.well-known/openid-configuration"
+          value: "https://authentik.snarfnet.net/application/o/dns2/.well-known/openid-configuration"
         - name: DNS_SERVER_SSO_CLIENT_ID
-          value: "technitium-dns-oidc"
+          value: "technitium2-dns-oidc"
         - name: DNS_SERVER_SSO_CLIENT_SECRET
           value: "SnarfNetTechnitiumOIDC2026!"
         - name: DNS_SERVER_SSO_SCOPES
@@ -330,20 +330,9 @@ spec:
             name: pihole-web-vip
             port:
               number: 80
-  - host: pihole3.snarfnet.net
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: pihole-web-vip
-            port:
-              number: 80
   tls:
   - hosts:
     - pihole2.snarfnet.net
-    - pihole3.snarfnet.net
     secretName: tls-snarfnet-wildcard
 ---
 # -------------------------------------------------------------