diff --git a/ingress/Traefik2.x/helmchartconfig-traefik.yaml b/ingress/Traefik2.x/helmchartconfig-traefik.yaml index f64014a..e9c9558 100644 --- a/ingress/Traefik2.x/helmchartconfig-traefik.yaml +++ b/ingress/Traefik2.x/helmchartconfig-traefik.yaml @@ -5,19 +5,22 @@ metadata: namespace: kube-system spec: valuesContent: |- + core: + defaultRuleSyntax: v2 additionalArguments: - "--providers.file.directory=/etc/traefik/dynamic" - "--providers.file.watch=true" - certResolvers: + certificatesResolvers: default: - email: letsencrypt.org.danny@spamasaurus.com - storage: /data/acme.json - dnsChallenge: - provider: cloudflare - delayBeforeCheck: 5m0s - resolvers: - - 1.1.1.1:53 - - 1.0.0.1:53 + acme: + email: letsencrypt.org.danny@spamasaurus.com + storage: /data/acme.json + dnsChallenge: + provider: cloudflare + delayBeforeCheck: 5m0s + resolvers: + - 1.1.1.1:53 + - 1.0.0.1:53 deployment: initContainers: - name: volume-permissions @@ -123,8 +126,11 @@ spec: storageClass: longhorn ports: web: - redirectTo: - port: websecure + redirections: + entryPoint: + to: websecure + scheme: https + permanent: true websecure: forwardedHeaders: insecure: true diff --git a/services/Argus/ingressroute-argus.yml b/services/Argus/ingressroute-argus.yml index 96d4e70..559b84c 100644 --- a/services/Argus/ingressroute-argus.yml +++ b/services/Argus/ingressroute-argus.yml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: argus diff --git a/services/Authelia/ingressroute-authelia.yaml b/services/Authelia/ingressroute-authelia.yaml index 6e5a201..33d17de 100644 --- a/services/Authelia/ingressroute-authelia.yaml +++ b/services/Authelia/ingressroute-authelia.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: authelia diff --git a/services/Gotify/ingressroute-gotify.yaml b/services/Gotify/ingressroute-gotify.yaml index 882463e..b5db5b6 100644 --- a/services/Gotify/ingressroute-gotify.yaml +++ b/services/Gotify/ingressroute-gotify.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: gotify diff --git a/services/Guacamole/ingressRoute-Guacamole.yml b/services/Guacamole/ingressRoute-Guacamole.yml index 5e39609..e8ca8d2 100644 --- a/services/Guacamole/ingressRoute-Guacamole.yml +++ b/services/Guacamole/ingressRoute-Guacamole.yml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: guacamole diff --git a/services/Guacamole/middleware-Guacamole.yml b/services/Guacamole/middleware-Guacamole.yml index 33bc377..2cbe3aa 100644 --- a/services/Guacamole/middleware-Guacamole.yml +++ b/services/Guacamole/middleware-Guacamole.yml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: Middleware metadata: name: prepend-path-guacamole diff --git a/services/Lighttpd/ingressroute-lighttpd.yaml b/services/Lighttpd/ingressroute-lighttpd.yaml index 8405087..d787692 100644 --- a/services/Lighttpd/ingressroute-lighttpd.yaml +++ b/services/Lighttpd/ingressroute-lighttpd.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: lighttpd diff --git a/services/Memos/ingressroute-memos.yaml b/services/Memos/ingressroute-memos.yaml index 2b81faf..29f165a 100644 --- a/services/Memos/ingressroute-memos.yaml +++ b/services/Memos/ingressroute-memos.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: memos diff --git a/services/PVR/Prowlarr/ingressroute-prowlarr.yaml b/services/PVR/Prowlarr/ingressroute-prowlarr.yaml index 8951e23..d368dcb 100644 --- a/services/PVR/Prowlarr/ingressroute-prowlarr.yaml +++ b/services/PVR/Prowlarr/ingressroute-prowlarr.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: prowlarr diff --git a/services/PVR/Radarr/ingressroute-radarr.yaml b/services/PVR/Radarr/ingressroute-radarr.yaml index fbbae07..e7ab565 100644 --- a/services/PVR/Radarr/ingressroute-radarr.yaml +++ b/services/PVR/Radarr/ingressroute-radarr.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: radarr diff --git a/services/PVR/SABnzbd/ingressroute-sabnzbd.yaml b/services/PVR/SABnzbd/ingressroute-sabnzbd.yaml index 97bd5b8..feaa489 100644 --- a/services/PVR/SABnzbd/ingressroute-sabnzbd.yaml +++ b/services/PVR/SABnzbd/ingressroute-sabnzbd.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: sabnzbd diff --git a/services/PVR/Sonarr/ingressroute-sonarr.yaml b/services/PVR/Sonarr/ingressroute-sonarr.yaml index 36984a0..684bd0d 100644 --- a/services/PVR/Sonarr/ingressroute-sonarr.yaml +++ b/services/PVR/Sonarr/ingressroute-sonarr.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: sonarr diff --git a/services/PVR/ingressRoute-PVR.yml.template b/services/PVR/ingressRoute-PVR.yml.template index 2bf112c..f9a3198 100644 --- a/services/PVR/ingressRoute-PVR.yml.template +++ b/services/PVR/ingressRoute-PVR.yml.template @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: pvr-apikeys diff --git a/services/Vaultwarden/ingressroute-vaultwarden.yaml b/services/Vaultwarden/ingressroute-vaultwarden.yaml index 8e8e401..041bc65 100644 --- a/services/Vaultwarden/ingressroute-vaultwarden.yaml +++ b/services/Vaultwarden/ingressroute-vaultwarden.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: vaultwarden