feat(ingress-nginx): remove need for individual ingress annotations (#…

…8441)
onedr0p · Dec 9, 2024 · 556f819 · 556f819
1 parent f9626b9
commit 556f819
Show file tree

Hide file tree

Showing 32 changed files with 9 additions and 65 deletions.
diff --git a/README.md b/README.md
@@ -136,7 +136,7 @@ Alternative solutions to the first two of these problems would be to host a Kube
 
 ## 🌐 DNS
 
-In my cluster there are two [ExternalDNS](https://github.com/kubernetes-sigs/external-dns) instances deployed. One is deployed with the [ExternalDNS webhook provider for UniFi](https://github.com/kashalls/external-dns-unifi-webhook) which syncs DNS records to my UniFi router. The other ExternalDNS instance syncs DNS records to Cloudflare only when the ingresses and services have an ingress class name of `external` and contain an ingress annotation `external-dns.alpha.kubernetes.io/target`. All local clients on my network use my UniFi router as the upstream DNS server.
+In my cluster there are two instances of [ExternalDNS](https://github.com/kubernetes-sigs/external-dns) running. One for syncing private DNS records to my `UDM Pro Max` using [ExternalDNS webhook provider for UniFi](https://github.com/kashalls/external-dns-unifi-webhook), while another instance syncs public DNS to `Cloudflare`. This setup is managed by creating ingresses with two specific classes: `internal` for private DNS and `external` for public DNS. The `external-dns` instances then syncs the DNS records to their respective platforms accordingly.
 
 ---
 

diff --git a/kubernetes/main/apps/database/emqx/cluster/ingress.yaml b/kubernetes/main/apps/database/emqx/cluster/ingress.yaml
@@ -3,8 +3,6 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: emqx-dashboard
-  annotations:
-    external-dns.alpha.kubernetes.io/target: internal.devbu.io
 spec:
   ingressClassName: internal
   rules:

diff --git a/kubernetes/main/apps/default/atuin/app/helmrelease.yaml b/kubernetes/main/apps/default/atuin/app/helmrelease.yaml
@@ -100,8 +100,6 @@ spec:
             scrapeTimeout: 10s
     ingress:
       app:
-        annotations:
-          external-dns.alpha.kubernetes.io/target: internal.devbu.io
         className: internal
         hosts:
           - host: sh.devbu.io

diff --git a/kubernetes/main/apps/default/autobrr/app/helmrelease.yaml b/kubernetes/main/apps/default/autobrr/app/helmrelease.yaml
@@ -82,8 +82,6 @@ spec:
             port: *port
     ingress:
       app:
-        annotations:
-          external-dns.alpha.kubernetes.io/target: internal.devbu.io
         className: internal
         hosts:
           - host: "{{ .Release.Name }}.devbu.io"

diff --git a/kubernetes/main/apps/default/bazarr/app/helmrelease.yaml b/kubernetes/main/apps/default/bazarr/app/helmrelease.yaml
@@ -93,8 +93,6 @@ spec:
             port: *port
     ingress:
       app:
-        annotations:
-          external-dns.alpha.kubernetes.io/target: internal.devbu.io
         className: internal
         hosts:
           - host: bazarr.devbu.io

diff --git a/kubernetes/main/apps/default/filebrowser/app/helmrelease.yaml b/kubernetes/main/apps/default/filebrowser/app/helmrelease.yaml
@@ -76,8 +76,6 @@ spec:
             port: *port
     ingress:
       app:
-        annotations:
-          external-dns.alpha.kubernetes.io/target: internal.devbu.io
         className: internal
         hosts:
           - host: "{{ .Release.Name }}.devbu.io"

diff --git a/kubernetes/main/apps/default/go2rtc/app/helmrelease.yaml b/kubernetes/main/apps/default/go2rtc/app/helmrelease.yaml
@@ -82,8 +82,6 @@ spec:
             protocol: UDP
     ingress:
       app:
-        annotations:
-          external-dns.alpha.kubernetes.io/target: internal.devbu.io
         className: internal
         hosts:
           - host: go2rtc.devbu.io

diff --git a/kubernetes/main/apps/default/home-assistant/app/helmrelease.yaml b/kubernetes/main/apps/default/home-assistant/app/helmrelease.yaml
@@ -85,8 +85,6 @@ spec:
             port: 12321
     ingress:
       app:
-        annotations:
-          external-dns.alpha.kubernetes.io/target: external.devbu.io
         className: external
         hosts:
           - host: hass.devbu.io
@@ -96,8 +94,6 @@ spec:
                   identifier: app
                   port: http
       code-server:
-        annotations:
-          external-dns.alpha.kubernetes.io/target: internal.devbu.io
         className: internal
         hosts:
           - host: hass-code.devbu.io

diff --git a/kubernetes/main/apps/default/miniflux/app/helmrelease.yaml b/kubernetes/main/apps/default/miniflux/app/helmrelease.yaml
@@ -99,8 +99,6 @@ spec:
             scrapeTimeout: 10s
     ingress:
       app:
-        annotations:
-          external-dns.alpha.kubernetes.io/target: internal.devbu.io
         className: internal
         hosts:
           - host: "{{ .Release.Name }}.devbu.io"

diff --git a/kubernetes/main/apps/default/overseerr/app/helmrelease.yaml b/kubernetes/main/apps/default/overseerr/app/helmrelease.yaml
@@ -77,8 +77,6 @@ spec:
             port: *port
     ingress:
       app:
-        annotations:
-          external-dns.alpha.kubernetes.io/target: external.devbu.io
         className: external
         hosts:
           - host: requests.devbu.io

diff --git a/kubernetes/main/apps/default/pinchflat/app/helmrelease.yaml b/kubernetes/main/apps/default/pinchflat/app/helmrelease.yaml
@@ -81,8 +81,6 @@ spec:
             port: *port
     ingress:
       app:
-        annotations:
-          external-dns.alpha.kubernetes.io/target: internal.devbu.io
         className: internal
         hosts:
           - host: "{{ .Release.Name }}.devbu.io"

diff --git a/kubernetes/main/apps/default/plex/app/helmrelease.yaml b/kubernetes/main/apps/default/plex/app/helmrelease.yaml
@@ -92,7 +92,6 @@ spec:
     ingress:
       app:
         annotations:
-          external-dns.alpha.kubernetes.io/target: external.devbu.io
           nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
         className: external
         hosts:

diff --git a/kubernetes/main/apps/default/prowlarr/app/helmrelease.yaml b/kubernetes/main/apps/default/prowlarr/app/helmrelease.yaml
@@ -89,8 +89,6 @@ spec:
             port: *port
     ingress:
       app:
-        annotations:
-          external-dns.alpha.kubernetes.io/target: internal.devbu.io
         className: internal
         hosts:
           - host: "{{ .Release.Name }}.devbu.io"

diff --git a/kubernetes/main/apps/default/qbittorrent/app/helmrelease.yaml b/kubernetes/main/apps/default/qbittorrent/app/helmrelease.yaml
@@ -89,8 +89,6 @@ spec:
             protocol: TCP
     ingress:
       app:
-        annotations:
-          external-dns.alpha.kubernetes.io/target: internal.devbu.io
         className: internal
         hosts:
           - host: qb.devbu.io

diff --git a/kubernetes/main/apps/default/radarr/app/helmrelease.yaml b/kubernetes/main/apps/default/radarr/app/helmrelease.yaml
@@ -92,8 +92,6 @@ spec:
             port: *port
     ingress:
       app:
-        annotations:
-          external-dns.alpha.kubernetes.io/target: internal.devbu.io
         className: internal
         hosts:
           - host: "{{ .Release.Name }}.devbu.io"

diff --git a/kubernetes/main/apps/default/sabnzbd/app/helmrelease.yaml b/kubernetes/main/apps/default/sabnzbd/app/helmrelease.yaml
@@ -91,8 +91,6 @@ spec:
             port: *port
     ingress:
       app:
-        annotations:
-          external-dns.alpha.kubernetes.io/target: internal.devbu.io
         className: internal
         hosts:
           - host: sab.devbu.io

diff --git a/kubernetes/main/apps/default/slskd/app/helmrelease.yaml b/kubernetes/main/apps/default/slskd/app/helmrelease.yaml
@@ -101,8 +101,6 @@ spec:
             scrapeTimeout: 10s
     ingress:
       app:
-        annotations:
-          external-dns.alpha.kubernetes.io/target: internal.devbu.io
         className: internal
         hosts:
           - host: "{{ .Release.Name }}.devbu.io"

diff --git a/kubernetes/main/apps/default/sonarr/app/helmrelease.yaml b/kubernetes/main/apps/default/sonarr/app/helmrelease.yaml
@@ -92,8 +92,6 @@ spec:
             port: *port
     ingress:
       app:
-        annotations:
-          external-dns.alpha.kubernetes.io/target: internal.devbu.io
         className: internal
         hosts:
           - host: "{{ .Release.Name }}.devbu.io"

diff --git a/kubernetes/main/apps/default/tautulli/app/helmrelease.yaml b/kubernetes/main/apps/default/tautulli/app/helmrelease.yaml
@@ -76,8 +76,6 @@ spec:
             port: *port
     ingress:
       app:
-        annotations:
-          external-dns.alpha.kubernetes.io/target: internal.devbu.io
         className: internal
         hosts:
           - host: "{{ .Release.Name }}.devbu.io"

diff --git a/kubernetes/main/apps/default/zigbee2mqtt/app/helmrelease.yaml b/kubernetes/main/apps/default/zigbee2mqtt/app/helmrelease.yaml
@@ -103,8 +103,6 @@ spec:
             port: *port
     ingress:
       app:
-        annotations:
-          external-dns.alpha.kubernetes.io/target: internal.devbu.io
         className: internal
         hosts:
           - host: zigbee.devbu.io

diff --git a/kubernetes/main/apps/default/zwave/app/helmrelease.yaml b/kubernetes/main/apps/default/zwave/app/helmrelease.yaml
@@ -78,8 +78,6 @@ spec:
             port: 3000
     ingress:
       app:
-        annotations:
-          external-dns.alpha.kubernetes.io/target: internal.devbu.io
         className: internal
         hosts:
           - host: "{{ .Release.Name }}.devbu.io"

diff --git a/kubernetes/main/apps/flux-system/addons/app/webhooks/github/ingress.yaml b/kubernetes/main/apps/flux-system/addons/app/webhooks/github/ingress.yaml
@@ -3,8 +3,6 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: webhook-receiver
-  annotations:
-    external-dns.alpha.kubernetes.io/target: external.devbu.io
 spec:
   ingressClassName: external
   rules:

diff --git a/kubernetes/main/apps/kube-system/cilium/app/helmrelease.yaml b/kubernetes/main/apps/kube-system/cilium/app/helmrelease.yaml
@@ -52,7 +52,5 @@ spec:
         rollOutPods: true
         ingress:
           enabled: true
-          annotations:
-            external-dns.alpha.kubernetes.io/target: internal.devbu.io
           className: internal
           hosts: ["hubble.devbu.io"]
diff --git a/kubernetes/main/apps/network/echo-server/app/helmrelease.yaml b/kubernetes/main/apps/network/echo-server/app/helmrelease.yaml
@@ -84,8 +84,6 @@ spec:
             scrapeTimeout: 10s
     ingress:
       app:
-        annotations:
-          external-dns.alpha.kubernetes.io/target: external.devbu.io
         className: external
         hosts:
           - host: "{{ .Release.Name }}.devbu.io"

diff --git a/kubernetes/main/apps/network/nginx/external/helmrelease.yaml b/kubernetes/main/apps/network/nginx/external/helmrelease.yaml
@@ -33,7 +33,7 @@ spec:
       replicaCount: 2
       service:
         annotations:
-          external-dns.alpha.kubernetes.io/hostname: external.devbu.io
+          external-dns.alpha.kubernetes.io/hostname: &hostname external.devbu.io
           lbipam.cilium.io/ips: 192.168.42.126
       ingressClassResource:
         name: external
@@ -79,7 +79,10 @@ spec:
             any: true
       extraArgs:
         default-ssl-certificate: network/devbu-io-tls
+        publish-status-address: *hostname
       terminationGracePeriodSeconds: 120
+      publishService:
+        enabled: false
       resources:
         requests:
           cpu: 100m

diff --git a/kubernetes/main/apps/network/nginx/internal/helmrelease.yaml b/kubernetes/main/apps/network/nginx/internal/helmrelease.yaml
@@ -28,7 +28,7 @@ spec:
       replicaCount: 2
       service:
         annotations:
-          external-dns.alpha.kubernetes.io/hostname: internal.devbu.io
+          external-dns.alpha.kubernetes.io/hostname: &hostname internal.devbu.io
           lbipam.cilium.io/ips: 192.168.42.121
       ingressClassResource:
         name: internal
@@ -73,7 +73,10 @@ spec:
             any: true
       extraArgs:
         default-ssl-certificate: network/devbu-io-tls
+        publish-status-address: *hostname
       terminationGracePeriodSeconds: 120
+      publishService:
+        enabled: false
       resources:
         requests:
           cpu: 100m

diff --git a/kubernetes/main/apps/observability/blackbox-exporter/app/helmrelease.yaml b/kubernetes/main/apps/observability/blackbox-exporter/app/helmrelease.yaml
@@ -26,8 +26,6 @@ spec:
     fullnameOverride: blackbox-exporter
     ingress:
       enabled: true
-      annotations:
-        external-dns.alpha.kubernetes.io/target: internal.devbu.io
       className: internal
       hosts:
         - host: blackbox-exporter.devbu.io

diff --git a/kubernetes/main/apps/observability/gatus/app/helmrelease.yaml b/kubernetes/main/apps/observability/gatus/app/helmrelease.yaml
@@ -110,8 +110,6 @@ spec:
             scrapeTimeout: 10s
     ingress:
       app:
-        annotations:
-          external-dns.alpha.kubernetes.io/target: external.devbu.io
         className: external
         hosts:
           - host: status.devbu.io

diff --git a/kubernetes/main/apps/observability/grafana/app/helmrelease.yaml b/kubernetes/main/apps/observability/grafana/app/helmrelease.yaml
@@ -259,8 +259,6 @@ spec:
       enabled: true
     ingress:
       enabled: true
-      annotations:
-        external-dns.alpha.kubernetes.io/target: internal.devbu.io
       ingressClassName: internal
       hosts: ["grafana.devbu.io"]
     persistence:

diff --git a/kubernetes/main/apps/observability/kromgo/app/helmrelease.yaml b/kubernetes/main/apps/observability/kromgo/app/helmrelease.yaml
@@ -77,8 +77,6 @@ spec:
             port: *healthPort
     ingress:
       app:
-        annotations:
-          external-dns.alpha.kubernetes.io/target: external.devbu.io
         className: external
         hosts:
           - host: "{{ .Release.Name }}.devbu.io"

diff --git a/kubernetes/main/apps/observability/kube-prometheus-stack/app/helmrelease.yaml b/kubernetes/main/apps/observability/kube-prometheus-stack/app/helmrelease.yaml
@@ -37,8 +37,6 @@ spec:
     alertmanager:
       ingress:
         enabled: true
-        annotations:
-          external-dns.alpha.kubernetes.io/target: internal.devbu.io
         ingressClassName: internal
         hosts: ["alertmanager.devbu.io"]
         pathType: Prefix
@@ -71,8 +69,6 @@ spec:
     prometheus:
       ingress:
         enabled: true
-        annotations:
-          external-dns.alpha.kubernetes.io/target: internal.devbu.io
         ingressClassName: internal
         hosts: ["prometheus.devbu.io"]
         pathType: Prefix

diff --git a/kubernetes/main/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml b/kubernetes/main/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml
@@ -34,8 +34,6 @@ spec:
       createPrometheusRules: true
     ingress:
       dashboard:
-        annotations:
-          external-dns.alpha.kubernetes.io/target: internal.devbu.io
         ingressClassName: internal
         host:
           name: rook.devbu.io
@@ -199,7 +197,6 @@ spec:
       #   ingress:
       #     enabled: true
       #     annotations:
-      #       external-dns.alpha.kubernetes.io/target: internal.devbu.io
       #       nginx.ingress.kubernetes.io/proxy-body-size: "0"
       #       nginx.ingress.kubernetes.io/proxy-request-buffering: "off"
       #     ingressClassName: internal
-Original file line number
+Diff line change
@@ Expand Up @@
     ## 🌐 DNS
-    In my cluster there are two [ExternalDNS](https://github.com/kubernetes-sigs/external-dns) instances deployed. One is deployed with the [ExternalDNS webhook provider for UniFi](https://github.com/kashalls/external-dns-unifi-webhook) which syncs DNS records to my UniFi router. The other ExternalDNS instance syncs DNS records to Cloudflare only when the ingresses and services have an ingress class name of `external` and contain an ingress annotation `external-dns.alpha.kubernetes.io/target`. All local clients on my network use my UniFi router as the upstream DNS server.
+    In my cluster there are two instances of [ExternalDNS](https://github.com/kubernetes-sigs/external-dns) running. One for syncing private DNS records to my `UDM Pro Max` using [ExternalDNS webhook provider for UniFi](https://github.com/kashalls/external-dns-unifi-webhook), while another instance syncs public DNS to `Cloudflare`. This setup is managed by creating ingresses with two specific classes: `internal` for private DNS and `external` for public DNS. The `external-dns` instances then syncs the DNS records to their respective platforms accordingly.
     ---
@@ Expand Down @@