From 28291d42d8b1b00d4a54cf05579ac36ffd129c28 Mon Sep 17 00:00:00 2001 From: Sanskar Jaiswal Date: Fri, 10 Oct 2025 23:15:43 +0530 Subject: [PATCH 1/2] fix: update traefik.containo.us to traefik.io Signed-off-by: Sanskar Jaiswal Co-authored-by: Ashton Pillay --- charts/flagger/templates/rbac.yaml | 2 +- docs/gitbook/tutorials/traefik-progressive-delivery.md | 4 ++-- pkg/apis/traefik/register.go | 2 +- pkg/apis/traefik/v1alpha1/doc.go | 2 +- .../versioned/typed/traefik/v1alpha1/traefik_client.go | 2 +- pkg/client/informers/externalversions/generic.go | 2 +- test/traefik/test-canary.sh | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/charts/flagger/templates/rbac.yaml b/charts/flagger/templates/rbac.yaml index cfb07ef2f..8e833c6cd 100644 --- a/charts/flagger/templates/rbac.yaml +++ b/charts/flagger/templates/rbac.yaml @@ -197,7 +197,7 @@ rules: - patch - delete - apiGroups: - - traefik.containo.us + - traefik.io resources: - traefikservices verbs: diff --git a/docs/gitbook/tutorials/traefik-progressive-delivery.md b/docs/gitbook/tutorials/traefik-progressive-delivery.md index 410333a3c..e1b7e8548 100644 --- a/docs/gitbook/tutorials/traefik-progressive-delivery.md +++ b/docs/gitbook/tutorials/traefik-progressive-delivery.md @@ -63,7 +63,7 @@ helm upgrade -i flagger-loadtester flagger/loadtester \ Create Traefik IngressRoute that references TraefikService generated by Flagger \(replace `app.example.com` with your own domain\): ```yaml -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: podinfo @@ -177,7 +177,7 @@ horizontalpodautoscaler.autoscaling/podinfo-primary service/podinfo service/podinfo-canary service/podinfo-primary -traefikservice.traefik.containo.us/podinfo +traefikservice.traefik.io/podinfo ``` ## Automated canary promotion diff --git a/pkg/apis/traefik/register.go b/pkg/apis/traefik/register.go index d5c31e73e..2d47c2757 100644 --- a/pkg/apis/traefik/register.go +++ b/pkg/apis/traefik/register.go @@ -1,5 +1,5 @@ package traefik const ( - GroupName = "traefik.containo.us" + GroupName = "traefik.io" ) diff --git a/pkg/apis/traefik/v1alpha1/doc.go b/pkg/apis/traefik/v1alpha1/doc.go index 71b5219b4..529a776cb 100644 --- a/pkg/apis/traefik/v1alpha1/doc.go +++ b/pkg/apis/traefik/v1alpha1/doc.go @@ -1,5 +1,5 @@ // +k8s:deepcopy-gen=package // Package v1alpha1 is the v1alpha1 version of the API. -// +groupName=traefik.containo.us +// +groupName=traefik.io package v1alpha1 diff --git a/pkg/client/clientset/versioned/typed/traefik/v1alpha1/traefik_client.go b/pkg/client/clientset/versioned/typed/traefik/v1alpha1/traefik_client.go index 98362741d..462dfeba2 100644 --- a/pkg/client/clientset/versioned/typed/traefik/v1alpha1/traefik_client.go +++ b/pkg/client/clientset/versioned/typed/traefik/v1alpha1/traefik_client.go @@ -31,7 +31,7 @@ type TraefikV1alpha1Interface interface { TraefikServicesGetter } -// TraefikV1alpha1Client is used to interact with features provided by the traefik.containo.us group. +// TraefikV1alpha1Client is used to interact with features provided by the traefik.io group. type TraefikV1alpha1Client struct { restClient rest.Interface } diff --git a/pkg/client/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go index 78431793a..0e2249ae0 100644 --- a/pkg/client/informers/externalversions/generic.go +++ b/pkg/client/informers/externalversions/generic.go @@ -141,7 +141,7 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource case v1alpha3.SchemeGroupVersion.WithResource("trafficsplits"): return &genericInformer{resource: resource.GroupResource(), informer: f.Split().V1alpha3().TrafficSplits().Informer()}, nil - // Group=traefik.containo.us, Version=v1alpha1 + // Group=traefik.io, Version=v1alpha1 case traefikv1alpha1.SchemeGroupVersion.WithResource("traefikservices"): return &genericInformer{resource: resource.GroupResource(), informer: f.Traefik().V1alpha1().TraefikServices().Informer()}, nil diff --git a/test/traefik/test-canary.sh b/test/traefik/test-canary.sh index 5ac3c57bb..43f3f3fbf 100755 --- a/test/traefik/test-canary.sh +++ b/test/traefik/test-canary.sh @@ -8,7 +8,7 @@ set -o errexit REPO_ROOT=$(git rev-parse --show-toplevel) cat < Date: Fri, 10 Oct 2025 23:18:23 +0530 Subject: [PATCH 2/2] fix: Upgraded traefik helm version for testing Signed-off-by: Sanskar Jaiswal Co-authored-by: Ashton Pillay --- test/traefik/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/traefik/install.sh b/test/traefik/install.sh index 636d23fe1..17bea4fb5 100755 --- a/test/traefik/install.sh +++ b/test/traefik/install.sh @@ -2,7 +2,7 @@ set -o errexit -TRAEFIK_CHART_VERSION="24.0.0" # traefik 2.10.4 +TRAEFIK_CHART_VERSION="34.4.1" # traefik 2.10.4 REPO_ROOT=$(git rev-parse --show-toplevel) mkdir -p ${REPO_ROOT}/bin