Skip to content

Commit 3805149

Browse files
tomMoulardtomMoulard
committedSep 23, 2021
Merge current v2.5 into master
2 parents 07a3c37 + 61ceb7a commit 3805149

35 files changed

+772
-160
lines changed
 

‎.github/workflows/validate.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
env:
99
GO_VERSION: 1.17
10-
GOLANGCI_LINT_VERSION: v1.41.1
10+
GOLANGCI_LINT_VERSION: v1.42.1
1111
MISSSPELL_VERSION: v0.3.4
1212
PRE_TARGET: ""
1313

‎.golangci.toml

-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
[linters-settings.gocyclo]
1717
min-complexity = 14.0
1818

19-
[linters-settings.maligned]
20-
suggest-new = true
21-
2219
[linters-settings.goconst]
2320
min-len = 3.0
2421
min-occurrences = 4.0

‎.semaphore/semaphore.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ global_job_config:
2525
- export "PATH=${GOPATH}/bin:${PATH}"
2626
- mkdir -vp "${SEMAPHORE_GIT_DIR}" "${GOPATH}/bin"
2727
- export GOPROXY=https://proxy.golang.org,direct
28-
- curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "${GOPATH}/bin" v1.41.1
28+
- curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "${GOPATH}/bin" v1.42.1
2929
- curl -sfL https://install.goreleaser.com/github.com/goreleaser/goreleaser.sh | bash -s -- -b "${GOPATH}/bin"
3030
- checkout
3131
- cache restore traefik-$(checksum go.sum)

‎CHANGELOG.md

