From 615dc7fd355f2624618c25e43f43356713f634dc Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Fri, 23 Sep 2022 16:22:38 +0200 Subject: [PATCH 1/6] Prepare release v2.8.7 --- .goreleaser.yml | 2 ++ CHANGELOG.md | 9 +++++++-- script/gcg/traefik-bugfix.toml | 6 +++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index b46259a56..27bc16cd2 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -40,6 +40,8 @@ builds: goarch: arm64 - goos: freebsd goarch: arm64 + - goos: windows + goarch: arm changelog: skip: true diff --git a/CHANGELOG.md b/CHANGELOG.md index fc0af112d..64fe438bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ -## [v2.8.6](https://github.com/traefik/traefik/tree/v2.8.6) (2022-09-23) -[All Commits](https://github.com/traefik/traefik/compare/v2.8.5...v2.8.6) +## [v2.8.7](https://github.com/traefik/traefik/tree/v2.8.7) (2022-09-23) +[All Commits](https://github.com/traefik/traefik/compare/v2.8.5...v2.8.7) **Bug fixes:** - **[consulcatalog]** Fix UDP loadbalancer tags not being used with Consul Catalog ([#9357](https://github.com/traefik/traefik/pull/9357) by [t3hchipmunk](https://github.com/t3hchipmunk)) @@ -14,6 +14,11 @@ - Add documentation for json schema usage to validate config in the FAQ ([#9340](https://github.com/traefik/traefik/pull/9340) by [rtribotte](https://github.com/rtribotte)) - Add a note on case insensitive regex matching ([#9322](https://github.com/traefik/traefik/pull/9322) by [NEwa-05](https://github.com/NEwa-05)) +## [v2.8.6](https://github.com/traefik/traefik/tree/v2.8.6) (2022-09-23) +[All Commits](https://github.com/traefik/traefik/compare/v2.8.5...v2.8.6) + +Release canceled. + ## [v2.8.5](https://github.com/traefik/traefik/tree/v2.8.5) (2022-09-13) [All Commits](https://github.com/traefik/traefik/compare/v2.8.4...v2.8.5) diff --git a/script/gcg/traefik-bugfix.toml b/script/gcg/traefik-bugfix.toml index f0548583e..d9e8c084a 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.8.6 +# example new bugfix v2.8.7 CurrentRef = "v2.8" -PreviousRef = "v2.8.5" +PreviousRef = "v2.8.6" BaseBranch = "v2.8" -FutureCurrentRefName = "v2.8.6" +FutureCurrentRefName = "v2.8.7" ThresholdPreviousRef = 10 ThresholdCurrentRef = 10 From f75f636e27b34a78717757e2feb0eddd615d511d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Skyler=20M=C3=A4ntysaari?= Date: Thu, 29 Sep 2022 11:14:08 +0300 Subject: [PATCH 2/6] Improve documentation for publishedService and IP options --- docs/content/providers/kubernetes-ingress.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/content/providers/kubernetes-ingress.md b/docs/content/providers/kubernetes-ingress.md index 801820ee2..bafa082b6 100644 --- a/docs/content/providers/kubernetes-ingress.md +++ b/docs/content/providers/kubernetes-ingress.md @@ -374,7 +374,7 @@ providers: _Optional, Default: ""_ -IP used for Kubernetes Ingress endpoints. +This IP will get copied to Ingress `status.loadbalancer.ip`, and currently only supports one IP value (IPv4 or IPv6). ```yaml tab="File (YAML)" providers: @@ -398,7 +398,9 @@ providers: _Optional, Default: ""_ -Published Kubernetes Service to copy status from. +The Kubernetes service to copy status from. +When using third parties tools like External-DNS, this option can be used to copy the service `loadbalancer.status` (containing the service's endpoints IPs) to the ingresses. + Format: `namespace/servicename`. ```yaml tab="File (YAML)" From 63a1186d3e1ac834a467fd56bad7ed151df5b963 Mon Sep 17 00:00:00 2001 From: tspearconquest <81998567+tspearconquest@users.noreply.github.com> Date: Fri, 30 Sep 2022 03:22:10 -0500 Subject: [PATCH 3/6] Update golang.org/x/net to latest version --- go.mod | 4 ++-- go.sum | 7 ++++--- integration/helloworld/helloworld.pb.go | 2 ++ pkg/server/server_signals_windows.go | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 4612f025f..053a8afa5 100644 --- a/go.mod +++ b/go.mod @@ -67,7 +67,7 @@ require ( go.elastic.co/apm v1.13.1 go.elastic.co/apm/module/apmot v1.13.1 golang.org/x/mod v0.4.2 - golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e + golang.org/x/net v0.0.0-20220927171203-f486391704dc golang.org/x/text v0.3.7 golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2 @@ -313,7 +313,7 @@ require ( golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect - golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e // indirect + golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect google.golang.org/api v0.44.0 // indirect diff --git a/go.sum b/go.sum index 23e823d6d..68eca3dd1 100644 --- a/go.sum +++ b/go.sum @@ -2239,8 +2239,9 @@ golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e h1:TsQ7F31D3bUCLeqPT0u+yjp1guoArKaNKmCr22PYgTQ= golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220927171203-f486391704dc h1:FxpXZdoBqT8RjqTy6i1E8nXHhW21wK7ptQ/EPIGxzPQ= +golang.org/x/net v0.0.0-20220927171203-f486391704dc/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/oauth2 v0.0.0-20180724155351-3d292e4d0cdc/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -2401,8 +2402,8 @@ golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e h1:CsOuNlbOuf0mzxJIefr6Q4uAUetRUwZE4qt7VfzP+xo= -golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg= +golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/integration/helloworld/helloworld.pb.go b/integration/helloworld/helloworld.pb.go index 61b302678..d3f26398c 100644 --- a/integration/helloworld/helloworld.pb.go +++ b/integration/helloworld/helloworld.pb.go @@ -5,9 +5,11 @@ Package helloworld is a generated protocol buffer package. It is generated from these files: + helloworld.proto It has these top-level messages: + HelloRequest HelloReply StreamExampleRequest diff --git a/pkg/server/server_signals_windows.go b/pkg/server/server_signals_windows.go index 91c14979d..8bfd91fcf 100644 --- a/pkg/server/server_signals_windows.go +++ b/pkg/server/server_signals_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package server From 82cf6c9577c83247148c904c12a1eb73048f39ed Mon Sep 17 00:00:00 2001 From: Boris HUISGEN Date: Fri, 30 Sep 2022 10:50:09 +0200 Subject: [PATCH 4/6] Fix watch option description for Docker provider --- docs/content/providers/docker.md | 2 +- docs/content/reference/static-configuration/cli-ref.md | 2 +- docs/content/reference/static-configuration/env-ref.md | 2 +- pkg/provider/docker/docker.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/content/providers/docker.md b/docs/content/providers/docker.md index f2c60d931..27eaab1e1 100644 --- a/docs/content/providers/docker.md +++ b/docs/content/providers/docker.md @@ -531,7 +531,7 @@ providers: _Optional, Default=true_ -Watch Docker Swarm events. +Watch Docker events. ```yaml tab="File (YAML)" providers: diff --git a/docs/content/reference/static-configuration/cli-ref.md b/docs/content/reference/static-configuration/cli-ref.md index 665e8448a..984a6b12a 100644 --- a/docs/content/reference/static-configuration/cli-ref.md +++ b/docs/content/reference/static-configuration/cli-ref.md @@ -562,7 +562,7 @@ TLS key Use the ip address from the bound port, rather than from the inner network. (Default: ```false```) `--providers.docker.watch`: -Watch Docker Swarm events. (Default: ```true```) +Watch Docker events. (Default: ```true```) `--providers.ecs`: Enable AWS ECS backend with default settings. (Default: ```false```) diff --git a/docs/content/reference/static-configuration/env-ref.md b/docs/content/reference/static-configuration/env-ref.md index fca125102..347f87999 100644 --- a/docs/content/reference/static-configuration/env-ref.md +++ b/docs/content/reference/static-configuration/env-ref.md @@ -562,7 +562,7 @@ TLS key Use the ip address from the bound port, rather than from the inner network. (Default: ```false```) `TRAEFIK_PROVIDERS_DOCKER_WATCH`: -Watch Docker Swarm events. (Default: ```true```) +Watch Docker events. (Default: ```true```) `TRAEFIK_PROVIDERS_ECS`: Enable AWS ECS backend with default settings. (Default: ```false```) diff --git a/pkg/provider/docker/docker.go b/pkg/provider/docker/docker.go index 6de001275..4decdeef8 100644 --- a/pkg/provider/docker/docker.go +++ b/pkg/provider/docker/docker.go @@ -49,7 +49,7 @@ var _ provider.Provider = (*Provider)(nil) // Provider holds configurations of the provider. type Provider struct { Constraints string `description:"Constraints is an expression that Traefik matches against the container's labels to determine whether to create any route for that container." json:"constraints,omitempty" toml:"constraints,omitempty" yaml:"constraints,omitempty" export:"true"` - Watch bool `description:"Watch Docker Swarm events." json:"watch,omitempty" toml:"watch,omitempty" yaml:"watch,omitempty" export:"true"` + Watch bool `description:"Watch Docker events." json:"watch,omitempty" toml:"watch,omitempty" yaml:"watch,omitempty" export:"true"` Endpoint string `description:"Docker server endpoint. Can be a tcp or a unix socket endpoint." json:"endpoint,omitempty" toml:"endpoint,omitempty" yaml:"endpoint,omitempty"` DefaultRule string `description:"Default rule." json:"defaultRule,omitempty" toml:"defaultRule,omitempty" yaml:"defaultRule,omitempty"` TLS *types.ClientTLS `description:"Enable Docker TLS support." json:"tls,omitempty" toml:"tls,omitempty" yaml:"tls,omitempty" export:"true"` From 627175694d53455831c323d2590810081b9105b6 Mon Sep 17 00:00:00 2001 From: John Pekcan Date: Fri, 30 Sep 2022 03:57:48 -0500 Subject: [PATCH 5/6] Fix autoDiscoverClusters option documentation for ECS provider --- docs/content/providers/ecs.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/content/providers/ecs.md b/docs/content/providers/ecs.md index 629a7a394..7b99f74f2 100644 --- a/docs/content/providers/ecs.md +++ b/docs/content/providers/ecs.md @@ -65,7 +65,7 @@ _Optional, Default=false_ Search for services in cluster list. -- If set to `true` service discovery is disabled on configured clusters, but enabled for all other clusters. +- If set to `true` service discovery is enabled for all clusters. - If set to `false` service discovery is enabled on configured clusters only. ```yaml tab="File (YAML)" @@ -91,6 +91,7 @@ providers: _Optional, Default=["default"]_ Search for services in cluster list. +This option is ignored if `autoDiscoverClusters` is set to `true`. ```yaml tab="File (YAML)" providers: From 3812e6f3cbc31725b8909a226ccec5f29ae59de8 Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Fri, 30 Sep 2022 12:03:03 +0200 Subject: [PATCH 6/6] Prepare release v2.8.8 --- CHANGELOG.md | 13 +++++++++++-- script/gcg/traefik-bugfix.toml | 6 +++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64fe438bd..531eae25c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +## [v2.8.8](https://github.com/traefik/traefik/tree/v2.8.8) (2022-09-30) +[All Commits](https://github.com/traefik/traefik/compare/v2.8.7...v2.8.8) + +**Bug fixes:** +- **[server]** Update golang.org/x/net to latest version ([#9398](https://github.com/traefik/traefik/pull/9398) by [tspearconquest](https://github.com/tspearconquest)) + +**Documentation:** +- **[docker]** Fix watch option description for Docker provider ([#9391](https://github.com/traefik/traefik/pull/9391) by [bhuisgen](https://github.com/bhuisgen)) +- **[ecs]** Fix autoDiscoverClusters option documentation for ECS provider ([#9392](https://github.com/traefik/traefik/pull/9392) by [johnpekcan](https://github.com/johnpekcan)) +- **[k8s]** Improve documentation for publishedService and IP options ([#9380](https://github.com/traefik/traefik/pull/9380) by [samip5](https://github.com/samip5)) + ## [v2.8.7](https://github.com/traefik/traefik/tree/v2.8.7) (2022-09-23) [All Commits](https://github.com/traefik/traefik/compare/v2.8.5...v2.8.7) @@ -6249,5 +6260,3 @@ Same changelog as v2.0.3. - Fix travis tag check [\#422](https://github.com/traefik/traefik/pull/422) ([emilevauge](https://github.com/emilevauge)) - log info about TOML configuration file using [\#420](https://github.com/traefik/traefik/pull/420) ([cocap10](https://github.com/cocap10)) - Doc about skipping some integration tests with '-check.f ConsulCatalogSuite' [\#418](https://github.com/traefik/traefik/pull/418) ([samber](https://github.com/samber)) - -\* *This Change Log was automatically generated by [gcg](https://github.com/ldez/gcg)* diff --git a/script/gcg/traefik-bugfix.toml b/script/gcg/traefik-bugfix.toml index d9e8c084a..5c55c6c72 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.8.7 +# example new bugfix v2.8.8 CurrentRef = "v2.8" -PreviousRef = "v2.8.6" +PreviousRef = "v2.8.7" BaseBranch = "v2.8" -FutureCurrentRefName = "v2.8.7" +FutureCurrentRefName = "v2.8.8" ThresholdPreviousRef = 10 ThresholdCurrentRef = 10