From 20d496268cf70f90320edeb3799df10e2081282d Mon Sep 17 00:00:00 2001 From: Thomas Francis Date: Mon, 6 Jan 2025 03:36:08 -0500 Subject: [PATCH 1/3] Fix typo in basicauth note --- docs/content/middlewares/http/basicauth.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/middlewares/http/basicauth.md b/docs/content/middlewares/http/basicauth.md index 82fd00ae4..9a6b3c579 100644 --- a/docs/content/middlewares/http/basicauth.md +++ b/docs/content/middlewares/http/basicauth.md @@ -21,7 +21,7 @@ The BasicAuth middleware grants access to services to authorized users only. # To create user:password pair, it's possible to use this command: # echo $(htpasswd -nB user) | sed -e s/\\$/\\$\\$/g # -# Also note that dollar signs should NOT be doubled when they not evaluated (e.g. Ansible docker_container module). +# Also note that dollar signs should NOT be doubled when they are not being evaluated (e.g. Ansible docker_container module). labels: - "traefik.http.middlewares.test-auth.basicauth.users=test:$$apr1$$H6uskkkW$$IgXLP6ewTrSuBkTrqE8wj/,test2:$$apr1$$d9hr9HBB$$4HxwgUir3HP4EsggP/QNo0" ``` From a31b0263647d56b3dba97e59e14d27af9edf5f26 Mon Sep 17 00:00:00 2001 From: Kevin Pollet Date: Mon, 6 Jan 2025 10:00:07 +0100 Subject: [PATCH 2/3] Prepare release v2.11.17 --- 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 e490c0a65..2fd996266 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +## [v2.11.17](https://github.com/traefik/traefik/tree/v2.11.17) (2025-01-06) +[All Commits](https://github.com/traefik/traefik/compare/v2.11.16...v2.11.17) + +**Bug fixes:** +- **[acme]** Update go-acme/lego to v4.21.0 ([#11368](https://github.com/traefik/traefik/pull/11368) by [ldez](https://github.com/ldez)) +- **[middleware]** Fix typo in basicauth note ([#11397](https://github.com/traefik/traefik/pull/11397) by [tieje](https://github.com/tieje)) +- **[service]** Configure ErrorLog in httputil.ReverseProxy ([#11344](https://github.com/traefik/traefik/pull/11344) by [peacewalker122](https://github.com/peacewalker122)) +- Bump golang.org/x/net to v0.33.0 ([#11365](https://github.com/traefik/traefik/pull/11365) by [kevinpollet](https://github.com/kevinpollet)) + +**Documentation:** +- **[acme]** Fix allowACMEByPass TOML example ([#11370](https://github.com/traefik/traefik/pull/11370) by [hannesbraun](https://github.com/hannesbraun)) +- **[k8s/crd]** Update copyright for 2025 ([#11383](https://github.com/traefik/traefik/pull/11383) 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) diff --git a/script/gcg/traefik-bugfix.toml b/script/gcg/traefik-bugfix.toml index 8ad98a3d5..8d1a0826e 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.11.16 +# example new bugfix v2.11.17 CurrentRef = "v2.11" -PreviousRef = "v2.11.15" +PreviousRef = "v2.11.16" BaseBranch = "v2.11" -FutureCurrentRefName = "v2.11.16" +FutureCurrentRefName = "v2.11.17" ThresholdPreviousRef = 10 ThresholdCurrentRef = 10 From ee8305549a618a5bcb93e292e49dc306c4e04a01 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 6 Jan 2025 10:28:04 +0100 Subject: [PATCH 3/3] Allow release only on traefik/traefik repo --- .github/workflows/release.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index f65420ce8..f69ccda73 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -15,11 +15,11 @@ env: jobs: build-webui: - if: github.ref_type == 'tag' + if: github.ref_type == 'tag' && github.repository == 'traefik/traefik' uses: ./.github/workflows/template-webui.yaml build: - if: github.ref_type == 'tag' + if: github.ref_type == 'tag' && github.repository == 'traefik/traefik' runs-on: ubuntu-latest strategy: @@ -80,7 +80,7 @@ jobs: retention-days: 1 release: - if: github.ref_type == 'tag' + if: github.ref_type == 'tag' && github.repository == 'traefik/traefik' runs-on: ubuntu-latest needs: