diff --git a/EXAMPLES.md b/EXAMPLES.md index fe1d9cbdd..75e4186cf 100644 --- a/EXAMPLES.md +++ b/EXAMPLES.md @@ -86,7 +86,7 @@ extraObjects: username: admin password: changeme - - apiVersion: traefik.containo.us/v1alpha1 + - apiVersion: traefik.io/v1alpha1 kind: Middleware metadata: name: traefik-dashboard-auth @@ -138,7 +138,7 @@ extraObjects: username: admin password: changeme - - apiVersion: traefik.containo.us/v1alpha1 + - apiVersion: traefik.io/v1alpha1 kind: Middleware metadata: name: traefik-dashboard-auth @@ -403,7 +403,7 @@ tlsStore: They should use websecure entrypoint like this: ```yaml -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: example-com-tls diff --git a/README.md b/README.md index 88680d1d1..eb912039e 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ helm repo update # See current Chart & Traefik version helm search repo traefik/traefik # Upgrade Traefik -helm upgrade --reuse-values traefik traefik/traefik +helm upgrade traefik traefik/traefik ``` New major version indicates that there is an incompatible breaking change. diff --git a/traefik/Changelog.md b/traefik/Changelog.md index e0ae9a9ed..da7c49bb2 100644 --- a/traefik/Changelog.md +++ b/traefik/Changelog.md @@ -1,10 +1,17 @@ # Change Log +## 23.0.0 ![AppVersion: v2.10.0](https://img.shields.io/static/v1?label=AppVersion&message=v2.10.0&color=success&logo=) ![Kubernetes: >=1.16.0-0](https://img.shields.io/static/v1?label=Kubernetes&message=%3E%3D1.16.0-0&color=informational&logo=kubernetes) ![Helm: v3](https://img.shields.io/static/v1?label=Helm&message=v3&color=informational&logo=helm) + +**Release date:** 2023-04-26 + +* BREAKING CHANGE: Traefik 2.10 comes with CRDs update on API Group + + ## 22.3.0 ![AppVersion: v2.10.0](https://img.shields.io/static/v1?label=AppVersion&message=v2.10.0&color=success&logo=) ![Kubernetes: >=1.16.0-0](https://img.shields.io/static/v1?label=Kubernetes&message=%3E%3D1.16.0-0&color=informational&logo=kubernetes) ![Helm: v3](https://img.shields.io/static/v1?label=Helm&message=v3&color=informational&logo=helm) **Release date:** 2023-04-25 -* release: ⬆️ Upgrade traefik Docker tag to v2.10.0 +* ⬆️ Upgrade traefik Docker tag to v2.10.0 * fix: 🐛 update rbac for both traefik.io and containo.us apigroups (#836) * breaking: 💥 update CRDs needed for Traefik v2.10 diff --git a/traefik/Chart.yaml b/traefik/Chart.yaml index 892fea154..9cfc315b4 100644 --- a/traefik/Chart.yaml +++ b/traefik/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: traefik description: A Traefik based Kubernetes ingress controller type: application -version: 22.3.0 +version: 23.0.0 # renovate: image=traefik appVersion: v2.10.0 kubeVersion: ">=1.16.0-0" @@ -28,6 +28,4 @@ maintainers: icon: https://raw.githubusercontent.com/traefik/traefik/v2.3/docs/content/assets/img/traefik.logo.png annotations: artifacthub.io/changes: | - - "release: ⬆️ Upgrade traefik Docker tag to v2.10.0" - - "fix: 🐛 update rbac for both traefik.io and containo.us apigroups (#836)" - - "breaking: 💥 update CRDs needed for Traefik v2.10" + - "BREAKING CHANGE: Traefik 2.10 comes with CRDs update on API Group" diff --git a/traefik/templates/_podtemplate.tpl b/traefik/templates/_podtemplate.tpl index dc922e6f6..cb332f6f0 100644 --- a/traefik/templates/_podtemplate.tpl +++ b/traefik/templates/_podtemplate.tpl @@ -637,7 +637,6 @@ {{- end }} {{- end }} {{- if .Values.hub.enabled }} - - "--experimental.hub" - "--hub" {{- if .Values.hub.tunnelPort }} - --entrypoints.traefikhub-tunl.address=:{{.Values.hub.tunnelPort}} diff --git a/traefik/templates/dashboard-ingressroute.yaml b/traefik/templates/dashboard-ingressroute.yaml index e583f3f23..055221991 100644 --- a/traefik/templates/dashboard-ingressroute.yaml +++ b/traefik/templates/dashboard-ingressroute.yaml @@ -1,5 +1,5 @@ {{- if .Values.ingressRoute.dashboard.enabled -}} -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: {{ template "traefik.fullname" . }}-dashboard diff --git a/traefik/templates/tlsoption.yaml b/traefik/templates/tlsoption.yaml index cd3919849..34c76b199 100644 --- a/traefik/templates/tlsoption.yaml +++ b/traefik/templates/tlsoption.yaml @@ -1,5 +1,5 @@ {{- range $name, $config := .Values.tlsOptions }} -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: TLSOption metadata: name: {{ $name }} diff --git a/traefik/templates/tlsstore.yaml b/traefik/templates/tlsstore.yaml index a74c0b9cd..88c8fb8ed 100644 --- a/traefik/templates/tlsstore.yaml +++ b/traefik/templates/tlsstore.yaml @@ -1,5 +1,5 @@ {{- range $name, $config := .Values.tlsStore }} -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: TLSStore metadata: name: {{ $name }} diff --git a/traefik/tests/hub-integration-config_test.yaml b/traefik/tests/hub-integration-config_test.yaml index bba544d86..179f482b0 100644 --- a/traefik/tests/hub-integration-config_test.yaml +++ b/traefik/tests/hub-integration-config_test.yaml @@ -22,9 +22,6 @@ tests: - contains: path: spec.template.spec.containers[0].args content: "--hub" - - contains: - path: spec.template.spec.containers[0].args - content: "--experimental.hub" - contains: path: spec.template.spec.containers[0].args content: "--metrics.prometheus.addRoutersLabels=true"