From 916df74458db63b0adf0fd4b78ebc227b69f9cac Mon Sep 17 00:00:00 2001 From: tehNooB <125163838+JamesTurland@users.noreply.github.com> Date: Thu, 2 May 2024 16:35:56 +0100 Subject: [PATCH 1/2] Update docker-compose.yaml --- Headscale/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Headscale/docker-compose.yaml b/Headscale/docker-compose.yaml index 690ec75c..339a36aa 100644 --- a/Headscale/docker-compose.yaml +++ b/Headscale/docker-compose.yaml @@ -8,7 +8,7 @@ services: ports: - 8080:8080 - 9090:9090 - image: headscale/headscale:latest + image: headscale/headscale:0.22.3 command: headscale serve restart: unless-stopped From d86eb067029a41036dde7f1a833f1fc5967df5a7 Mon Sep 17 00:00:00 2001 From: cyberops7 <18562612+cyberops7@users.noreply.github.com> Date: Thu, 2 May 2024 21:27:05 -0600 Subject: [PATCH 2/2] traefik v3 requires updating the CRDs API group version --- .../Portainer/default-headers.yaml | 2 +- .../Portainer/ingress.yaml | 2 +- .../WireGuard-Easy/default-headers.yaml | 2 +- .../WireGuard-Easy/ingress.yaml | 2 +- .../WireGuard-Easy/ingressRouteUDP.yaml | 2 +- .../CrowdSec/Bouncer/bouncer-middleware.yaml | 2 +- Kubernetes/GitOps/Gotify/default-headers.yaml | 2 +- Kubernetes/GitOps/Gotify/ingress.yaml | 2 +- .../default-headers.yaml | 2 +- .../Traefik-External-Service/ingress.yaml | 2 +- .../Helm/Traefik/Dashboard/ingress.yaml | 2 +- .../Helm/Traefik/Dashboard/middleware.yaml | 2 +- .../Helm/Traefik/default-headers.yaml | 2 +- .../Manifest/PiHole/default-headers.yaml | 2 +- .../Manifest/PiHole/ingress.yaml | 2 +- Kubernetes/Traefik-PiHole/readme.md | 22 +++++++++++++++++++ Unifi-Controller/kubernetes/ingress.yaml | 4 ++-- 17 files changed, 39 insertions(+), 17 deletions(-) diff --git a/Kubernetes/Create-manifest-helm/Portainer/default-headers.yaml b/Kubernetes/Create-manifest-helm/Portainer/default-headers.yaml index fd09585f..f897e33d 100644 --- a/Kubernetes/Create-manifest-helm/Portainer/default-headers.yaml +++ b/Kubernetes/Create-manifest-helm/Portainer/default-headers.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: Middleware metadata: name: default-headers diff --git a/Kubernetes/Create-manifest-helm/Portainer/ingress.yaml b/Kubernetes/Create-manifest-helm/Portainer/ingress.yaml index f1517af4..04ab1ef0 100644 --- a/Kubernetes/Create-manifest-helm/Portainer/ingress.yaml +++ b/Kubernetes/Create-manifest-helm/Portainer/ingress.yaml @@ -1,5 +1,5 @@ --- -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: portainer diff --git a/Kubernetes/Create-manifest-helm/WireGuard-Easy/default-headers.yaml b/Kubernetes/Create-manifest-helm/WireGuard-Easy/default-headers.yaml index 4b9de976..4e145850 100644 --- a/Kubernetes/Create-manifest-helm/WireGuard-Easy/default-headers.yaml +++ b/Kubernetes/Create-manifest-helm/WireGuard-Easy/default-headers.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: Middleware metadata: name: default-headers diff --git a/Kubernetes/Create-manifest-helm/WireGuard-Easy/ingress.yaml b/Kubernetes/Create-manifest-helm/WireGuard-Easy/ingress.yaml index 4130ba9f..cbaf16fd 100644 --- a/Kubernetes/Create-manifest-helm/WireGuard-Easy/ingress.yaml +++ b/Kubernetes/Create-manifest-helm/WireGuard-Easy/ingress.yaml @@ -1,5 +1,5 @@ --- -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: wg-easy diff --git a/Kubernetes/Create-manifest-helm/WireGuard-Easy/ingressRouteUDP.yaml b/Kubernetes/Create-manifest-helm/WireGuard-Easy/ingressRouteUDP.yaml index b2f7d903..f66d4ee1 100644 --- a/Kubernetes/Create-manifest-helm/WireGuard-Easy/ingressRouteUDP.yaml +++ b/Kubernetes/Create-manifest-helm/WireGuard-Easy/ingressRouteUDP.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRouteUDP metadata: name: wg-easy diff --git a/Kubernetes/CrowdSec/Bouncer/bouncer-middleware.yaml b/Kubernetes/CrowdSec/Bouncer/bouncer-middleware.yaml index c829563f..618d969a 100644 --- a/Kubernetes/CrowdSec/Bouncer/bouncer-middleware.yaml +++ b/Kubernetes/CrowdSec/Bouncer/bouncer-middleware.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: Middleware metadata: name: bouncer diff --git a/Kubernetes/GitOps/Gotify/default-headers.yaml b/Kubernetes/GitOps/Gotify/default-headers.yaml index ef8e3f6c..7dc41c5d 100644 --- a/Kubernetes/GitOps/Gotify/default-headers.yaml +++ b/Kubernetes/GitOps/Gotify/default-headers.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: Middleware metadata: name: default-headers diff --git a/Kubernetes/GitOps/Gotify/ingress.yaml b/Kubernetes/GitOps/Gotify/ingress.yaml index dc88102c..3f1ae6d3 100644 --- a/Kubernetes/GitOps/Gotify/ingress.yaml +++ b/Kubernetes/GitOps/Gotify/ingress.yaml @@ -1,5 +1,5 @@ --- -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: gotify diff --git a/Kubernetes/Traefik-External-Service/default-headers.yaml b/Kubernetes/Traefik-External-Service/default-headers.yaml index 32a85bda..c2dee584 100644 --- a/Kubernetes/Traefik-External-Service/default-headers.yaml +++ b/Kubernetes/Traefik-External-Service/default-headers.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: Middleware metadata: name: default-headers diff --git a/Kubernetes/Traefik-External-Service/ingress.yaml b/Kubernetes/Traefik-External-Service/ingress.yaml index 2594e293..e57b6146 100644 --- a/Kubernetes/Traefik-External-Service/ingress.yaml +++ b/Kubernetes/Traefik-External-Service/ingress.yaml @@ -1,5 +1,5 @@ --- -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: proxmox diff --git a/Kubernetes/Traefik-PiHole/Helm/Traefik/Dashboard/ingress.yaml b/Kubernetes/Traefik-PiHole/Helm/Traefik/Dashboard/ingress.yaml index ae808923..3debb780 100644 --- a/Kubernetes/Traefik-PiHole/Helm/Traefik/Dashboard/ingress.yaml +++ b/Kubernetes/Traefik-PiHole/Helm/Traefik/Dashboard/ingress.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: traefik-dashboard diff --git a/Kubernetes/Traefik-PiHole/Helm/Traefik/Dashboard/middleware.yaml b/Kubernetes/Traefik-PiHole/Helm/Traefik/Dashboard/middleware.yaml index 029499e3..2446277c 100644 --- a/Kubernetes/Traefik-PiHole/Helm/Traefik/Dashboard/middleware.yaml +++ b/Kubernetes/Traefik-PiHole/Helm/Traefik/Dashboard/middleware.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: Middleware metadata: name: traefik-dashboard-basicauth diff --git a/Kubernetes/Traefik-PiHole/Helm/Traefik/default-headers.yaml b/Kubernetes/Traefik-PiHole/Helm/Traefik/default-headers.yaml index 435e5741..b0884d21 100644 --- a/Kubernetes/Traefik-PiHole/Helm/Traefik/default-headers.yaml +++ b/Kubernetes/Traefik-PiHole/Helm/Traefik/default-headers.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: Middleware metadata: name: default-headers diff --git a/Kubernetes/Traefik-PiHole/Manifest/PiHole/default-headers.yaml b/Kubernetes/Traefik-PiHole/Manifest/PiHole/default-headers.yaml index 44c1837c..fb30a011 100644 --- a/Kubernetes/Traefik-PiHole/Manifest/PiHole/default-headers.yaml +++ b/Kubernetes/Traefik-PiHole/Manifest/PiHole/default-headers.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: Middleware metadata: name: default-headers diff --git a/Kubernetes/Traefik-PiHole/Manifest/PiHole/ingress.yaml b/Kubernetes/Traefik-PiHole/Manifest/PiHole/ingress.yaml index dc7bc4ce..ae036349 100644 --- a/Kubernetes/Traefik-PiHole/Manifest/PiHole/ingress.yaml +++ b/Kubernetes/Traefik-PiHole/Manifest/PiHole/ingress.yaml @@ -1,5 +1,5 @@ --- -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: pihole diff --git a/Kubernetes/Traefik-PiHole/readme.md b/Kubernetes/Traefik-PiHole/readme.md index e87b0353..79094a21 100644 --- a/Kubernetes/Traefik-PiHole/readme.md +++ b/Kubernetes/Traefik-PiHole/readme.md @@ -2,3 +2,25 @@ Make sure that you watch the video instructions carefully as you need to amend the files correctly. YOU CANNOT JUST RUN THIS SCRIPT! Incorrect use can result in you being locked out of Lets Encrypt for a period of time. + +# NOTE FOR TRAEFIK v3 # +Many guides out there (including, until recently, this repo) reference an older version of the Kubernetes CRDs API group. +This older version is [deprecated](https://doc.traefik.io/traefik/master/migration/v2-to-v3/#kubernetes-crds-api-group-traefikcontainous) +as of Traefik v3 (released [29 April 2024](https://github.com/traefik/traefik/releases/tag/v3.0.0)) and must be updated to the new version +in your IngressRoute, Middleware, ServersTransport, etc. yaml manifests for Traefik. Any resources with the deprecated version will not +be recognized by Traefik v3. + +Old, deprecated version: +```yaml +apiVersion: traefik.containo.us/v1alpha1 +``` + +New, supported version: +```yaml +apiVersion: traefik.io/v1alpha1 +``` +This new version is also supported in later releases of Traefik v2, so you can update your Traefik-related manifests +to the new version and apply the updated manifests before upgrading your Traefik deployment. + +It may be worth reviewing other v2 to v3 migration notes provided by Traefik: +[Traefik v2 to v3 Migration](https://doc.traefik.io/traefik/master/migration/v2-to-v3/) diff --git a/Unifi-Controller/kubernetes/ingress.yaml b/Unifi-Controller/kubernetes/ingress.yaml index 171cf642..bfe8728b 100644 --- a/Unifi-Controller/kubernetes/ingress.yaml +++ b/Unifi-Controller/kubernetes/ingress.yaml @@ -1,5 +1,5 @@ --- -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: Middleware metadata: name: default-headers @@ -16,7 +16,7 @@ spec: customRequestHeaders: X-Forwarded-Proto: https --- -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: unifi-controller