Skip to content

Commit 7875826

Browse files
ldezldez
committed
Merge branch v2.10 into v3.0
2 parents 7c2af10 + 358f474 commit 7875826

File tree

387 files changed

+19080
-976
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

387 files changed

+19080
-976
lines changed

‎.github/workflows/build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- '*'
77

88
env:
9-
GO_VERSION: 1.19
9+
GO_VERSION: '1.20'
1010
CGO_ENABLED: 0
1111
IN_DOCKER: ""
1212

‎.github/workflows/check_doc.yml

+4
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,7 @@ jobs:
1919

2020
- name: Check documentation
2121
run: make docs-pull-images docs
22+
env:
23+
# These variables are not passed to workflows that are triggered by a pull request from a fork.
24+
DOCS_VERIFY_SKIP: ${{ vars.DOCS_VERIFY_SKIP }}
25+
DOCS_LINT_SKIP: ${{ vars.DOCS_LINT_SKIP }}

‎.github/workflows/documentation.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- name: Build documentation
4242
run: $HOME/bin/structor -o traefik -r traefik --dockerfile-url="https://raw.githubusercontent.com/traefik/traefik/v1.7/docs.Dockerfile" --menu.js-url="https://raw.githubusercontent.com/traefik/structor/master/traefik-menu.js.gotmpl" --rqts-url="https://raw.githubusercontent.com/traefik/structor/master/requirements-override.txt" --force-edit-url --exp-branch=master --debug
4343
env:
44-
STRUCTOR_LATEST_TAG: ${{ secrets.STRUCTOR_LATEST_TAG }}
44+
STRUCTOR_LATEST_TAG: ${{ vars.STRUCTOR_LATEST_TAG }}
4545

4646
- name: Apply seo
4747
run: $HOME/bin/seo -path=./site -product=traefik

‎.github/workflows/test-unit.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- '*'
77

88
env:
9-
GO_VERSION: 1.19
9+
GO_VERSION: '1.20'
1010
IN_DOCKER: ""
1111

1212
jobs:

‎.github/workflows/validate.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ on:
66
- '*'
77

88
env:
9-
GO_VERSION: 1.19
10-
GOLANGCI_LINT_VERSION: v1.50.0
9+
GO_VERSION: '1.20'
10+
GOLANGCI_LINT_VERSION: v1.51.2
1111
MISSSPELL_VERSION: v0.4.0
1212
IN_DOCKER: ""
1313

‎.semaphore/semaphore.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ global_job_config:
1919
prologue:
2020
commands:
2121
- curl -sSfL https://raw.githubusercontent.com/ldez/semgo/master/godownloader.sh | sudo sh -s -- -b "/usr/local/bin"
22-
- sudo semgo go1.19
22+
- sudo semgo go1.20
2323
- export "GOPATH=$(go env GOPATH)"
2424
- export "SEMAPHORE_GIT_DIR=${GOPATH}/src/github.com/traefik/${SEMAPHORE_PROJECT_NAME}"
2525
- export "PATH=${GOPATH}/bin:${PATH}"

‎CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## [v2.9.8](https://github.com/traefik/traefik/tree/v2.9.8) (2023-02-15)
2+
[All Commits](https://github.com/traefik/traefik/compare/v2.9.7...v2.9.8)
3+
4+
**Bug fixes:**
5+
- **[server]** Update golang.org/x/net to v0.7.0 ([#9716](https://github.com/traefik/traefik/pull/9716) by [ldez](https://github.com/ldez))
6+
17
## [v2.9.7](https://github.com/traefik/traefik/tree/v2.9.7) (2023-02-14)
28
[All Commits](https://github.com/traefik/traefik/compare/v2.9.6...v2.9.7)
39

‎build.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.19-alpine
1+
FROM golang:1.20-alpine
22

33
RUN apk --no-cache --no-progress add git mercurial bash gcc musl-dev curl tar ca-certificates tzdata \
44
&& update-ca-certificates \

‎cmd/traefik/traefik.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ func setupServer(staticConfiguration *static.Configuration) (*server.Server, err
297297
tlsManager.UpdateConfigs(ctx, conf.TLS.Stores, conf.TLS.Options, conf.TLS.Certificates)
298298

299299
gauge := metricsRegistry.TLSCertsNotAfterTimestampGauge()
300-
for _, certificate := range tlsManager.GetCertificates() {
300+
for _, certificate := range tlsManager.GetServerCertificates() {
301301
appendCertMetric(gauge, certificate)
302302
}
303303
})

‎docs/content/deprecation/features.md

+14-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,17 @@
22

33
This page is maintained and updated periodically to reflect our roadmap and any decisions around feature deprecation.
44

5-
There is no feature deprecation in Traefik v3 for now.
5+
| Feature | Deprecated | End of Support | Removal |
6+
|-----------------------------------------------------------------------------------------------------|------------|----------------|---------|
7+
| [Kubernetes CRDs API Group `traefik.containo.us`](#kubernetes-crds-api-group-traefikcontainous) | 2.10 | N/A | 3.0 |
8+
| [Kubernetes CRDs API Version `traefik.io/v1alpha1`](#kubernetes-crds-api-version-traefikiov1alpha1) | N/A | N/A | 3.0 |
9+
10+
## Impact
11+
12+
### Kubernetes CRDs API Group `traefik.containo.us`
13+
14+
In v2.10, the Kubernetes CRDs API Group `traefik.containo.us` is deprecated, and its support will end starting with Traefik v3. Please use the API Group `traefik.io` instead.
15+
16+
### Kubernetes CRDs API Version `traefik.io/v1alpha1`
17+
18+
The newly introduced Kubernetes CRD API Version `traefik.io/v1alpha1` will subsequently be removed in Traefik v3. The following version will be `traefik.io/v1`.

‎docs/content/getting-started/install-traefik.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ by defining and applying an IngressRoute CRD (`kubectl apply -f dashboard.yaml`)
121121

122122
```yaml
123123
# dashboard.yaml
124-
apiVersion: traefik.containo.us/v1alpha1
124+
apiVersion: traefik.io/v1alpha1
125125
kind: IngressRoute
126126
metadata:
127127
name: dashboard

‎docs/content/https/include-acme-multiple-domains-example.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ deploy:
2222
```
2323
2424
```yaml tab="Kubernetes"
25-
apiVersion: traefik.containo.us/v1alpha1
25+
apiVersion: traefik.io/v1alpha1
2626
kind: IngressRoute
2727
metadata:
2828
name: blogtls

‎docs/content/https/include-acme-multiple-domains-from-rule-example.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ deploy:
1818
```
1919
2020
```yaml tab="Kubernetes"
21-
apiVersion: traefik.containo.us/v1alpha1
21+
apiVersion: traefik.io/v1alpha1
2222
kind: IngressRoute
2323
metadata:
2424
name: blogtls

‎docs/content/https/include-acme-single-domain-example.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ deploy:
1818
```
1919
2020
```yaml tab="Kubernetes"
21-
apiVersion: traefik.containo.us/v1alpha1
21+
apiVersion: traefik.io/v1alpha1
2222
kind: IngressRoute
2323
metadata:
2424
name: blogtls

‎docs/content/https/tailscale.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ A certificate resolver requests certificates for a set of domain names inferred
103103
```
104104

105105
```yaml tab="Kubernetes"
106-
apiVersion: traefik.containo.us/v1alpha1
106+
apiVersion: traefik.io/v1alpha1
107107
kind: IngressRoute
108108
metadata:
109109
name: blogtls
@@ -159,7 +159,7 @@ A certificate resolver requests certificates for a set of domain names inferred
159159
```
160160

161161
```yaml tab="Kubernetes"
162-
apiVersion: traefik.containo.us/v1alpha1
162+
apiVersion: traefik.io/v1alpha1
163163
kind: IngressRoute
164164
metadata:
165165
name: blogtls

‎docs/content/https/tls.md

+11-11
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ tls:
134134
```
135135

136136
```yaml tab="Kubernetes"
137-
apiVersion: traefik.containo.us/v1alpha1
137+
apiVersion: traefik.io/v1alpha1
138138
kind: TLSStore
139139
metadata:
140140
name: default
@@ -195,7 +195,7 @@ tls:
195195
```
196196

197197
```yaml tab="Kubernetes"
198-
apiVersion: traefik.containo.us/v1alpha1
198+
apiVersion: traefik.io/v1alpha1
199199
kind: TLSStore
200200
metadata:
201201
name: default
@@ -269,7 +269,7 @@ tls:
269269
```
270270

271271
```yaml tab="Kubernetes"
272-
apiVersion: traefik.containo.us/v1alpha1
272+
apiVersion: traefik.io/v1alpha1
273273
kind: TLSOption
274274
metadata:
275275
name: default
@@ -279,7 +279,7 @@ spec:
279279
minVersion: VersionTLS12
280280
281281
---
282-
apiVersion: traefik.containo.us/v1alpha1
282+
apiVersion: traefik.io/v1alpha1
283283
kind: TLSOption
284284
metadata:
285285
name: mintls13
@@ -320,7 +320,7 @@ tls:
320320
```
321321

322322
```yaml tab="Kubernetes"
323-
apiVersion: traefik.containo.us/v1alpha1
323+
apiVersion: traefik.io/v1alpha1
324324
kind: TLSOption
325325
metadata:
326326
name: default
@@ -330,7 +330,7 @@ spec:
330330
maxVersion: VersionTLS13
331331
332332
---
333-
apiVersion: traefik.containo.us/v1alpha1
333+
apiVersion: traefik.io/v1alpha1
334334
kind: TLSOption
335335
metadata:
336336
name: maxtls12
@@ -365,7 +365,7 @@ tls:
365365
```
366366

367367
```yaml tab="Kubernetes"
368-
apiVersion: traefik.containo.us/v1alpha1
368+
apiVersion: traefik.io/v1alpha1
369369
kind: TLSOption
370370
metadata:
371371
name: default
@@ -410,7 +410,7 @@ tls:
410410
```
411411

412412
```yaml tab="Kubernetes"
413-
apiVersion: traefik.containo.us/v1alpha1
413+
apiVersion: traefik.io/v1alpha1
414414
kind: TLSOption
415415
metadata:
416416
name: default
@@ -446,7 +446,7 @@ tls:
446446
```
447447

448448
```yaml tab="Kubernetes"
449-
apiVersion: traefik.containo.us/v1alpha1
449+
apiVersion: traefik.io/v1alpha1
450450
kind: TLSOption
451451
metadata:
452452
name: default
@@ -485,7 +485,7 @@ tls:
485485
```
486486

487487
```yaml tab="Kubernetes"
488-
apiVersion: traefik.containo.us/v1alpha1
488+
apiVersion: traefik.io/v1alpha1
489489
kind: TLSOption
490490
metadata:
491491
name: default
@@ -537,7 +537,7 @@ tls:
537537
```
538538

539539
```yaml tab="Kubernetes"
540-
apiVersion: traefik.containo.us/v1alpha1
540+
apiVersion: traefik.io/v1alpha1
541541
kind: TLSOption
542542
metadata:
543543
name: default

‎docs/content/middlewares/http/addprefix.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ labels:
2222
2323
```yaml tab="Kubernetes"
2424
# Prefixing with /foo
25-
apiVersion: traefik.containo.us/v1alpha1
25+
apiVersion: traefik.io/v1alpha1
2626
kind: Middleware
2727
metadata:
2828
name: add-foo

‎docs/content/middlewares/http/basicauth.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ labels:
2828
2929
```yaml tab="Kubernetes"
3030
# Declaring the user list
31-
apiVersion: traefik.containo.us/v1alpha1
31+
apiVersion: traefik.io/v1alpha1
3232
kind: Middleware
3333
metadata:
3434
name: test-auth
@@ -102,7 +102,7 @@ labels:
102102
103103
```yaml tab="Kubernetes"
104104
# Declaring the user list
105-
apiVersion: traefik.containo.us/v1alpha1
105+
apiVersion: traefik.io/v1alpha1
106106
kind: Middleware
107107
metadata:
108108
name: test-auth
@@ -183,7 +183,7 @@ labels:
183183
```
184184
185185
```yaml tab="Kubernetes"
186-
apiVersion: traefik.containo.us/v1alpha1
186+
apiVersion: traefik.io/v1alpha1
187187
kind: Middleware
188188
metadata:
189189
name: test-auth
@@ -239,7 +239,7 @@ labels:
239239
```
240240
241241
```yaml tab="Kubernetes"
242-
apiVersion: traefik.containo.us/v1alpha1
242+
apiVersion: traefik.io/v1alpha1
243243
kind: Middleware
244244
metadata:
245245
name: test-auth
@@ -276,7 +276,7 @@ labels:
276276
```
277277
278278
```yaml tab="Kubernetes"
279-
apiVersion: traefik.containo.us/v1alpha1
279+
apiVersion: traefik.io/v1alpha1
280280
kind: Middleware
281281
metadata:
282282
name: my-auth
@@ -315,7 +315,7 @@ labels:
315315
```
316316
317317
```yaml tab="Kubernetes"
318-
apiVersion: traefik.containo.us/v1alpha1
318+
apiVersion: traefik.io/v1alpha1
319319
kind: Middleware
320320
metadata:
321321
name: test-auth

‎docs/content/middlewares/http/buffering.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ labels:
2626
2727
```yaml tab="Kubernetes"
2828
# Sets the maximum request body to 2MB
29-
apiVersion: traefik.containo.us/v1alpha1
29+
apiVersion: traefik.io/v1alpha1
3030
kind: Middleware
3131
metadata:
3232
name: limit
@@ -72,7 +72,7 @@ labels:
7272
```
7373
7474
```yaml tab="Kubernetes"
75-
apiVersion: traefik.containo.us/v1alpha1
75+
apiVersion: traefik.io/v1alpha1
7676
kind: Middleware
7777
metadata:
7878
name: limit
@@ -111,7 +111,7 @@ labels:
111111
```
112112
113113
```yaml tab="Kubernetes"
114-
apiVersion: traefik.containo.us/v1alpha1
114+
apiVersion: traefik.io/v1alpha1
115115
kind: Middleware
116116
metadata:
117117
name: limit
@@ -152,7 +152,7 @@ labels:
152152
```
153153
154154
```yaml tab="Kubernetes"
155-
apiVersion: traefik.containo.us/v1alpha1
155+
apiVersion: traefik.io/v1alpha1
156156
kind: Middleware
157157
metadata:
158158
name: limit
@@ -191,7 +191,7 @@ labels:
191191
```
192192
193193
```yaml tab="Kubernetes"
194-
apiVersion: traefik.containo.us/v1alpha1
194+
apiVersion: traefik.io/v1alpha1
195195
kind: Middleware
196196
metadata:
197197
name: limit
@@ -232,7 +232,7 @@ You can have the Buffering middleware replay the request using `retryExpression`
232232
```
233233

234234
```yaml tab="Kubernetes"
235-
apiVersion: traefik.containo.us/v1alpha1
235+
apiVersion: traefik.io/v1alpha1
236236
kind: Middleware
237237
metadata:
238238
name: limit

0 commit comments

Comments
 (0)