From 01877d962f04bb6476f2759e1b2e2873d1a511be Mon Sep 17 00:00:00 2001 From: Seraphin- Date: Wed, 25 Dec 2024 19:58:51 -0800 Subject: [PATCH] Update traefik namespace for compatibility with v3 --- manifests/klodd-rbac.yaml | 2 +- packages/server/src/k8s/instance.js | 4 ++-- packages/server/src/k8s/manifest.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/manifests/klodd-rbac.yaml b/manifests/klodd-rbac.yaml index 10c9128..ace0c5f 100644 --- a/manifests/klodd-rbac.yaml +++ b/manifests/klodd-rbac.yaml @@ -15,7 +15,7 @@ rules: - apiGroups: [networking.k8s.io] resources: [networkpolicies] verbs: [create, delete] - - apiGroups: [traefik.containo.us] + - apiGroups: [traefik.io] resources: [ingressroutes, ingressroutetcps, middlewares, middlewaretcps] verbs: [create, delete] - apiGroups: [klodd.tjcsec.club] diff --git a/packages/server/src/k8s/instance.js b/packages/server/src/k8s/instance.js index 005e927..5abd8e8 100644 --- a/packages/server/src/k8s/instance.js +++ b/packages/server/src/k8s/instance.js @@ -163,7 +163,7 @@ export const createInstance = async (challengeId, teamId, log) => { challengeConfig.middlewares.map(makeMiddleware).map((middleware) => customApi .createNamespacedCustomObject( - 'traefik.containo.us', + 'traefik.io', 'v1alpha1', namespace, middlewarePlural, @@ -194,7 +194,7 @@ export const createInstance = async (challengeId, teamId, log) => { }) await customApi .createNamespacedCustomObject( - 'traefik.containo.us', + 'traefik.io', 'v1alpha1', namespace, ingressPlural, diff --git a/packages/server/src/k8s/manifest.js b/packages/server/src/k8s/manifest.js index 9bcb5ff..04a888a 100644 --- a/packages/server/src/k8s/manifest.js +++ b/packages/server/src/k8s/manifest.js @@ -160,7 +160,7 @@ export const makeServiceFactory = export const makeIngressRouteFactory = (kind) => ({ host, serviceName, servicePort, numMiddlewares }) => ({ - apiVersion: 'traefik.containo.us/v1alpha1', + apiVersion: 'traefik.io/v1alpha1', kind: kind === 'http' ? 'IngressRoute' : 'IngressRouteTCP', metadata: { name: 'ingress' }, spec: { @@ -190,7 +190,7 @@ export const makeIngressRouteFactory = }) export const makeMiddlewareFactory = (kind) => (middleware, idx) => ({ - apiVersion: 'traefik.containo.us/v1alpha1', + apiVersion: 'traefik.io/v1alpha1', kind: kind === 'http' ? 'Middleware' : 'MiddlewareTCP', metadata: { name: `middleware-${idx}` }, spec: middleware,