diff --git a/CHANGELOG.md b/CHANGELOG.md index 68543f6aa..ffde406b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,19 @@ +## [v3.2.3](https://github.com/traefik/traefik/tree/v3.2.3) (2024-12-16) +[All Commits](https://github.com/traefik/traefik/compare/v3.2.2...v3.2.3) + +**Documentation:** +- Update reference install documentation with current chart default ([#11332](https://github.com/traefik/traefik/pull/11332) by [mloiseleur](https://github.com/mloiseleur)) + +**Misc:** +- Merge branch v2.11 into v3.2 ([#11346](https://github.com/traefik/traefik/pull/11346) by [kevinpollet](https://github.com/kevinpollet)) +- Merge branch v2.11 into v3.2 ([#11337](https://github.com/traefik/traefik/pull/11337) by [kevinpollet](https://github.com/kevinpollet)) + +## [v2.11.16](https://github.com/traefik/traefik/tree/v2.11.16) (2024-12-16) +[All Commits](https://github.com/traefik/traefik/compare/v2.11.15...v2.11.16) + +**Bug fixes:** +- **[server]** Update golang.org/x dependencies ([#11336](https://github.com/traefik/traefik/pull/11336) by [rtribotte](https://github.com/rtribotte)) + ## [v3.2.2](https://github.com/traefik/traefik/tree/v3.2.2) (2024-12-10) [All Commits](https://github.com/traefik/traefik/compare/v3.2.1...v3.2.2) diff --git a/docs/content/reference/install-configuration/entrypoints.md b/docs/content/reference/install-configuration/entrypoints.md index 43e212c35..de5442711 100644 --- a/docs/content/reference/install-configuration/entrypoints.md +++ b/docs/content/reference/install-configuration/entrypoints.md @@ -47,7 +47,7 @@ additionalArguments: !!! tip - In the Helm Chart, the entryPoints `web` (port 80), `websecure` (port 443), `traefik` (port 9000) and `metrics` (port 9100) are created by default. + In the Helm Chart, the entryPoints `web` (port 80), `websecure` (port 443), `traefik` (port 8080) and `metrics` (port 9100) are created by default. The entryPoints `web`, `websecure` are exposed by default using a Service. The default behaviors can be overridden in the Helm Chart. diff --git a/script/gcg/traefik-bugfix.toml b/script/gcg/traefik-bugfix.toml index 539d04d2f..a3fe0e158 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 v3.2.2 +# example new bugfix v3.2.3 CurrentRef = "v3.2" -PreviousRef = "v3.2.1" +PreviousRef = "v3.2.2" BaseBranch = "v3.2" -FutureCurrentRefName = "v3.2.2" +FutureCurrentRefName = "v3.2.3" ThresholdPreviousRef = 10 ThresholdCurrentRef = 10