From c10f1a3a366ab67162aead49d518a5e281880451 Mon Sep 17 00:00:00 2001 From: ichx Date: Tue, 21 Dec 2021 21:48:05 +0800 Subject: [PATCH 1/7] Add missing API endpoints documentation --- docs/content/operations/api.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/content/operations/api.md b/docs/content/operations/api.md index 5b14c3e21..bf3872274 100644 --- a/docs/content/operations/api.md +++ b/docs/content/operations/api.md @@ -147,9 +147,16 @@ All the following endpoints must be accessed with a `GET` HTTP request. | `/api/tcp/routers/{name}` | Returns the information of the TCP router specified by `name`. | | `/api/tcp/services` | Lists all the TCP services information. | | `/api/tcp/services/{name}` | Returns the information of the TCP service specified by `name`. | +| `/api/tcp/middlewares` | Lists all the TCP middlewares information. | +| `/api/tcp/middlewares/{name}` | Returns the information of the TCP middleware specified by `name`. | +| `/api/udp/routers` | Lists all the UDP routers information. | +| `/api/udp/routers/{name}` | Returns the information of the UDP router specified by `name`. | +| `/api/udp/services` | Lists all the UDP services information. | +| `/api/udp/services/{name}` | Returns the information of the UDP service specified by `name`. | | `/api/entrypoints` | Lists all the entry points information. | | `/api/entrypoints/{name}` | Returns the information of the entry point specified by `name`. | | `/api/overview` | Returns statistic information about http and tcp as well as enabled features and providers. | +| `/api/rawdata` | Returns information about dynamic configurations, errors, status and dependency relations. | | `/api/version` | Returns information about Traefik version. | | `/debug/vars` | See the [expvar](https://golang.org/pkg/expvar/) Go documentation. | | `/debug/pprof/` | See the [pprof Index](https://golang.org/pkg/net/http/pprof/#Index) Go documentation. | From 98fc6ca44104c3681d773c2b6f4d7eeb47a1f089 Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Wed, 22 Dec 2021 09:24:05 +0100 Subject: [PATCH 2/7] Update Yaegi to v0.11.2 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 48645edc0..9e0edd9ad 100644 --- a/go.mod +++ b/go.mod @@ -62,7 +62,7 @@ require ( github.com/stvp/go-udp-testing v0.0.0-20191102171040-06b61409b154 github.com/tinylib/msgp v1.0.2 // indirect github.com/traefik/paerser v0.1.4 - github.com/traefik/yaegi v0.11.1 + github.com/traefik/yaegi v0.11.2 github.com/uber/jaeger-client-go v2.29.1+incompatible github.com/uber/jaeger-lib v2.2.0+incompatible github.com/unrolled/render v1.0.2 diff --git a/go.sum b/go.sum index b80b74dbd..bc8e037e1 100644 --- a/go.sum +++ b/go.sum @@ -1634,8 +1634,8 @@ github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305 h1:y/1cL5AL2oRcfz github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305/go.mod h1:gXOLibKqQTRAVuVZ9gX7G9Ykky8ll8yb4slxsEMoY0c= github.com/traefik/paerser v0.1.4 h1:/IXjV04Gf6di51H8Jl7jyS3OylsLjIasrwXIIwj1aT8= github.com/traefik/paerser v0.1.4/go.mod h1:FIdQ4Y92ulQUGSeZgxchtBKEcLw1o551PMNg9PoIq/4= -github.com/traefik/yaegi v0.11.1 h1:MJpYUnRc/wNOQcdywGd/q2mCznZAiAch1V+Ae+XFVzc= -github.com/traefik/yaegi v0.11.1/go.mod h1:RuCwD8/wsX7b6KoQHOaIFUfuH3gQIK4KWnFFmJMw5VA= +github.com/traefik/yaegi v0.11.2 h1:zosveTf5iIa60fAeQpaH4719b+bnlgsOvO7Nb/OTMTo= +github.com/traefik/yaegi v0.11.2/go.mod h1:RuCwD8/wsX7b6KoQHOaIFUfuH3gQIK4KWnFFmJMw5VA= github.com/transip/gotransip/v6 v6.6.1 h1:nsCU1ErZS5G0FeOpgGXc4FsWvBff9GPswSMggsC4564= github.com/transip/gotransip/v6 v6.6.1/go.mod h1:pQZ36hWWRahCUXkFWlx9Hs711gLd8J4qdgLdRzmtY+g= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926 h1:G3dpKMzFDjgEh2q1Z7zUUtKa8ViPtH+ocF0bE0g00O8= From a711f0d037b1c4e4eeaed38750391452148434a5 Mon Sep 17 00:00:00 2001 From: Tom Moulard Date: Wed, 22 Dec 2021 14:12:04 +0100 Subject: [PATCH 3/7] fix: update goreleaser install link to use gist --- .semaphore/semaphore.yml | 2 +- build.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 7592a1e81..e99dc4d99 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -26,7 +26,7 @@ global_job_config: - mkdir -vp "${SEMAPHORE_GIT_DIR}" "${GOPATH}/bin" - export GOPROXY=https://proxy.golang.org,direct - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "${GOPATH}/bin" v1.43.0 - - curl -sfL https://install.goreleaser.com/github.com/goreleaser/goreleaser.sh | bash -s -- -b "${GOPATH}/bin" + - curl -sSfL https://gist.githubusercontent.com/traefiker/6d7ac019c11d011e4f131bb2cca8900e/raw/goreleaser.sh | bash -s -- -b "${GOPATH}/bin" - go install github.com/containous/go-bindata/go-bindata@v1.0.0 - checkout - cache restore traefik-$(checksum go.sum) diff --git a/build.Dockerfile b/build.Dockerfile index 1ca6789ee..9564a95b6 100644 --- a/build.Dockerfile +++ b/build.Dockerfile @@ -25,7 +25,7 @@ RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.s RUN curl -sfL https://raw.githubusercontent.com/client9/misspell/master/install-misspell.sh | bash -s -- -b $GOPATH/bin v0.3.4 # Download goreleaser binary to bin folder in $GOPATH -RUN curl -sfL https://install.goreleaser.com/github.com/goreleaser/goreleaser.sh | sh +RUN curl -sfL https://gist.githubusercontent.com/traefiker/6d7ac019c11d011e4f131bb2cca8900e/raw/goreleaser.sh | sh WORKDIR /go/src/github.com/traefik/traefik From f21f71786ad957558ed8f8400102b9512e8d5b9d Mon Sep 17 00:00:00 2001 From: Romain Date: Wed, 22 Dec 2021 17:22:04 +0100 Subject: [PATCH 4/7] 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 5/7] 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 6/7] 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) From 48ce6c32c1e044d509c9e27cae09be51ba6b6eac Mon Sep 17 00:00:00 2001 From: Tom Moulard Date: Wed, 29 Dec 2021 17:32:06 +0100 Subject: [PATCH 7/7] Remove go-bindata from semaphore --- .semaphore/semaphore.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index dc91c42d3..9c66efc4f 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -27,7 +27,6 @@ global_job_config: - export GOPROXY=https://proxy.golang.org,direct - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "${GOPATH}/bin" v1.43.0 - curl -sSfL https://gist.githubusercontent.com/traefiker/6d7ac019c11d011e4f131bb2cca8900e/raw/goreleaser.sh | bash -s -- -b "${GOPATH}/bin" - - go install github.com/containous/go-bindata/go-bindata@v1.0.0 - checkout - cache restore traefik-$(checksum go.sum)