From 399f68627928b916a0a21b68711e55f175e5d309 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Fri, 5 May 2023 13:19:38 -0400
Subject: [PATCH] fix: use ingress subdomain instead of ipv4 to better reflect
 usage

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 kubernetes/apps/default/echo-server/app/helmrelease.yaml      | 2 +-
 .../apps/flux-system/addons/webhooks/github/ingress.yaml      | 2 +-
 .../apps/networking/cloudflared/app/configs/config.yaml       | 4 ++--
 kubernetes/apps/networking/cloudflared/app/dnsendpoint.yaml   | 4 ++--
 kubernetes/apps/networking/ingress-nginx/app/helmrelease.yaml | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/kubernetes/apps/default/echo-server/app/helmrelease.yaml b/kubernetes/apps/default/echo-server/app/helmrelease.yaml
index 5e0b94a8..200d20ee 100644
--- a/kubernetes/apps/default/echo-server/app/helmrelease.yaml
+++ b/kubernetes/apps/default/echo-server/app/helmrelease.yaml
@@ -56,7 +56,7 @@ spec:
         enabled: true
         ingressClassName: nginx
         annotations:
-          external-dns.alpha.kubernetes.io/target: "ipv4.${SECRET_DOMAIN}"
+          external-dns.alpha.kubernetes.io/target: "ingress.${SECRET_DOMAIN}"
           hajimari.io/icon: video-input-antenna
         hosts:
           - host: &host "{{ .Release.Name }}.${SECRET_DOMAIN}"
diff --git a/kubernetes/apps/flux-system/addons/webhooks/github/ingress.yaml b/kubernetes/apps/flux-system/addons/webhooks/github/ingress.yaml
index 58d5b864..4857dadd 100644
--- a/kubernetes/apps/flux-system/addons/webhooks/github/ingress.yaml
+++ b/kubernetes/apps/flux-system/addons/webhooks/github/ingress.yaml
@@ -5,7 +5,7 @@ metadata:
   name: flux-webhook
   namespace: flux-system
   annotations:
-    external-dns.alpha.kubernetes.io/target: "ipv4.${SECRET_DOMAIN}"
+    external-dns.alpha.kubernetes.io/target: "ingress.${SECRET_DOMAIN}"
     hajimari.io/enable: "false"
 spec:
   ingressClassName: nginx
diff --git a/kubernetes/apps/networking/cloudflared/app/configs/config.yaml b/kubernetes/apps/networking/cloudflared/app/configs/config.yaml
index 5603c2f4..c45f3a25 100644
--- a/kubernetes/apps/networking/cloudflared/app/configs/config.yaml
+++ b/kubernetes/apps/networking/cloudflared/app/configs/config.yaml
@@ -10,9 +10,9 @@ ingress:
   - hostname: "${SECRET_DOMAIN}"
     service: https://ingress-nginx-controller.networking.svc.cluster.local:443
     originRequest:
-      originServerName: "ipv4.${SECRET_DOMAIN}"
+      originServerName: "ingress.${SECRET_DOMAIN}"
   - hostname: "*.${SECRET_DOMAIN}"
     service: https://ingress-nginx-controller.networking.svc.cluster.local:443
     originRequest:
-      originServerName: "ipv4.${SECRET_DOMAIN}"
+      originServerName: "ingress.${SECRET_DOMAIN}"
   - service: http_status:404
diff --git a/kubernetes/apps/networking/cloudflared/app/dnsendpoint.yaml b/kubernetes/apps/networking/cloudflared/app/dnsendpoint.yaml
index 7821fe52..311ee5e2 100644
--- a/kubernetes/apps/networking/cloudflared/app/dnsendpoint.yaml
+++ b/kubernetes/apps/networking/cloudflared/app/dnsendpoint.yaml
@@ -5,9 +5,9 @@ metadata:
   name: cloudflared
   namespace: networking
   annotations:
-    external-dns.alpha.kubernetes.io/target: "ipv4.${SECRET_DOMAIN}"
+    external-dns.alpha.kubernetes.io/target: "ingress.${SECRET_DOMAIN}"
 spec:
   endpoints:
-    - dnsName: "ipv4.${SECRET_DOMAIN}"
+    - dnsName: "ingress.${SECRET_DOMAIN}"
       recordType: CNAME
       targets: ["${SECRET_CLOUDFLARE_TUNNEL_ID}.cfargotunnel.com"]
diff --git a/kubernetes/apps/networking/ingress-nginx/app/helmrelease.yaml b/kubernetes/apps/networking/ingress-nginx/app/helmrelease.yaml
index c9e27450..2b5b1907 100644
--- a/kubernetes/apps/networking/ingress-nginx/app/helmrelease.yaml
+++ b/kubernetes/apps/networking/ingress-nginx/app/helmrelease.yaml
@@ -32,7 +32,7 @@ spec:
           value: "${TIMEZONE}"
       service:
         annotations:
-          external-dns.alpha.kubernetes.io/hostname: "ipv4.${SECRET_DOMAIN}"
+          external-dns.alpha.kubernetes.io/hostname: "ingress.${SECRET_DOMAIN}"
         loadBalancerIP: "${METALLB_INGRESS_ADDR}"
         externalTrafficPolicy: Local
       publishService: