diff --git a/cluster/apps/data/bookstack/helm-release.yaml b/cluster/apps/data/bookstack/helm-release.yaml index d7368f32d..0171bd9fa 100644 --- a/cluster/apps/data/bookstack/helm-release.yaml +++ b/cluster/apps/data/bookstack/helm-release.yaml @@ -59,9 +59,8 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" - annotations: - kubernetes.io/ingress.class: "nginx" + ingressClassName: "nginx" + # annotations: # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" hosts: - host: bookstack.${SECRET_CLUSTER_DOMAIN} diff --git a/cluster/apps/data/freshrss/helm-release.yaml b/cluster/apps/data/freshrss/helm-release.yaml index 9f74ee7f2..19a84775e 100644 --- a/cluster/apps/data/freshrss/helm-release.yaml +++ b/cluster/apps/data/freshrss/helm-release.yaml @@ -42,10 +42,9 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" - annotations: - kubernetes.io/ingress.class: "nginx" - traefik.ingress.kubernetes.io/router.entrypoints: "websecure" + ingressClassName: "nginx" + # annotations: + # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" hosts: - host: freshrss.${SECRET_CLUSTER_DOMAIN} paths: diff --git a/cluster/apps/data/hajimari/helm-release.yaml b/cluster/apps/data/hajimari/helm-release.yaml index 09d718a3a..f25e62455 100644 --- a/cluster/apps/data/hajimari/helm-release.yaml +++ b/cluster/apps/data/hajimari/helm-release.yaml @@ -100,9 +100,8 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" - annotations: - kubernetes.io/ingress.class: "nginx" + ingressClassName: "nginx" + # annotations: # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" hosts: - host: "hajimari.${SECRET_CLUSTER_DOMAIN}" diff --git a/cluster/apps/data/homer/helm-release.yaml b/cluster/apps/data/homer/helm-release.yaml index ab81efd11..367f351f2 100644 --- a/cluster/apps/data/homer/helm-release.yaml +++ b/cluster/apps/data/homer/helm-release.yaml @@ -40,7 +40,7 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" + ingressClassName: "nginx" annotations: kubernetes.io/ingress.class: "nginx" # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" @@ -76,9 +76,8 @@ spec: - "/www/assets/.vscode" ingress: enabled: true - # ingressClassName: "traefik" - annotations: - kubernetes.io/ingress.class: "nginx" + ingressClassName: "nginx" + # annotations: # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" # traefik.ingress.kubernetes.io/router.middlewares: networking-forward-auth@kubernetescrd hosts: diff --git a/cluster/apps/data/joplin-server/helm-release.yaml b/cluster/apps/data/joplin-server/helm-release.yaml index 25e6d604f..7ff8cef8f 100644 --- a/cluster/apps/data/joplin-server/helm-release.yaml +++ b/cluster/apps/data/joplin-server/helm-release.yaml @@ -41,9 +41,8 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" - annotations: - kubernetes.io/ingress.class: "nginx" + ingressClassName: "nginx" + # annotations: # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" hosts: - host: "joplin.${SECRET_CLUSTER_DOMAIN}" diff --git a/cluster/apps/data/pgadmin/helm-release.yaml b/cluster/apps/data/pgadmin/helm-release.yaml index 00d0153ea..5b9908c7a 100644 --- a/cluster/apps/data/pgadmin/helm-release.yaml +++ b/cluster/apps/data/pgadmin/helm-release.yaml @@ -31,7 +31,6 @@ spec: ingress: enabled: true annotations: - kubernetes.io/ingress.class: "nginx" # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" # traefik.ingress.kubernetes.io/router.middlewares: networking-buffering-medium@kubernetescrd hosts: @@ -43,13 +42,13 @@ spec: - hosts: - "pgadmin.${SECRET_CLUSTER_DOMAIN}" secretName: "${SECRET_CLUSTER_CERTIFICATE_DEFAULT}" - # postRenderers: - # - kustomize: - # patchesJson6902: - # - target: - # kind: Ingress - # name: pgadmin-pgadmin4 - # patch: - # - op: add - # path: /spec/ingressClassName - # value: traefik + postRenderers: + - kustomize: + patchesJson6902: + - target: + kind: Ingress + name: pgadmin-pgadmin4 + patch: + - op: add + path: /spec/ingressClassName + value: nginx diff --git a/cluster/apps/data/recipes/helm-release.yaml b/cluster/apps/data/recipes/helm-release.yaml index df1f22958..263ca90d7 100644 --- a/cluster/apps/data/recipes/helm-release.yaml +++ b/cluster/apps/data/recipes/helm-release.yaml @@ -62,9 +62,8 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" - annotations: - kubernetes.io/ingress.class: "nginx" + ingressClassName: "nginx" + # annotations: # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" # traefik.ingress.kubernetes.io/router.middlewares: networking-buffering-small@kubernetescrd hosts: diff --git a/cluster/apps/data/resilio-sync/statefulset.yaml b/cluster/apps/data/resilio-sync/statefulset.yaml index 44cde8ecb..510e67ddd 100644 --- a/cluster/apps/data/resilio-sync/statefulset.yaml +++ b/cluster/apps/data/resilio-sync/statefulset.yaml @@ -205,8 +205,7 @@ spec: apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - annotations: - kubernetes.io/ingress.class: "nginx" + # annotations: # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" labels: app.kubernetes.io/instance: resilio-sync @@ -214,7 +213,7 @@ metadata: name: resilio-sync namespace: data spec: - # ingressClassName: "traefik" + ingressClassName: "nginx" tls: - hosts: - "resilio-sync-claude.${SECRET_CLUSTER_DOMAIN}" diff --git a/cluster/apps/data/sharry/helm-release.yaml b/cluster/apps/data/sharry/helm-release.yaml index 6a4e9b330..3f8d174b4 100644 --- a/cluster/apps/data/sharry/helm-release.yaml +++ b/cluster/apps/data/sharry/helm-release.yaml @@ -114,9 +114,8 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" - annotations: - kubernetes.io/ingress.class: "nginx" + ingressClassName: "nginx" + # annotations: # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" # traefik.ingress.kubernetes.io/router.middlewares: networking-buffering-large@kubernetescrd hosts: diff --git a/cluster/apps/data/vaultwarden/helm-release.yaml b/cluster/apps/data/vaultwarden/helm-release.yaml index c4f9b82dd..05162752f 100644 --- a/cluster/apps/data/vaultwarden/helm-release.yaml +++ b/cluster/apps/data/vaultwarden/helm-release.yaml @@ -52,9 +52,8 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" - annotations: - kubernetes.io/ingress.class: "nginx" + ingressClassName: "nginx" + # annotations: # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" hosts: - host: "vaultwarden.${SECRET_CLUSTER_DOMAIN}" @@ -66,12 +65,7 @@ spec: - path: /notifications/hub pathType: Prefix servicePort: 3012 - - host: "bitwarden.${SECRET_CLUSTER_DOMAIN}" - paths: - - path: / - pathType: Prefix tls: - hosts: - "vaultwarden.${SECRET_CLUSTER_DOMAIN}" - - "bitwarden.${SECRET_CLUSTER_DOMAIN}" secretName: "${SECRET_CLUSTER_CERTIFICATE_DEFAULT}" diff --git a/cluster/apps/data/vikunja/helm-release.yaml b/cluster/apps/data/vikunja/helm-release.yaml index c4a296d89..edcc15e99 100644 --- a/cluster/apps/data/vikunja/helm-release.yaml +++ b/cluster/apps/data/vikunja/helm-release.yaml @@ -42,9 +42,8 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" - annotations: - kubernetes.io/ingress.class: "nginx" + ingressClassName: "nginx" + # annotations: # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" hosts: - host: "vikunja.${SECRET_CLUSTER_DOMAIN}" diff --git a/cluster/apps/data/wallabag/helm-release.yaml b/cluster/apps/data/wallabag/helm-release.yaml index 5ad2b3ef9..9c76b69b5 100644 --- a/cluster/apps/data/wallabag/helm-release.yaml +++ b/cluster/apps/data/wallabag/helm-release.yaml @@ -63,9 +63,8 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" - annotations: - kubernetes.io/ingress.class: "nginx" + ingressClassName: "nginx" + # annotations: # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" hosts: - host: "wallabag.${SECRET_CLUSTER_DOMAIN}" diff --git a/cluster/apps/development/docker-registry/helm-release.yaml b/cluster/apps/development/docker-registry/helm-release.yaml index e0ff0e4d3..9e674a813 100644 --- a/cluster/apps/development/docker-registry/helm-release.yaml +++ b/cluster/apps/development/docker-registry/helm-release.yaml @@ -40,7 +40,6 @@ spec: ingress: enabled: true annotations: - kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/proxy-body-size: "0" nginx.ingress.kubernetes.io/proxy-read-timeout: "600" nginx.ingress.kubernetes.io/proxy-send-timeout: "600" @@ -53,13 +52,13 @@ spec: - "registry.${SECRET_CLUSTER_DOMAIN}" secretName: "${SECRET_CLUSTER_CERTIFICATE_DEFAULT}" - # postRenderers: - # - kustomize: - # patchesJson6902: - # - target: - # kind: Ingress - # name: docker-registry - # patch: - # - op: add - # path: /spec/ingressClassName - # value: traefik + postRenderers: + - kustomize: + patchesJson6902: + - target: + kind: Ingress + name: docker-registry + patch: + - op: add + path: /spec/ingressClassName + value: nginx diff --git a/cluster/apps/development/drone/helm-release.yaml b/cluster/apps/development/drone/helm-release.yaml index 02592de59..92de865dc 100644 --- a/cluster/apps/development/drone/helm-release.yaml +++ b/cluster/apps/development/drone/helm-release.yaml @@ -44,8 +44,7 @@ spec: ingress: enabled: true - annotations: - kubernetes.io/ingress.class: "nginx" + # annotations: # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" hosts: - host: "drone.${SECRET_CLUSTER_DOMAIN}" @@ -54,11 +53,13 @@ spec: - hosts: - "wallabag.${SECRET_CLUSTER_DOMAIN}" secretName: "${SECRET_CLUSTER_CERTIFICATE_DEFAULT}" - # postRenderers: - # - kustomize: - # patchesJson6902: - # name: drone - # patch: - # - op: add - # path: /spec/ingressClassName - # value: traefik + postRenderers: + - kustomize: + patchesJson6902: + - target: + kind: Ingress + name: drone + patch: + - op: add + path: /spec/ingressClassName + value: traefik diff --git a/cluster/apps/development/gitea/helm-release.yaml b/cluster/apps/development/gitea/helm-release.yaml index 229b70fbe..f0a9a1e2e 100644 --- a/cluster/apps/development/gitea/helm-release.yaml +++ b/cluster/apps/development/gitea/helm-release.yaml @@ -87,8 +87,7 @@ spec: ingress: enabled: true - annotations: - kubernetes.io/ingress.class: "nginx" + # annotations: # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" hosts: - host: "gitea.${SECRET_CLUSTER_DOMAIN}" @@ -100,13 +99,13 @@ spec: - "gitea.${SECRET_CLUSTER_DOMAIN}" secretName: "${SECRET_CLUSTER_CERTIFICATE_DEFAULT}" - # postRenderers: - # - kustomize: - # patchesJson6902: - # - target: - # kind: Ingress - # name: gitea - # patch: - # - op: add - # path: /spec/ingressClassName - # value: traefik + postRenderers: + - kustomize: + patchesJson6902: + - target: + kind: Ingress + name: gitea + patch: + - op: add + path: /spec/ingressClassName + value: nginx diff --git a/cluster/apps/home-automation/emqx/helm-release.yaml b/cluster/apps/home-automation/emqx/helm-release.yaml index 47fb19a0c..b7588058a 100644 --- a/cluster/apps/home-automation/emqx/helm-release.yaml +++ b/cluster/apps/home-automation/emqx/helm-release.yaml @@ -60,8 +60,7 @@ spec: ingress: dashboard: enabled: true - annotations: - kubernetes.io/ingress.class: "nginx" + # annotations: # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" path: / hosts: @@ -103,10 +102,10 @@ spec: path: /spec/externalIPs value: - "${CLUSTER_LB_EMQX}" - # - target: - # kind: Ingress - # name: emqx-dashboard - # patch: - # - op: add - # path: /spec/ingressClassName - # value: traefik + - target: + kind: Ingress + name: emqx-dashboard + patch: + - op: add + path: /spec/ingressClassName + value: nginx diff --git a/cluster/apps/home-automation/frigate/helm-release.yaml b/cluster/apps/home-automation/frigate/helm-release.yaml index 9814eef90..abc488578 100644 --- a/cluster/apps/home-automation/frigate/helm-release.yaml +++ b/cluster/apps/home-automation/frigate/helm-release.yaml @@ -95,9 +95,8 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" + ingressClassName: "nginx" annotations: - kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/auth-url: "http://authelia.networking.svc.cluster.local/api/verify" nginx.ingress.kubernetes.io/auth-signin: "https://login.${SECRET_CLUSTER_DOMAIN}" # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" diff --git a/cluster/apps/home-automation/home-assistant/helm-release.yaml b/cluster/apps/home-automation/home-assistant/helm-release.yaml index 2a60d9c9c..b5ff7ee34 100644 --- a/cluster/apps/home-automation/home-assistant/helm-release.yaml +++ b/cluster/apps/home-automation/home-assistant/helm-release.yaml @@ -50,9 +50,8 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" - annotations: - kubernetes.io/ingress.class: "nginx" + ingressClassName: "nginx" + # annotations: # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" hosts: - host: "hass.${SECRET_CLUSTER_DOMAIN}" @@ -111,11 +110,10 @@ spec: - "/config/.vscode" ingress: enabled: true - # ingressClassName: "traefik" + ingressClassName: "nginx" annotations: - kubernetes.io/ingress.class: "nginx" - nginx.ingress.kubernetes.io/auth-url: "http://authelia.networking.svc.cluster.local/api/verify" - nginx.ingress.kubernetes.io/auth-signin: "https://login.${SECRET_CLUSTER_DOMAIN}" + nginx.ingress.kubernetes.io/auth-url: "http://authelia.networking.svc.cluster.local/api/verify" + nginx.ingress.kubernetes.io/auth-signin: "https://login.${SECRET_CLUSTER_DOMAIN}" # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" # traefik.ingress.kubernetes.io/router.middlewares: networking-forward-auth@kubernetescrd hosts: diff --git a/cluster/apps/home-automation/zigbee2mqtt/helm-release.yaml b/cluster/apps/home-automation/zigbee2mqtt/helm-release.yaml index cf3961730..313b6e12b 100644 --- a/cluster/apps/home-automation/zigbee2mqtt/helm-release.yaml +++ b/cluster/apps/home-automation/zigbee2mqtt/helm-release.yaml @@ -73,9 +73,8 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" + ingressClassName: "nginx" annotations: - kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/auth-url: "http://authelia.networking.svc.cluster.local/api/verify" nginx.ingress.kubernetes.io/auth-signin: "https://login.${SECRET_CLUSTER_DOMAIN}" # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" diff --git a/cluster/apps/home-automation/zwavejs2mqtt/helm-release.yaml b/cluster/apps/home-automation/zwavejs2mqtt/helm-release.yaml index 20c279bae..9e3af3ef8 100644 --- a/cluster/apps/home-automation/zwavejs2mqtt/helm-release.yaml +++ b/cluster/apps/home-automation/zwavejs2mqtt/helm-release.yaml @@ -37,7 +37,7 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" + ingressClassName: "nginx" annotations: kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/auth-url: "http://authelia.networking.svc.cluster.local/api/verify" diff --git a/cluster/apps/media/bazarr/helm-release.yaml b/cluster/apps/media/bazarr/helm-release.yaml index 384d97eef..e9570c0b9 100644 --- a/cluster/apps/media/bazarr/helm-release.yaml +++ b/cluster/apps/media/bazarr/helm-release.yaml @@ -48,9 +48,8 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" + ingressClassName: "nginx" annotations: - kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/auth-url: "http://authelia.networking.svc.cluster.local/api/verify" nginx.ingress.kubernetes.io/auth-signin: "https://login.${SECRET_CLUSTER_DOMAIN}" nginx.ingress.kubernetes.io/configuration-snippet: | diff --git a/cluster/apps/media/flood/helm-release.yaml b/cluster/apps/media/flood/helm-release.yaml index 586550a51..d5511909f 100644 --- a/cluster/apps/media/flood/helm-release.yaml +++ b/cluster/apps/media/flood/helm-release.yaml @@ -48,9 +48,8 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" + ingressClassName: "nginx" annotations: - kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/auth-url: "http://authelia.networking.svc.cluster.local/api/verify" nginx.ingress.kubernetes.io/auth-signin: "https://login.${SECRET_CLUSTER_DOMAIN}" nginx.ingress.kubernetes.io/configuration-snippet: | diff --git a/cluster/apps/media/jellyfin/helm-release.yaml b/cluster/apps/media/jellyfin/helm-release.yaml index 4414409d3..94d9b7e31 100644 --- a/cluster/apps/media/jellyfin/helm-release.yaml +++ b/cluster/apps/media/jellyfin/helm-release.yaml @@ -48,9 +48,8 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" - annotations: - kubernetes.io/ingress.class: "nginx" + ingressClassName: "nginx" + # annotations: # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" hosts: - host: "jellyfin.${SECRET_CLUSTER_DOMAIN}" diff --git a/cluster/apps/media/lidarr/helm-release.yaml b/cluster/apps/media/lidarr/helm-release.yaml index b5ddad749..fa8db29a3 100644 --- a/cluster/apps/media/lidarr/helm-release.yaml +++ b/cluster/apps/media/lidarr/helm-release.yaml @@ -56,9 +56,8 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" + ingressClassName: "nginx" annotations: - kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/auth-url: "http://authelia.networking.svc.cluster.local/api/verify" nginx.ingress.kubernetes.io/auth-signin: "https://login.${SECRET_CLUSTER_DOMAIN}" nginx.ingress.kubernetes.io/configuration-snippet: | @@ -77,9 +76,8 @@ spec: - "lidarr.${SECRET_CLUSTER_DOMAIN}" api: enabled: true - # ingressClassName: "traefik" - annotations: - kubernetes.io/ingress.class: "nginx" + ingressClassName: "nginx" + # annotations: # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" hosts: - host: "lidarr.${SECRET_CLUSTER_DOMAIN}" diff --git a/cluster/apps/media/lychee/helm-release.yaml b/cluster/apps/media/lychee/helm-release.yaml index ef7ce0ec8..55d1cab5c 100644 --- a/cluster/apps/media/lychee/helm-release.yaml +++ b/cluster/apps/media/lychee/helm-release.yaml @@ -51,9 +51,8 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" - annotations: - kubernetes.io/ingress.class: "nginx" + ingressClassName: "nginx" + # annotations: # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" hosts: - host: "lychee.${SECRET_CLUSTER_DOMAIN}" diff --git a/cluster/apps/media/navidrome/helm-release.yaml b/cluster/apps/media/navidrome/helm-release.yaml index b871b4ffb..cb35c0417 100644 --- a/cluster/apps/media/navidrome/helm-release.yaml +++ b/cluster/apps/media/navidrome/helm-release.yaml @@ -48,9 +48,8 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" - annotations: - kubernetes.io/ingress.class: "nginx" + ingressClassName: "nginx" + # annotations: # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" hosts: - host: "navidrome.${SECRET_CLUSTER_DOMAIN}" diff --git a/cluster/apps/media/prowlarr/helm-release.yaml b/cluster/apps/media/prowlarr/helm-release.yaml index e12834aa9..bb8158f62 100644 --- a/cluster/apps/media/prowlarr/helm-release.yaml +++ b/cluster/apps/media/prowlarr/helm-release.yaml @@ -39,9 +39,8 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" + ingressClassName: "nginx" annotations: - kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/auth-url: "http://authelia.networking.svc.cluster.local/api/verify" nginx.ingress.kubernetes.io/auth-signin: "https://login.${SECRET_CLUSTER_DOMAIN}" nginx.ingress.kubernetes.io/configuration-snippet: | diff --git a/cluster/apps/media/pyload/helm-release.yaml b/cluster/apps/media/pyload/helm-release.yaml index bdd3609eb..5b4c317bd 100644 --- a/cluster/apps/media/pyload/helm-release.yaml +++ b/cluster/apps/media/pyload/helm-release.yaml @@ -43,9 +43,8 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" + ingressClassName: "nginx" annotations: - kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/auth-url: "http://authelia.networking.svc.cluster.local/api/verify" nginx.ingress.kubernetes.io/auth-signin: "https://login.${SECRET_CLUSTER_DOMAIN}" # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" diff --git a/cluster/apps/media/qbittorrent/helm-release.yaml b/cluster/apps/media/qbittorrent/helm-release.yaml index c80bdef40..34285bf2e 100644 --- a/cluster/apps/media/qbittorrent/helm-release.yaml +++ b/cluster/apps/media/qbittorrent/helm-release.yaml @@ -63,9 +63,8 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" + ingressClassName: "nginx" annotations: - kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/configuration-snippet: | proxy_set_header Accept-Encoding ""; sub_filter '' ''; diff --git a/cluster/apps/media/radarr/helm-release.yaml b/cluster/apps/media/radarr/helm-release.yaml index c723b913f..8b8840708 100644 --- a/cluster/apps/media/radarr/helm-release.yaml +++ b/cluster/apps/media/radarr/helm-release.yaml @@ -53,9 +53,8 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" + ingressClassName: "nginx" annotations: - kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/auth-url: "http://authelia.networking.svc.cluster.local/api/verify" nginx.ingress.kubernetes.io/auth-signin: "https://login.${SECRET_CLUSTER_DOMAIN}" nginx.ingress.kubernetes.io/configuration-snippet: | @@ -74,9 +73,8 @@ spec: - "radarr.${SECRET_CLUSTER_DOMAIN}" api: enabled: true - # ingressClassName: "traefik" - annotations: - kubernetes.io/ingress.class: "nginx" + ingressClassName: "nginx" + # annotations: # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" hosts: - host: "radarr.${SECRET_CLUSTER_DOMAIN}" diff --git a/cluster/apps/media/readarr/helm-release.yaml b/cluster/apps/media/readarr/helm-release.yaml index 06a087faf..bc33acb58 100644 --- a/cluster/apps/media/readarr/helm-release.yaml +++ b/cluster/apps/media/readarr/helm-release.yaml @@ -48,9 +48,8 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" + ingressClassName: "nginx" annotations: - kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/auth-url: "http://authelia.networking.svc.cluster.local/api/verify" nginx.ingress.kubernetes.io/auth-signin: "https://login.${SECRET_CLUSTER_DOMAIN}" nginx.ingress.kubernetes.io/configuration-snippet: | @@ -69,9 +68,8 @@ spec: - "readarr.${SECRET_CLUSTER_DOMAIN}" api: enabled: true - # ingressClassName: "traefik" - annotations: - kubernetes.io/ingress.class: "nginx" + ingressClassName: "nginx" + # annotations: # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" hosts: - host: "readarr.${SECRET_CLUSTER_DOMAIN}" diff --git a/cluster/apps/media/sabnzbd/helm-release.yaml b/cluster/apps/media/sabnzbd/helm-release.yaml index 0f6c5fbb8..7ae26a895 100644 --- a/cluster/apps/media/sabnzbd/helm-release.yaml +++ b/cluster/apps/media/sabnzbd/helm-release.yaml @@ -46,9 +46,8 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" + ingressClassName: "nginx" annotations: - kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/auth-url: "http://authelia.networking.svc.cluster.local/api/verify" nginx.ingress.kubernetes.io/auth-signin: "https://login.${SECRET_CLUSTER_DOMAIN}" nginx.ingress.kubernetes.io/configuration-snippet: | @@ -67,10 +66,9 @@ spec: - "sabnzbd.${SECRET_CLUSTER_DOMAIN}" api: enabled: true - # ingressClassName: "traefik" + ingressClassName: "nginx" nameSuffix: "api" - annotations: - kubernetes.io/ingress.class: "nginx" + # annotations: # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" hosts: - host: "sabnzbd.${SECRET_CLUSTER_DOMAIN}" diff --git a/cluster/apps/media/sonarr/helm-release.yaml b/cluster/apps/media/sonarr/helm-release.yaml index ff37acd26..ef35c0ac0 100644 --- a/cluster/apps/media/sonarr/helm-release.yaml +++ b/cluster/apps/media/sonarr/helm-release.yaml @@ -51,9 +51,8 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" + ingressClassName: "nginx" annotations: - kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/auth-url: "http://authelia.networking.svc.cluster.local/api/verify" nginx.ingress.kubernetes.io/auth-signin: "https://login.${SECRET_CLUSTER_DOMAIN}" nginx.ingress.kubernetes.io/configuration-snippet: | @@ -72,9 +71,8 @@ spec: - "sonarr.${SECRET_CLUSTER_DOMAIN}" api: enabled: true - # ingressClassName: "traefik" - annotations: - kubernetes.io/ingress.class: "nginx" + ingressClassName: "nginx" + # annotations: # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" hosts: - host: "sonarr.${SECRET_CLUSTER_DOMAIN}" diff --git a/cluster/apps/media/tdarr/helm-release.yaml b/cluster/apps/media/tdarr/helm-release.yaml index 95a470555..bf6432f56 100644 --- a/cluster/apps/media/tdarr/helm-release.yaml +++ b/cluster/apps/media/tdarr/helm-release.yaml @@ -62,9 +62,8 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" + ingressClassName: "nginx" annotations: - kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/auth-url: "http://authelia.networking.svc.cluster.local/api/verify" nginx.ingress.kubernetes.io/auth-signin: "https://login.${SECRET_CLUSTER_DOMAIN}" # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" diff --git a/cluster/apps/media/travelstories/deployment.yaml b/cluster/apps/media/travelstories/deployment.yaml index ed00df277..b005b7a54 100644 --- a/cluster/apps/media/travelstories/deployment.yaml +++ b/cluster/apps/media/travelstories/deployment.yaml @@ -75,7 +75,6 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: annotations: - kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/auth-url: "http://authelia.networking.svc.cluster.local/api/verify" nginx.ingress.kubernetes.io/auth-signin: "https://login.${SECRET_CLUSTER_DOMAIN}" # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" @@ -86,7 +85,7 @@ metadata: name: travelstories namespace: media spec: - # ingressClassName: "traefik" + ingressClassName: "nginx" rules: - host: "travelstories.${SECRET_CLUSTER_DOMAIN}" http: diff --git a/cluster/apps/monitoring/blackbox-exporter/helm-release.yaml b/cluster/apps/monitoring/blackbox-exporter/helm-release.yaml index 1ef2a5131..77d28be4e 100644 --- a/cluster/apps/monitoring/blackbox-exporter/helm-release.yaml +++ b/cluster/apps/monitoring/blackbox-exporter/helm-release.yaml @@ -91,7 +91,6 @@ spec: ingress: enabled: true annotations: - kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/auth-url: "http://authelia.networking.svc.cluster.local/api/verify" nginx.ingress.kubernetes.io/auth-signin: "https://login.${SECRET_CLUSTER_DOMAIN}" # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" @@ -106,13 +105,13 @@ spec: - "blackbox.${SECRET_CLUSTER_DOMAIN}" secretName: "${SECRET_CLUSTER_CERTIFICATE_DEFAULT}" - # postRenderers: - # - kustomize: - # patchesJson6902: - # - target: - # kind: Ingress - # name: blackbox-exporter-prometheus-blackbox-exporter - # patch: - # - op: add - # path: /spec/ingressClassName - # value: traefik + postRenderers: + - kustomize: + patchesJson6902: + - target: + kind: Ingress + name: blackbox-exporter-prometheus-blackbox-exporter + patch: + - op: add + path: /spec/ingressClassName + value: nginx diff --git a/cluster/apps/monitoring/healthchecks/helm-release.yaml b/cluster/apps/monitoring/healthchecks/helm-release.yaml index c4389cfd4..02153433e 100644 --- a/cluster/apps/monitoring/healthchecks/helm-release.yaml +++ b/cluster/apps/monitoring/healthchecks/helm-release.yaml @@ -54,9 +54,8 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" - annotations: - kubernetes.io/ingress.class: "nginx" + ingressClassName: "nginx" + # annotations: # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" hosts: - host: "healthchecks.${SECRET_CLUSTER_DOMAIN}" diff --git a/cluster/apps/monitoring/kube-prometheus-stack/helm-release.yaml b/cluster/apps/monitoring/kube-prometheus-stack/helm-release.yaml index f4ace0d4b..ddb992d5c 100644 --- a/cluster/apps/monitoring/kube-prometheus-stack/helm-release.yaml +++ b/cluster/apps/monitoring/kube-prometheus-stack/helm-release.yaml @@ -32,9 +32,8 @@ spec: ingress: enabled: true pathType: Prefix - # ingressClassName: "traefik" + ingressClassName: "nginx" annotations: - kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/auth-url: "http://authelia.networking.svc.cluster.local/api/verify" nginx.ingress.kubernetes.io/auth-signin: "https://login.${SECRET_CLUSTER_DOMAIN}" # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" @@ -209,9 +208,8 @@ spec: ingress: enabled: true pathType: Prefix - # ingressClassName: "traefik" - annotations: - kubernetes.io/ingress.class: "nginx" + ingressClassName: "nginx" + # annotations: # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" hosts: ["grafana.${SECRET_CLUSTER_DOMAIN}"] tls: @@ -229,9 +227,8 @@ spec: ingress: enabled: true pathType: Prefix - # ingressClassName: "traefik" + ingressClassName: "nginx" annotations: - kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/auth-url: "http://authelia.networking.svc.cluster.local/api/verify" nginx.ingress.kubernetes.io/auth-signin: "https://login.${SECRET_CLUSTER_DOMAIN}" # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" diff --git a/cluster/apps/monitoring/thanos/helm-release.yaml b/cluster/apps/monitoring/thanos/helm-release.yaml index f10d62ff7..212ae8f86 100644 --- a/cluster/apps/monitoring/thanos/helm-release.yaml +++ b/cluster/apps/monitoring/thanos/helm-release.yaml @@ -29,7 +29,6 @@ spec: enabled: true hostname: "thanos.${SECRET_CLUSTER_DOMAIN}" annotations: - kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/auth-url: "http://authelia.networking.svc.cluster.local/api/verify" nginx.ingress.kubernetes.io/auth-signin: "https://login.${SECRET_CLUSTER_DOMAIN}" # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" @@ -61,13 +60,13 @@ spec: secret_key: "${SECRET_MINIO_SECRET_KEY}" insecure: false - # postRenderers: - # - kustomize: - # patchesJson6902: - # - target: - # kind: Ingress - # name: thanos-query - # patch: - # - op: add - # path: /spec/ingressClassName - # value: traefik + postRenderers: + - kustomize: + patchesJson6902: + - target: + kind: Ingress + name: thanos-query + patch: + - op: add + path: /spec/ingressClassName + value: nginx diff --git a/cluster/apps/monitoring/uptime-kuma/statefulset.yaml b/cluster/apps/monitoring/uptime-kuma/statefulset.yaml index cbf532b11..69473f921 100644 --- a/cluster/apps/monitoring/uptime-kuma/statefulset.yaml +++ b/cluster/apps/monitoring/uptime-kuma/statefulset.yaml @@ -67,8 +67,7 @@ spec: apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - annotations: - kubernetes.io/ingress.class: "nginx" + # annotations: # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" labels: app.kubernetes.io/instance: uptime-kuma @@ -76,7 +75,7 @@ metadata: name: uptime-kuma namespace: monitoring spec: - # ingressClassName: "traefik" + ingressClassName: "nginx" rules: - host: "uptime-kuma.${SECRET_CLUSTER_DOMAIN}" http: diff --git a/cluster/apps/networking/authelia/helm-release.yaml b/cluster/apps/networking/authelia/helm-release.yaml index 8ed67711d..2578daf53 100644 --- a/cluster/apps/networking/authelia/helm-release.yaml +++ b/cluster/apps/networking/authelia/helm-release.yaml @@ -27,8 +27,7 @@ spec: ingress: enabled: true - annotations: - kubernetes.io/ingress.class: "nginx" + # annotations: # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" subdomain: login @@ -159,3 +158,14 @@ spec: key: SMTP_PASSWORD value: "${SECRET_AUTHELIA_SMTP_PASSWORD}" filename: SMTP_PASSWORD + + postRenderers: + - kustomize: + patchesJson6902: + - target: + kind: Ingress + name: authelia + patch: + - op: add + path: /spec/ingressClassName + value: nginx diff --git a/cluster/apps/networking/authentik/helm-release.yaml b/cluster/apps/networking/authentik/helm-release.yaml index 9dd779d6d..71cf7ffec 100644 --- a/cluster/apps/networking/authentik/helm-release.yaml +++ b/cluster/apps/networking/authentik/helm-release.yaml @@ -23,9 +23,8 @@ spec: ingress: enabled: true - # ingressClassName: "traefik" - annotations: - kubernetes.io/ingress.class: "nginx" + ingressClassName: "nginx" + # annotations: # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" hosts: - host: "id.${SECRET_CLUSTER_DOMAIN}" diff --git a/cluster/apps/networking/unifi/helm-release.yaml b/cluster/apps/networking/unifi/helm-release.yaml index a0b18966a..4b6f53bdc 100644 --- a/cluster/apps/networking/unifi/helm-release.yaml +++ b/cluster/apps/networking/unifi/helm-release.yaml @@ -38,9 +38,8 @@ spec: ingress: main: enabled: true - # ingressClassName: "traefik" - annotations: - kubernetes.io/ingress.class: "nginx" + ingressClassName: "nginx" + # annotations: # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" # traefik.ingress.kubernetes.io/router.middlewares: networking-buffering-medium@kubernetescrd hosts: diff --git a/cluster/core/rook-ceph/dashboard/ingress.yaml b/cluster/core/rook-ceph/dashboard/ingress.yaml index ed5369f99..6eff590ab 100644 --- a/cluster/core/rook-ceph/dashboard/ingress.yaml +++ b/cluster/core/rook-ceph/dashboard/ingress.yaml @@ -4,14 +4,13 @@ kind: Ingress metadata: name: rook-ceph-mgr-dashboard namespace: rook-ceph - annotations: - kubernetes.io/ingress.class: "nginx" + # annotations: # traefik.ingress.kubernetes.io/router.entrypoints: "websecure" labels: app.kubernetes.io/instance: rook-ceph-mgr-dashboard app.kubernetes.io/name: rook-ceph-mgr-dashboard spec: - # ingressClassName: "traefik" + ingressClassName: "nginx" rules: - host: "rook.${SECRET_CLUSTER_DOMAIN}" http: