From f8abb4747c149bce7d6eb30f5082a1080705edbd Mon Sep 17 00:00:00 2001
From: Finn <finn@janky.solutions>
Date: Sat, 29 Mar 2025 02:03:01 -0700
Subject: [PATCH] handle effects of surprise traefik upgrade

---
 k8s/keycloak/ingress.yaml                          | 2 +-
 k8s/matrix/janky.solutions-homeserver.yaml         | 2 +-
 k8s/system/traefik-forward-auth-herzfeld-casa.yaml | 2 +-
 k8s/system/traefik-forward-auth.yaml               | 2 +-
 k8s/system/traefik-helm-chart.yaml                 | 2 ++
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/k8s/keycloak/ingress.yaml b/k8s/keycloak/ingress.yaml
index d6df643..7a3fbac 100644
--- a/k8s/keycloak/ingress.yaml
+++ b/k8s/keycloak/ingress.yaml
@@ -1,4 +1,4 @@
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: ServersTransport
 metadata:
   name: keycloak-frontend
diff --git a/k8s/matrix/janky.solutions-homeserver.yaml b/k8s/matrix/janky.solutions-homeserver.yaml
index e5a703a..fc78775 100644
--- a/k8s/matrix/janky.solutions-homeserver.yaml
+++ b/k8s/matrix/janky.solutions-homeserver.yaml
@@ -195,7 +195,7 @@ spec:
       name: homeserver-janky-solutions
       port: 8008
   - kind: Rule
-    match: Host(`matrix.janky.solutions`) && PathPrefix(`/_matrix/client/{version:.*}/{endpoint:(login|logout|refresh)}`)
+    match: Host(`matrix.janky.solutions`) && PathRegexp(`^/_matrix/client/.*/(login|logout|refresh)$`)
     services:
     - kind: Service
       name: mas-janky-solutions
diff --git a/k8s/system/traefik-forward-auth-herzfeld-casa.yaml b/k8s/system/traefik-forward-auth-herzfeld-casa.yaml
index 2cde181..0c5499c 100644
--- a/k8s/system/traefik-forward-auth-herzfeld-casa.yaml
+++ b/k8s/system/traefik-forward-auth-herzfeld-casa.yaml
@@ -50,7 +50,7 @@ spec:
   - name: auth-http
     port: 4181
 ---
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: traefik-forward-auth-herzfeld-casa
diff --git a/k8s/system/traefik-forward-auth.yaml b/k8s/system/traefik-forward-auth.yaml
index 4cf1c79..0ebd1ae 100644
--- a/k8s/system/traefik-forward-auth.yaml
+++ b/k8s/system/traefik-forward-auth.yaml
@@ -50,7 +50,7 @@ spec:
   - name: auth-http
     port: 4181
 ---
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: traefik-forward-auth
diff --git a/k8s/system/traefik-helm-chart.yaml b/k8s/system/traefik-helm-chart.yaml
index e685289..f274872 100644
--- a/k8s/system/traefik-helm-chart.yaml
+++ b/k8s/system/traefik-helm-chart.yaml
@@ -34,6 +34,8 @@ spec:
       kubernetesCRD:
         allowCrossNamespace: true
         allowExternalNameServices: true
+      kubernetesIngress:
+        allowExternalNameServices: true
     logs:
       access:
         enabled: true