feat(nginx): Make the annotations go away

kireque · Dec 13, 2024 · 5b2e50d · 5b2e50d
1 parent 71a0e5c
commit 5b2e50d
Show file tree

Hide file tree

Showing 31 changed files with 7 additions and 62 deletions.
diff --git a/.archive/music-assistant/app/helmrelease.yaml b/.archive/music-assistant/app/helmrelease.yaml
@@ -70,8 +70,6 @@ spec:
     ingress:
       app:
         className: "internal-nginx"
-        annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-int.econline.nl
         hosts:
           - host: music-assistant.econline.nl
             paths:

diff --git a/.archive/victoria-metrics/app/helmrelease.yaml b/.archive/victoria-metrics/app/helmrelease.yaml
@@ -43,8 +43,6 @@ spec:
       ingress:
         enabled: true
         ingressClassName: internal-nginx
-        annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-int.econline.nl
         hosts:
           - victoria-metrics.econline.nl
 
@@ -74,8 +72,6 @@ spec:
       ingress:
         enabled: true
         ingressClassName: internal-nginx
-        annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-int.econline.nl
         hosts:
           - vmalert.econline.nl
 
@@ -105,8 +101,6 @@ spec:
       ingress:
         enabled: true
         ingressClassName: internal-nginx
-        annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-int.econline.nl
         hosts:
           - vmagent.econline.nl
 

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: ingress-int.econline.nl
 spec:
   ingressClassName: internal-nginx
   rules:

diff --git a/kubernetes/main/apps/dev/gh-safe-settings/app/helmrelease.yaml b/kubernetes/main/apps/dev/gh-safe-settings/app/helmrelease.yaml
@@ -82,8 +82,6 @@ spec:
     ingress:
       app:
         enabled: true
-        annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-ext.econline.nl
         className: "external-nginx"
         hosts:
           - host: gh-safe-settings.econline.nl

diff --git a/kubernetes/main/apps/downloads/prowlarr/app/helmrelease.yaml b/kubernetes/main/apps/downloads/prowlarr/app/helmrelease.yaml
@@ -83,8 +83,6 @@ spec:
     ingress:
       app:
         className: "internal-nginx"
-        annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-int.econline.nl
         hosts:
           - host: prowlarr.econline.nl
             paths:

diff --git a/kubernetes/main/apps/downloads/radarr/app/helmrelease.yaml b/kubernetes/main/apps/downloads/radarr/app/helmrelease.yaml
@@ -86,8 +86,6 @@ spec:
     ingress:
       app:
         className: "internal-nginx"
-        annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-int.econline.nl
         hosts:
           - host: radarr.econline.nl
             paths:

diff --git a/kubernetes/main/apps/downloads/sabnzbd/app/helmrelease.yaml b/kubernetes/main/apps/downloads/sabnzbd/app/helmrelease.yaml
@@ -92,8 +92,6 @@ spec:
     ingress:
       app:
         className: "internal-nginx"
-        annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-int.econline.nl
         hosts:
           - host: sabnzbd.econline.nl
             paths:

diff --git a/kubernetes/main/apps/downloads/sonarr/app/helmrelease.yaml b/kubernetes/main/apps/downloads/sonarr/app/helmrelease.yaml
@@ -86,8 +86,6 @@ spec:
     ingress:
       app:
         className: "internal-nginx"
-        annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-int.econline.nl
         hosts:
           - host: sonarr.econline.nl
             paths:

diff --git a/kubernetes/main/apps/family/sabnzbd/app/helmrelease.yaml b/kubernetes/main/apps/family/sabnzbd/app/helmrelease.yaml
@@ -120,7 +120,6 @@ spec:
       sabnzbd:
         className: "external-nginx"
         annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-ext.econline.nl
           nginx.ingress.kubernetes.io/auth-method: GET
           nginx.ingress.kubernetes.io/auth-url: https://auth.econline.nl/api/verify
           nginx.ingress.kubernetes.io/auth-signin: https://auth.econline.nl/?rm=$request_method
@@ -140,7 +139,6 @@ spec:
       filebrowser:
         className: "external-nginx"
         annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-ext.econline.nl
           nginx.ingress.kubernetes.io/auth-method: GET
           nginx.ingress.kubernetes.io/auth-url: https://auth.econline.nl/api/verify
           nginx.ingress.kubernetes.io/auth-signin: https://auth.econline.nl/?rm=$request_method

diff --git a/kubernetes/main/apps/home-automation/dsmr-reader/app/helmrelease.yaml b/kubernetes/main/apps/home-automation/dsmr-reader/app/helmrelease.yaml
@@ -66,8 +66,6 @@ spec:
     ingress:
       app:
         className: "internal-nginx"
-        annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-int.econline.nl
         hosts:
           - host: dsmr-reader.econline.nl
             paths:

diff --git a/kubernetes/main/apps/home-automation/esphome/app/helmrelease.yaml b/kubernetes/main/apps/home-automation/esphome/app/helmrelease.yaml
@@ -97,7 +97,6 @@ spec:
       app:
         className: "internal-nginx"
         annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-int.econline.nl
           nginx.ingress.kubernetes.io/rewrite-target: /$1
         hosts:
           - host: esphome.econline.nl

