From 95c91af572af1b3050d85cdd9ff98ec75950ceb8 Mon Sep 17 00:00:00 2001 From: JJGadgets Date: Wed, 29 Nov 2023 06:08:53 +0800 Subject: [PATCH] fix: migrate ingress classes S01E03 --- kube/deploy/apps/atuin/app/hr.yaml | 2 +- kube/deploy/apps/audiobookshelf/app/hr.yaml | 2 +- kube/deploy/apps/cyberchef/app/hr.yaml | 2 +- kube/deploy/apps/elk/app/hr.yaml | 2 +- kube/deploy/apps/excalidraw/app/hr.yaml | 2 +- kube/deploy/apps/firefly/app/authentik.yaml | 2 +- kube/deploy/apps/firefly/app/hr.yaml | 2 +- kube/deploy/apps/gokapi/app/hr.yaml | 2 +- kube/deploy/apps/grocy/app/authentik.yaml | 2 +- kube/deploy/apps/grocy/app/hr.yaml | 2 +- kube/deploy/apps/joplin/app/hr.yaml | 2 +- kube/deploy/apps/kanidm/app/hr.yaml | 2 +- kube/deploy/apps/libreddit/app/hr.yaml | 2 +- kube/deploy/apps/livestream/oven/player/hr.yaml | 2 +- kube/deploy/apps/miniflux/app/hr.yaml | 2 +- kube/deploy/apps/neko/xfce/hr.yaml | 2 +- kube/deploy/apps/nextcloud/app/hr.yaml | 2 +- kube/deploy/apps/nfs-web/app/hr.yaml | 2 +- kube/deploy/apps/ntfy/app/hr.yaml | 2 +- kube/deploy/apps/paperless-ngx/app/authentik.yaml | 2 +- kube/deploy/apps/paperless-ngx/app/hr.yaml | 2 +- kube/deploy/apps/phanpy/app/hr.yaml | 2 +- kube/deploy/apps/piped/app/hr.yaml | 6 +++--- kube/deploy/apps/psono/app/hr.yaml | 6 +++--- kube/deploy/apps/soft-serve/app/hr.yaml | 2 +- kube/deploy/apps/syncthing/user1/hr.yaml | 2 +- kube/deploy/apps/thelounge/app/hr.yaml | 2 +- kube/deploy/apps/velociraptor/app/hr.yaml | 2 +- kube/deploy/core/_networking/cilium/app/hr.yaml | 2 +- kube/deploy/core/flux-system/webhook/ingress.yaml | 2 +- .../core/ingress/ingress-nginx/app/default-backend.yaml | 4 ++-- kube/deploy/core/monitoring/grafana/app/hr.yaml | 2 +- kube/deploy/core/monitoring/kps/app/config/prom.yaml | 2 +- kube/deploy/core/storage/rook-ceph/cluster/app/hr.yaml | 4 ++-- 34 files changed, 40 insertions(+), 40 deletions(-) diff --git a/kube/deploy/apps/atuin/app/hr.yaml b/kube/deploy/apps/atuin/app/hr.yaml index 6f2f8d3f..04116582 100644 --- a/kube/deploy/apps/atuin/app/hr.yaml +++ b/kube/deploy/apps/atuin/app/hr.yaml @@ -38,7 +38,7 @@ spec: main: enabled: true primary: true - ingressClassName: nginx + ingressClassName: "nginx-internal" annotations: nginx.ingress.kubernetes.io/proxy-body-size: "100m" nginx.ingress.kubernetes.io/custom-http-errors: "400,403,405,409,410,411,412,413,414,415,416,417,418,421,425,431,451,500,501,502,503,504,505,506,510" diff --git a/kube/deploy/apps/audiobookshelf/app/hr.yaml b/kube/deploy/apps/audiobookshelf/app/hr.yaml index 86af12e9..b91447f8 100644 --- a/kube/deploy/apps/audiobookshelf/app/hr.yaml +++ b/kube/deploy/apps/audiobookshelf/app/hr.yaml @@ -47,7 +47,7 @@ spec: main: enabled: true primary: true - className: nginx + className: "nginx-internal" hosts: - host: &host "${APP_DNS_AUDIOBOOKSHELF}" paths: diff --git a/kube/deploy/apps/cyberchef/app/hr.yaml b/kube/deploy/apps/cyberchef/app/hr.yaml index dbcc412a..608f2391 100644 --- a/kube/deploy/apps/cyberchef/app/hr.yaml +++ b/kube/deploy/apps/cyberchef/app/hr.yaml @@ -36,7 +36,7 @@ spec: main: enabled: true primary: true - ingressClassName: nginx + ingressClassName: "nginx-internal" hosts: - host: &host "${APP_DNS_CYBERCHEF}" paths: diff --git a/kube/deploy/apps/elk/app/hr.yaml b/kube/deploy/apps/elk/app/hr.yaml index a0e172b2..963d0aab 100644 --- a/kube/deploy/apps/elk/app/hr.yaml +++ b/kube/deploy/apps/elk/app/hr.yaml @@ -40,7 +40,7 @@ spec: main: enabled: true primary: true - ingressClassName: nginx + ingressClassName: "nginx-internal" hosts: - host: &host "elk.${DNS_SHORT}" paths: diff --git a/kube/deploy/apps/excalidraw/app/hr.yaml b/kube/deploy/apps/excalidraw/app/hr.yaml index 21c1243b..02e84091 100644 --- a/kube/deploy/apps/excalidraw/app/hr.yaml +++ b/kube/deploy/apps/excalidraw/app/hr.yaml @@ -30,7 +30,7 @@ spec: main: enabled: true primary: true - ingressClassName: nginx + ingressClassName: "nginx-internal" annotations: external-dns.alpha.kubernetes.io/target: "${IP_EC2_INGRESS}" nginx.ingress.kubernetes.io/auth-signin: |- diff --git a/kube/deploy/apps/firefly/app/authentik.yaml b/kube/deploy/apps/firefly/app/authentik.yaml index 70d241d8..e8c0e239 100644 --- a/kube/deploy/apps/firefly/app/authentik.yaml +++ b/kube/deploy/apps/firefly/app/authentik.yaml @@ -5,7 +5,7 @@ metadata: name: firefly-authentik namespace: authentik spec: - ingressClassName: nginx + ingressClassName: "nginx-internal" rules: - host: &host "${APP_DNS_FIREFLY}" http: diff --git a/kube/deploy/apps/firefly/app/hr.yaml b/kube/deploy/apps/firefly/app/hr.yaml index 959eed09..19625ba1 100644 --- a/kube/deploy/apps/firefly/app/hr.yaml +++ b/kube/deploy/apps/firefly/app/hr.yaml @@ -74,7 +74,7 @@ spec: main: enabled: true primary: true - ingressClassName: nginx + ingressClassName: "nginx-internal" annotations: nginx.ingress.kubernetes.io/auth-signin: |- https://${APP_DNS_FIREFLY}/outpost.goauthentik.io/start?rd=$escaped_request_uri diff --git a/kube/deploy/apps/gokapi/app/hr.yaml b/kube/deploy/apps/gokapi/app/hr.yaml index 4181b6ff..32053442 100644 --- a/kube/deploy/apps/gokapi/app/hr.yaml +++ b/kube/deploy/apps/gokapi/app/hr.yaml @@ -30,7 +30,7 @@ spec: ingress: main: enabled: true - ingressClassName: nginx + ingressClassName: "nginx-internal" hosts: - host: "${APP_DNS_GOKAPI}" paths: diff --git a/kube/deploy/apps/grocy/app/authentik.yaml b/kube/deploy/apps/grocy/app/authentik.yaml index 90c61b57..d30c6ac6 100644 --- a/kube/deploy/apps/grocy/app/authentik.yaml +++ b/kube/deploy/apps/grocy/app/authentik.yaml @@ -5,7 +5,7 @@ metadata: name: grocy-authentik namespace: authentik spec: - ingressClassName: nginx + ingressClassName: "nginx-internal" rules: - host: &host "${APP_DNS_GROCY}" http: diff --git a/kube/deploy/apps/grocy/app/hr.yaml b/kube/deploy/apps/grocy/app/hr.yaml index c9f234df..cef7419a 100644 --- a/kube/deploy/apps/grocy/app/hr.yaml +++ b/kube/deploy/apps/grocy/app/hr.yaml @@ -85,7 +85,7 @@ spec: main: enabled: true primary: true - className: nginx + className: "nginx-internal" annotations: nginx.ingress.kubernetes.io/auth-signin: |- https://${APP_DNS_GROCY}/outpost.goauthentik.io/start?rd=$escaped_request_uri diff --git a/kube/deploy/apps/joplin/app/hr.yaml b/kube/deploy/apps/joplin/app/hr.yaml index c81e641c..95bc48c7 100644 --- a/kube/deploy/apps/joplin/app/hr.yaml +++ b/kube/deploy/apps/joplin/app/hr.yaml @@ -54,7 +54,7 @@ spec: main: enabled: true primary: true - ingressClassName: nginx + ingressClassName: "nginx-internal" annotations: external-dns.alpha.kubernetes.io/target: "${DNS_SHORT_CF}" external-dns.alpha.kubernetes.io/cloudflare-proxied: "true" diff --git a/kube/deploy/apps/kanidm/app/hr.yaml b/kube/deploy/apps/kanidm/app/hr.yaml index f1395f69..a1bfa069 100644 --- a/kube/deploy/apps/kanidm/app/hr.yaml +++ b/kube/deploy/apps/kanidm/app/hr.yaml @@ -52,7 +52,7 @@ spec: main: enabled: true primary: true - ingressClassName: nginx + ingressClassName: "nginx-internal" annotations: external-dns.alpha.kubernetes.io/target: "${DNS_SHORT_CF}" external-dns.alpha.kubernetes.io/cloudflare-proxied: "true" diff --git a/kube/deploy/apps/libreddit/app/hr.yaml b/kube/deploy/apps/libreddit/app/hr.yaml index e514e46c..8bdfcf71 100644 --- a/kube/deploy/apps/libreddit/app/hr.yaml +++ b/kube/deploy/apps/libreddit/app/hr.yaml @@ -49,7 +49,7 @@ spec: main: enabled: true primary: true - ingressClassName: nginx + ingressClassName: "nginx-internal" hosts: - host: &host "${APP_DNS_LIBREDDIT}" paths: diff --git a/kube/deploy/apps/livestream/oven/player/hr.yaml b/kube/deploy/apps/livestream/oven/player/hr.yaml index 60570ec4..f1c0590e 100644 --- a/kube/deploy/apps/livestream/oven/player/hr.yaml +++ b/kube/deploy/apps/livestream/oven/player/hr.yaml @@ -36,7 +36,7 @@ spec: main: enabled: true primary: true - ingressClassName: nginx + ingressClassName: "nginx-internal" annotations: external-dns.alpha.kubernetes.io/target: "${DNS_SHORT_CF}" external-dns.alpha.kubernetes.io/cloudflare-proxied: "true" diff --git a/kube/deploy/apps/miniflux/app/hr.yaml b/kube/deploy/apps/miniflux/app/hr.yaml index 020a9205..2760f378 100644 --- a/kube/deploy/apps/miniflux/app/hr.yaml +++ b/kube/deploy/apps/miniflux/app/hr.yaml @@ -48,7 +48,7 @@ spec: main: enabled: true primary: true - ingressClassName: nginx + ingressClassName: "nginx-internal" hosts: - host: &host "${APP_DNS_MINIFLUX}" paths: diff --git a/kube/deploy/apps/neko/xfce/hr.yaml b/kube/deploy/apps/neko/xfce/hr.yaml index 58ab3420..8877442b 100644 --- a/kube/deploy/apps/neko/xfce/hr.yaml +++ b/kube/deploy/apps/neko/xfce/hr.yaml @@ -61,7 +61,7 @@ spec: main: enabled: true primary: true - ingressClassName: nginx + ingressClassName: "nginx-internal" hosts: - host: &host "${APP_DNS_NEKO_XFCE}" paths: diff --git a/kube/deploy/apps/nextcloud/app/hr.yaml b/kube/deploy/apps/nextcloud/app/hr.yaml index 989ff450..ee9617a6 100644 --- a/kube/deploy/apps/nextcloud/app/hr.yaml +++ b/kube/deploy/apps/nextcloud/app/hr.yaml @@ -174,7 +174,7 @@ spec: main: &ingress enabled: true primary: false - className: nginx + className: "nginx-internal" hosts: - host: *host paths: diff --git a/kube/deploy/apps/nfs-web/app/hr.yaml b/kube/deploy/apps/nfs-web/app/hr.yaml index fb98b908..049c4d1e 100644 --- a/kube/deploy/apps/nfs-web/app/hr.yaml +++ b/kube/deploy/apps/nfs-web/app/hr.yaml @@ -50,7 +50,7 @@ spec: main: enabled: true primary: true - className: nginx + className: "nginx-internal" # annotations: # TODO # external-dns.alpha.kubernetes.io/target: "${DNS_SHORT_HOME}" # external-dns.alpha.kubernetes.io/cloudflare-proxied: "false" diff --git a/kube/deploy/apps/ntfy/app/hr.yaml b/kube/deploy/apps/ntfy/app/hr.yaml index 7be4132e..e3da354b 100644 --- a/kube/deploy/apps/ntfy/app/hr.yaml +++ b/kube/deploy/apps/ntfy/app/hr.yaml @@ -105,7 +105,7 @@ spec: main: enabled: true primary: true - className: "nginx" + className: "nginx-internal" annotations: external-dns.alpha.kubernetes.io/target: "${IP_EC2_INGRESS}" hosts: diff --git a/kube/deploy/apps/paperless-ngx/app/authentik.yaml b/kube/deploy/apps/paperless-ngx/app/authentik.yaml index 23a8e159..eeb8ddf7 100644 --- a/kube/deploy/apps/paperless-ngx/app/authentik.yaml +++ b/kube/deploy/apps/paperless-ngx/app/authentik.yaml @@ -5,7 +5,7 @@ metadata: name: paperless-ngx-authentik namespace: authentik spec: - ingressClassName: nginx + ingressClassName: "nginx-internal" rules: - host: &host "${APP_DNS_PAPERLESS_NGX}" http: diff --git a/kube/deploy/apps/paperless-ngx/app/hr.yaml b/kube/deploy/apps/paperless-ngx/app/hr.yaml index 314370e6..930c88e2 100644 --- a/kube/deploy/apps/paperless-ngx/app/hr.yaml +++ b/kube/deploy/apps/paperless-ngx/app/hr.yaml @@ -96,7 +96,7 @@ spec: main: enabled: true primary: true - className: nginx + className: "nginx-internal" annotations: nginx.ingress.kubernetes.io/auth-signin: |- https://${APP_DNS_PAPERLESS_NGX}/outpost.goauthentik.io/start?rd=$escaped_request_uri diff --git a/kube/deploy/apps/phanpy/app/hr.yaml b/kube/deploy/apps/phanpy/app/hr.yaml index 1c825f5f..840962cc 100644 --- a/kube/deploy/apps/phanpy/app/hr.yaml +++ b/kube/deploy/apps/phanpy/app/hr.yaml @@ -37,7 +37,7 @@ spec: main: enabled: true primary: true - ingressClassName: nginx + ingressClassName: "nginx-internal" hosts: - host: &host "phanpy.${DNS_SHORT}" paths: diff --git a/kube/deploy/apps/piped/app/hr.yaml b/kube/deploy/apps/piped/app/hr.yaml index 5aa7322f..4a5348ac 100644 --- a/kube/deploy/apps/piped/app/hr.yaml +++ b/kube/deploy/apps/piped/app/hr.yaml @@ -83,7 +83,7 @@ spec: memory: 500Mi ingress: main: - ingressClassName: nginx + ingressClassName: "nginx-internal" annotations: nginx.ingress.kubernetes.io/enable-cors: "true" nginx.ingress.kubernetes.io/cors-allow-origin: "https://${APP_DNS_PIPED_FRONTEND}, https://${APP_DNS_PIPED_BACKEND}, https://${APP_DNS_PIPED_YTPROXY}" @@ -95,7 +95,7 @@ spec: - hosts: - *frontend backend: - ingressClassName: nginx + ingressClassName: "nginx-internal" annotations: nginx.ingress.kubernetes.io/enable-cors: "true" nginx.ingress.kubernetes.io/cors-allow-origin: "https://${APP_DNS_PIPED_FRONTEND}, https://${APP_DNS_PIPED_BACKEND}, https://${APP_DNS_PIPED_YTPROXY}" @@ -107,7 +107,7 @@ spec: - hosts: - *backend ytproxy: - ingressClassName: nginx + ingressClassName: "nginx-internal" annotations: nginx.ingress.kubernetes.io/enable-cors: "true" nginx.ingress.kubernetes.io/cors-allow-origin: "https://${APP_DNS_PIPED_FRONTEND}, https://${APP_DNS_PIPED_BACKEND}, https://${APP_DNS_PIPED_YTPROXY}" diff --git a/kube/deploy/apps/psono/app/hr.yaml b/kube/deploy/apps/psono/app/hr.yaml index 78dac2f3..17f5bf85 100644 --- a/kube/deploy/apps/psono/app/hr.yaml +++ b/kube/deploy/apps/psono/app/hr.yaml @@ -79,7 +79,7 @@ spec: main: enabled: true primary: true - ingressClassName: nginx + ingressClassName: "nginx-internal" annotations: external-dns.alpha.kubernetes.io/target: "${APP_IP_NGINX}" nginx.ingress.kubernetes.io/use-regex: "true" @@ -173,7 +173,7 @@ spec: main: enabled: true primary: true - ingressClassName: nginx + ingressClassName: "nginx-internal" hosts: - host: &host "${APP_DNS_PSONO}" paths: @@ -276,7 +276,7 @@ spec: main: enabled: true primary: true - ingressClassName: nginx + ingressClassName: "nginx-internal" hosts: - host: &host "${APP_DNS_PSONO}" paths: diff --git a/kube/deploy/apps/soft-serve/app/hr.yaml b/kube/deploy/apps/soft-serve/app/hr.yaml index fa7a018b..380a05d0 100644 --- a/kube/deploy/apps/soft-serve/app/hr.yaml +++ b/kube/deploy/apps/soft-serve/app/hr.yaml @@ -74,7 +74,7 @@ spec: main: enabled: true primary: true - ingressClassName: nginx + ingressClassName: "nginx-internal" hosts: - host: &host "${APP_DNS_SOFT_SERVE_HTTPS}" paths: diff --git a/kube/deploy/apps/syncthing/user1/hr.yaml b/kube/deploy/apps/syncthing/user1/hr.yaml index 613b0371..cc1769b8 100644 --- a/kube/deploy/apps/syncthing/user1/hr.yaml +++ b/kube/deploy/apps/syncthing/user1/hr.yaml @@ -56,7 +56,7 @@ spec: main: enabled: true primary: true - ingressClassName: "nginx" + ingressClassName: "nginx-internal" hosts: - host: &host "${APP_DNS_SYNCTHING_USER_1}" paths: diff --git a/kube/deploy/apps/thelounge/app/hr.yaml b/kube/deploy/apps/thelounge/app/hr.yaml index affb2df1..815f3925 100644 --- a/kube/deploy/apps/thelounge/app/hr.yaml +++ b/kube/deploy/apps/thelounge/app/hr.yaml @@ -39,7 +39,7 @@ spec: main: enabled: true primary: true - ingressClassName: nginx + ingressClassName: "nginx-internal" hosts: - host: &host "${APP_DNS_THELOUNGE}" paths: diff --git a/kube/deploy/apps/velociraptor/app/hr.yaml b/kube/deploy/apps/velociraptor/app/hr.yaml index f192660d..5f6595ce 100644 --- a/kube/deploy/apps/velociraptor/app/hr.yaml +++ b/kube/deploy/apps/velociraptor/app/hr.yaml @@ -39,7 +39,7 @@ spec: main: enabled: true primary: true - ingressClassName: nginx + ingressClassName: "nginx-internal" annotations: external-dns.alpha.kubernetes.io/target: "${IP_EC2_INGRESS}" hosts: diff --git a/kube/deploy/core/_networking/cilium/app/hr.yaml b/kube/deploy/core/_networking/cilium/app/hr.yaml index 8dc3abec..011f3c11 100644 --- a/kube/deploy/core/_networking/cilium/app/hr.yaml +++ b/kube/deploy/core/_networking/cilium/app/hr.yaml @@ -52,7 +52,7 @@ spec: ui: ingress: enabled: true - className: "nginx" + className: "nginx-internal" hosts: - "${APP_DNS_HUBBLE}" tls: diff --git a/kube/deploy/core/flux-system/webhook/ingress.yaml b/kube/deploy/core/flux-system/webhook/ingress.yaml index 5fc2beb8..e47ca1c6 100644 --- a/kube/deploy/core/flux-system/webhook/ingress.yaml +++ b/kube/deploy/core/flux-system/webhook/ingress.yaml @@ -8,7 +8,7 @@ metadata: external-dns.alpha.kubernetes.io/target: "${DNS_MAIN_CF}" external-dns.alpha.kubernetes.io/cloudflare-proxied: "true" spec: - ingressClassName: nginx + ingressClassName: "nginx-internal" rules: - host: &host "${APP_DNS_FLUX_WEBHOOK}" http: diff --git a/kube/deploy/core/ingress/ingress-nginx/app/default-backend.yaml b/kube/deploy/core/ingress/ingress-nginx/app/default-backend.yaml index 4cacb310..58059f27 100644 --- a/kube/deploy/core/ingress/ingress-nginx/app/default-backend.yaml +++ b/kube/deploy/core/ingress/ingress-nginx/app/default-backend.yaml @@ -58,7 +58,7 @@ metadata: external-dns.alpha.kubernetes.io/target: "${DNS_SHORT_CF}" external-dns.alpha.kubernetes.io/cloudflare-proxied: "true" spec: - ingressClassName: nginx + ingressClassName: "nginx-internal" rules: - host: &host "error.${DNS_SHORT}" http: @@ -83,7 +83,7 @@ metadata: external-dns.alpha.kubernetes.io/target: "${DNS_MAIN_CF}" external-dns.alpha.kubernetes.io/cloudflare-proxied: "true" spec: - ingressClassName: nginx + ingressClassName: "nginx-internal" rules: - host: &host "error.${DNS_MAIN}" http: diff --git a/kube/deploy/core/monitoring/grafana/app/hr.yaml b/kube/deploy/core/monitoring/grafana/app/hr.yaml index c69abb2d..8544222f 100644 --- a/kube/deploy/core/monitoring/grafana/app/hr.yaml +++ b/kube/deploy/core/monitoring/grafana/app/hr.yaml @@ -178,7 +178,7 @@ spec: enabled: true ingress: enabled: true - ingressClassName: "nginx" + ingressClassName: "nginx-internal" hosts: - &host "${APP_DNS_GRAFANA}" tls: diff --git a/kube/deploy/core/monitoring/kps/app/config/prom.yaml b/kube/deploy/core/monitoring/kps/app/config/prom.yaml index 7fb109b9..d3325fc9 100644 --- a/kube/deploy/core/monitoring/kps/app/config/prom.yaml +++ b/kube/deploy/core/monitoring/kps/app/config/prom.yaml @@ -2,7 +2,7 @@ prometheus: ingress: enabled: true - ingressClassName: nginx + ingressClassName: "nginx-internal" hosts: &hostprom ["${APP_DNS_PROMETHEUS}"] tls: [hosts: *hostprom] paths: ["/"] diff --git a/kube/deploy/core/storage/rook-ceph/cluster/app/hr.yaml b/kube/deploy/core/storage/rook-ceph/cluster/app/hr.yaml index 5c51d26d..5f5928fb 100644 --- a/kube/deploy/core/storage/rook-ceph/cluster/app/hr.yaml +++ b/kube/deploy/core/storage/rook-ceph/cluster/app/hr.yaml @@ -279,7 +279,7 @@ spec: memory: 2Gi ingress: enabled: true - ingressClassName: "nginx" + ingressClassName: "nginx-internal" host: name: &rgw-host "${APP_DNS_RGW_S3}" path: "/" @@ -297,7 +297,7 @@ spec: createPrometheusRules: true ingress: dashboard: - ingressClassName: "nginx" + ingressClassName: "nginx-internal" host: name: &dashboard-host "${APP_DNS_CEPH}" path: "/"