+18
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
## [v2.5.3](https://github.com/traefik/traefik/tree/v2.5.3) (2021-09-20)
2+
[All Commits](https://github.com/traefik/traefik/compare/v2.5.2...v2.5.3)
3+
4+
**Bug fixes:**
5+
- **[consulcatalog]** Fix certChan defaulting on consul catalog provider ([#8439](https://github.com/traefik/traefik/pull/8439) by [tomMoulard](https://github.com/tomMoulard))
6+
- **[k8s/crd,k8s]** Fix peerCertURI config for k8s crd provider ([#8454](https://github.com/traefik/traefik/pull/8454) by [kevinpollet](https://github.com/kevinpollet))
7+
- **[k8s/crd,k8s]** Ensure disableHTTP2 works with k8s crd ([#8448](https://github.com/traefik/traefik/pull/8448) by [ssboisen](https://github.com/ssboisen))
8+
- **[k8s/crd,k8s]** Fix ServersTransport reference from IngressRoute service definition ([#8431](https://github.com/traefik/traefik/pull/8431) by [rtribotte](https://github.com/rtribotte))
9+
- **[k8s/crd,k8s]** Add cross namespace verification in Kubernetes CRD ([#8422](https://github.com/traefik/traefik/pull/8422) by [tomMoulard](https://github.com/tomMoulard))
10+
- **[metrics]** Fix Prometheus router's metrics ([#8425](https://github.com/traefik/traefik/pull/8425) by [tomMoulard](https://github.com/tomMoulard))
11+
- **[plugins]** Update yaegi to v0.10.0 ([#8452](https://github.com/traefik/traefik/pull/8452) by [ldez](https://github.com/ldez))
12+
13+
**Documentation:**
14+
- **[middleware,file]** Fix TCP middleware whitelist example ([#8421](https://github.com/traefik/traefik/pull/8421) by [tribal2](https://github.com/tribal2))
15+
- **[middleware]** Add default proxy headers list ([#8418](https://github.com/traefik/traefik/pull/8418) by [aaronraff](https://github.com/aaronraff))
16+
- Add Tom Moulard in maintainers team ([#8442](https://github.com/traefik/traefik/pull/8442) by [jbdoumenjou](https://github.com/jbdoumenjou))
17+
- Fix golang doc URLs ([#8434](https://github.com/traefik/traefik/pull/8434) by [jbdoumenjou](https://github.com/jbdoumenjou))
18+
119
## [v2.5.2](https://github.com/traefik/traefik/tree/v2.5.2) (2021-09-02)
220
[All Commits](https://github.com/traefik/traefik/compare/v2.5.1...v2.5.2)
321

‎build.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN mkdir -p /usr/local/bin \
1414
| tar -xzC /usr/local/bin --transform 's#^.+/##x'
1515

1616
# Download golangci-lint binary to bin folder in $GOPATH
17-
RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.41.1
17+
RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.42.1
1818

1919
# Download misspell binary to bin folder in $GOPATH
2020
RUN curl -sfL https://raw.githubusercontent.com/client9/misspell/master/install-misspell.sh | bash -s -- -b $GOPATH/bin v0.3.4

‎cmd/internal/gen/centrifuge.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ type fileWriter struct {
258258
}
259259

260260
func (f fileWriter) Write(files map[string]*File) error {
261-
err := os.MkdirAll(f.baseDir, 0755)
261+
err := os.MkdirAll(f.baseDir, 0o755)
262262
if err != nil {
263263
return err
264264
}

‎cmd/internal/gen/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func run(dest string) error {
8383
return err
8484
}
8585

86-
return ioutil.WriteFile(filepath.Join(dest, "marshaler.go"), []byte(fmt.Sprintf(marsh, destPkg)), 0666)
86+
return ioutil.WriteFile(filepath.Join(dest, "marshaler.go"), []byte(fmt.Sprintf(marsh, destPkg)), 0o666)
8787
}
8888

8989
func cleanType(typ types.Type, base string) string {

‎docs/content/contributing/maintainers.md

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
* Romain Tribotté [@rtribotte](https://github.com/rtribotte)
2020
* Kevin Pollet [@kevinpollet](https://github.com/kevinpollet)
2121
* Harold Ozouf [@jspdown](https://github.com/jspdown)
22+
* Tom Moulard [@tommoulard](https://github.com/tommoulard)
2223

2324
## Maintainer's Guidelines
2425

‎docs/content/getting-started/faq.md

+16-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ http:
125125
the principle of the above example above (a catchall router) still stands,
126126
but the `unavailable` service should be adapted to fit such a need.
127127

128-
## Why Is My TLS Certificate Not Reloaded When Its Contents Change ?
128+
## Why Is My TLS Certificate Not Reloaded When Its Contents Change?
129129

130130
With the file provider,
131131
a configuration update is only triggered when one of the [watched](../providers/file.md#provider-configuration) configuration files is modified.
@@ -137,3 +137,18 @@ a configuration update is _not_ triggered.
137137
To take into account the new certificate contents, the update of the dynamic configuration must be forced.
138138
One way to achieve that, is to trigger a file notification,
139139
for example, by using the `touch` command on the configuration file.
140+
141+
## What Are the Forwarded Headers When Proxying HTTP Requests?
142+
143+
By default, the following headers are automatically added when proxying requests:
144+
145+
| Property | HTTP Header |
146+
|---------------------------|----------------------------|
147+
| Client's IP | X-Forwarded-For, X-Real-Ip |
148+
| Host | X-Forwarded-Host |
149+
| Port | X-Forwarded-Port |
150+
| Protocol | X-Forwarded-Proto |
151+
| Proxy Server's Hostname | X-Forwarded-Server |
152+
153+
For more details,
154+
please check out the [forwarded header](../routing/entrypoints.md#forwarded-headers) documentation.

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

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ Managing Request/Response headers
77

88
The Headers middleware manages the headers of requests and responses.
99

10+
A set of forwarded headers are automatically added by default. See the [FAQ](../../getting-started/faq.md#what-are-the-forwarded-headers-when-proxying-http-requests) for more information.
11+
1012
## Configuration Examples
1113

1214
### Adding Headers to the Request and the Response

0 commit comments

Comments
 (0)