From f21f71786ad957558ed8f8400102b9512e8d5b9d Mon Sep 17 00:00:00 2001 From: Romain Date: Wed, 22 Dec 2021 17:22:04 +0100 Subject: [PATCH 1/3] Prepare release v2.5.6 --- CHANGELOG.md | 13 +++++++++++++ script/gcg/traefik-bugfix.toml | 6 +++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2a8b2d11..346d0af64 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +## [v2.5.6](https://github.com/traefik/traefik/tree/v2.5.6) (2021-12-22) +[All Commits](https://github.com/traefik/traefik/compare/v2.5.5...v2.5.6) + +**Bug fixes:** +- **[middleware]** Process all X-Forwarded-For headers in the request ([#8596](https://github.com/traefik/traefik/pull/8596) by [kevinpollet](https://github.com/kevinpollet)) +- **[plugins]** Update Yaegi to v0.11.2 ([#8650](https://github.com/traefik/traefik/pull/8650) by [ldez](https://github.com/ldez)) +- **[server]** Update golang.org/x/net dependency version ([#8635](https://github.com/traefik/traefik/pull/8635) by [kevinpollet](https://github.com/kevinpollet)) + +**Documentation:** +- **[api]** Add missing API endpoints documentation ([#8649](https://github.com/traefik/traefik/pull/8649) by [ichxxx](https://github.com/ichxxx)) +- **[middleware]** Fix passTLSClientCert CRD example name ([#8637](https://github.com/traefik/traefik/pull/8637) by [ddtmachado](https://github.com/ddtmachado)) +- **[middleware]** Correct documentation in middleware overview ([#8636](https://github.com/traefik/traefik/pull/8636) by [Alestrix](https://github.com/Alestrix)) + ## [v2.5.5](https://github.com/traefik/traefik/tree/v2.5.5) (2021-12-09) [All Commits](https://github.com/traefik/traefik/compare/v2.5.4...v2.5.5) diff --git a/script/gcg/traefik-bugfix.toml b/script/gcg/traefik-bugfix.toml index 66872588c..7518f2f8f 100644 --- a/script/gcg/traefik-bugfix.toml +++ b/script/gcg/traefik-bugfix.toml @@ -4,11 +4,11 @@ RepositoryName = "traefik" OutputType = "file" FileName = "traefik_changelog.md" -# example new bugfix v2.5.5 +# example new bugfix v2.5.6 CurrentRef = "v2.5" -PreviousRef = "v2.5.4" +PreviousRef = "v2.5.5" BaseBranch = "v2.5" -FutureCurrentRefName = "v2.5.5" +FutureCurrentRefName = "v2.5.6" ThresholdPreviousRef = 10 ThresholdCurrentRef = 10 From 2b5355c849cce23f3518a4c7af09bcff8e4c8b23 Mon Sep 17 00:00:00 2001 From: Tom Moulard Date: Thu, 23 Dec 2021 15:44:05 +0100 Subject: [PATCH 2/3] Update golangci-lint install script --- build.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.Dockerfile b/build.Dockerfile index 9564a95b6..b5a7ab552 100644 --- a/build.Dockerfile +++ b/build.Dockerfile @@ -19,7 +19,7 @@ RUN mkdir -p /usr/local/bin \ && chmod +x /usr/local/bin/go-bindata # Download golangci-lint binary to bin folder in $GOPATH -RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.43.0 +RUN curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | bash -s -- -b $GOPATH/bin v1.43.0 # Download misspell binary to bin folder in $GOPATH RUN curl -sfL https://raw.githubusercontent.com/client9/misspell/master/install-misspell.sh | bash -s -- -b $GOPATH/bin v0.3.4 From 5e2c9293227ce352123351084cd453e98c0eb14a Mon Sep 17 00:00:00 2001 From: Tom Moulard Date: Wed, 29 Dec 2021 15:06:04 +0100 Subject: [PATCH 3/3] Fix broken jaeger documentation link --- docs/content/observability/tracing/jaeger.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/observability/tracing/jaeger.md b/docs/content/observability/tracing/jaeger.md index cf98f0312..67681f60a 100644 --- a/docs/content/observability/tracing/jaeger.md +++ b/docs/content/observability/tracing/jaeger.md @@ -18,7 +18,7 @@ tracing: !!! warning Traefik is able to send data over the compact thrift protocol to the [Jaeger agent](https://www.jaegertracing.io/docs/deployment/#agent) - or a [Jaeger collector](https://www.jaegertracing.io/docs/deployment/#collectors). + or a [Jaeger collector](https://www.jaegertracing.io/docs/deployment/#collector). !!! info All Jaeger configuration can be overridden by [environment variables](https://github.com/jaegertracing/jaeger-client-go#environment-variables)