diff --git a/kubernetes/main/apps/home-automation/home-assistant/app/helmrelease.yaml b/kubernetes/main/apps/home-automation/home-assistant/app/helmrelease.yaml
@@ -102,7 +102,6 @@ spec:
         enabled: true
         className: "internal-nginx"
         annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-int.econline.nl
           nginx.ingress.kubernetes.io/rewrite-target: /$1
         hosts:
           - host: hass.econline.nl

diff --git a/kubernetes/main/apps/home-automation/scrypted/app/helmrelease.yaml b/kubernetes/main/apps/home-automation/scrypted/app/helmrelease.yaml
@@ -74,8 +74,6 @@ spec:
     ingress:
       app:
         className: "internal-nginx"
-        annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-int.econline.nl
         hosts:
           - host: scrypted.econline.nl
             paths:

diff --git a/kubernetes/main/apps/home-automation/zigbee2mqtt/app/helmrelease.yaml b/kubernetes/main/apps/home-automation/zigbee2mqtt/app/helmrelease.yaml
@@ -136,7 +136,6 @@ spec:
       app:
         className: internal-nginx
         annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-int.econline.nl
           nginx.ingress.kubernetes.io/rewrite-target: /$1
         hosts:
           - host: zigbee2mqtt.econline.nl

diff --git a/kubernetes/main/apps/kube-system/cilium/app/helmrelease.yaml b/kubernetes/main/apps/kube-system/cilium/app/helmrelease.yaml
@@ -39,8 +39,6 @@ spec:
         ingress:
           enabled: true
           className: "internal-nginx"
-          annotations:
-            external-dns.alpha.kubernetes.io/target: ingress-int.econline.nl
           hosts:
             - &host hubble-main.econline.nl
           tls:

diff --git a/kubernetes/main/apps/media/jellyfin/app/helmrelease.yaml b/kubernetes/main/apps/media/jellyfin/app/helmrelease.yaml
@@ -76,8 +76,6 @@ spec:
 
     ingress:
       app:
-        annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-ext.econline.nl
         className: "external-nginx"
         hosts:
           - host: jellyfin.econline.nl

diff --git a/kubernetes/main/apps/media/piped/app/helmrelease.yaml b/kubernetes/main/apps/media/piped/app/helmrelease.yaml
@@ -168,7 +168,6 @@ spec:
     ingress:
       backend:
         annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-ext.econline.nl
           nginx.ingress.kubernetes.io/enable-cors: "true"
           nginx.ingress.kubernetes.io/cors-allow-origin: "https://piped.econline.nl, https://piped-api.econline.nl, https://piped-proxy.econline.nl"
         className: "external-nginx"
@@ -181,7 +180,6 @@ spec:
                   port: http
       frontend:
         annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-int.econline.nl
           nginx.ingress.kubernetes.io/enable-cors: "true"
           nginx.ingress.kubernetes.io/cors-allow-origin: "https://piped.econline.nl, https://piped-api.econline.nl, https://piped-proxy.econline.nl"
         className: "internal-nginx"
@@ -194,7 +192,6 @@ spec:
                   port: http
       ytproxy:
         annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-int.econline.nl
           nginx.ingress.kubernetes.io/enable-cors: "true"
           nginx.ingress.kubernetes.io/cors-allow-origin: "https://piped.econline.nl, https://piped-api.econline.nl, https://piped-proxy.econline.nl"
         className: "internal-nginx"

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

diff --git a/kubernetes/main/apps/minio/minio/app/helmrelease.yaml b/kubernetes/main/apps/minio/minio/app/helmrelease.yaml
@@ -97,8 +97,6 @@ spec:
     ingress:
       app:
         className: "internal-nginx"
-        annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-int.econline.nl
         hosts:
           - host: minio.econline.nl
             paths:

diff --git a/kubernetes/main/apps/monitoring/blackbox-exporter/app/helmrelease.yaml b/kubernetes/main/apps/monitoring/blackbox-exporter/app/helmrelease.yaml
@@ -44,8 +44,6 @@ spec:
     ingress:
       enabled: true
       className: internal-nginx
-      annotations:
-        external-dns.alpha.kubernetes.io/target: ingress-int.econline.nl
       hosts:
         - host: &host "blackbox-exporter.econline.nl"
           paths:

diff --git a/kubernetes/main/apps/monitoring/kromgo/app/helmrelease.yaml b/kubernetes/main/apps/monitoring/kromgo/app/helmrelease.yaml
@@ -87,8 +87,6 @@ spec:
     ingress:
       app:
         className: "external-nginx"
-        annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-ext.econline.nl
         hosts:
           - host: &host kromgo.econline.nl
             paths:

diff --git a/kubernetes/main/apps/monitoring/kube-prometheus-stack/app/helmrelease.yaml b/kubernetes/main/apps/monitoring/kube-prometheus-stack/app/helmrelease.yaml
@@ -109,8 +109,6 @@ spec:
       ingress:
         enabled: true
         ingressClassName: internal-nginx
-        annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-int.econline.nl
         hosts:
           - prometheus.econline.nl
         pathType: Prefix

diff --git a/kubernetes/main/apps/network/echo-server/app/helmrelease.yaml b/kubernetes/main/apps/network/echo-server/app/helmrelease.yaml
@@ -59,7 +59,6 @@ spec:
       app:
         className: "external-nginx"
         annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-ext.econline.nl
           nginx.ingress.kubernetes.io/auth-method: GET
           nginx.ingress.kubernetes.io/auth-url: https://auth.econline.nl/api/verify
           nginx.ingress.kubernetes.io/auth-signin: https://auth.econline.nl/?rm=$request_method

diff --git a/kubernetes/main/apps/network/ingress-nginx/external/helmrelease.yaml b/kubernetes/main/apps/network/ingress-nginx/external/helmrelease.yaml
@@ -31,11 +31,11 @@ spec:
         enabled: true
         type: LoadBalancer
         annotations:
-          external-dns.alpha.kubernetes.io/hostname: "ingress-ext.econline.nl"
-          lbipam.cilium.io/ips: "10.1.1.132"
+          external-dns.alpha.kubernetes.io/hostname: &hostname ingress-ext.econline.nl
+          lbipam.cilium.io/ips: 10.1.1.132
 
       publishService:
-        enabled: true
+        enabled: false
 
       ingressClassResource:
         name: external-nginx
@@ -87,6 +87,7 @@ spec:
 
       extraArgs:
         default-ssl-certificate: "network/econline-nl-tls"
+        publish-status-address: *hostname
 
       topologySpreadConstraints:
         - maxSkew: 1

diff --git a/kubernetes/main/apps/network/ingress-nginx/internal/helmrelease.yaml b/kubernetes/main/apps/network/ingress-nginx/internal/helmrelease.yaml
@@ -31,11 +31,11 @@ spec:
         enabled: true
         type: LoadBalancer
         annotations:
-          external-dns.alpha.kubernetes.io/hostname: "ingress-int.econline.nl"
+          external-dns.alpha.kubernetes.io/hostname: &hostname ingress-int.econline.nl
           lbipam.cilium.io/ips: 10.1.1.131
 
       publishService:
-        enabled: true
+        enabled: false
 
       ingressClassResource:
         name: internal-nginx
@@ -87,6 +87,7 @@ spec:
 
       extraArgs:
         default-ssl-certificate: "network/econline-nl-tls"
+        publish-status-address: *hostname
 
       topologySpreadConstraints:
         - maxSkew: 1

diff --git a/kubernetes/main/apps/security/authelia/app/helmrelease.yaml b/kubernetes/main/apps/security/authelia/app/helmrelease.yaml
@@ -102,7 +102,6 @@ spec:
       app:
         className: "external-nginx"
         annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-ext.econline.nl
           nginx.ingress.kubernetes.io/configuration-snippet: |
             add_header Cache-Control "no-store";
             add_header Pragma "no-cache";

diff --git a/kubernetes/main/apps/security/lldap/app/helmrelease.yaml b/kubernetes/main/apps/security/lldap/app/helmrelease.yaml
@@ -98,8 +98,6 @@ spec:
     ingress:
       app:
         className: "internal-nginx"
-        annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-int.econline.nl
         hosts:
           - host: lldap.econline.nl
             paths:

diff --git a/kubernetes/main/apps/selfhosted/actual/app/helmrelease.yaml b/kubernetes/main/apps/selfhosted/actual/app/helmrelease.yaml
@@ -67,8 +67,6 @@ spec:
     ingress:
       app:
         className: "internal-nginx"
-        annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-int.econline.nl
         hosts:
           - host: actual.econline.nl
             paths:

diff --git a/kubernetes/main/apps/selfhosted/atuin/app/helmrelease.yaml b/kubernetes/main/apps/selfhosted/atuin/app/helmrelease.yaml
@@ -72,8 +72,6 @@ spec:
       app:
         enabled: true
         className: "internal-nginx"
-        annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-int.econline.nl
         hosts:
           - host: atuin.econline.nl
             paths:

diff --git a/kubernetes/main/apps/selfhosted/it-tools/app/helmrelease.yaml b/kubernetes/main/apps/selfhosted/it-tools/app/helmrelease.yaml
@@ -52,8 +52,6 @@ spec:
     ingress:
       app:
         className: "internal-nginx"
-        annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-int.econline.nl
         hosts:
           - host: it-tools.econline.nl
             paths:

diff --git a/kubernetes/main/apps/selfhosted/searxng/app/helmrelease.yaml b/kubernetes/main/apps/selfhosted/searxng/app/helmrelease.yaml
@@ -111,8 +111,6 @@ spec:
     ingress:
       app:
         className: "internal-nginx"
-        annotations:
-          external-dns.alpha.kubernetes.io/target: ingress-int.econline.nl
         hosts:
           - host: search.econline.nl
             paths: