Skip to content

Merge branch v2.11 into v3.6#12552

Merged
traefiker merged 5 commits intotraefik:v3.6from
rtribotte:merge-branch-v2.11-into-v3.6
Jan 14, 2026
Merged

Merge branch v2.11 into v3.6#12552
traefiker merged 5 commits intotraefik:v3.6from
rtribotte:merge-branch-v2.11-into-v3.6

Conversation

@rtribotte
Copy link
Member

What does this PR do?

Merge current v2.11 into v3.6

Motivation

To be up to date

More

  • [ ] Added/updated tests
  • [ ] Added/updated documentation

Additional Notes

@rtribotte rtribotte force-pushed the merge-branch-v2.11-into-v3.6 branch from c5e73c0 to 8479d66 Compare January 14, 2026 10:49
@traefiker
Copy link
Contributor

🚫 checks status: PR status: cancelled

@traefiker
Copy link
Contributor

🚫 checks status: PR status: failure

@traefiker traefiker removed status/3-needs-merge bot/light-review decreases the number of required LGTM from 3 to 1. labels Jan 14, 2026
@traefiker traefiker merged commit 8479d66 into traefik:v3.6 Jan 14, 2026
88 of 108 checks passed
alexlebens pushed a commit to alexlebens/infrastructure that referenced this pull request Jan 23, 2026
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [traefik/traefik](https://github.com/traefik/traefik) | patch | `v3.6.4` → `v3.6.7` |

---

### Release Notes

<details>
<summary>traefik/traefik (traefik/traefik)</summary>

### [`v3.6.7`](https://github.com/traefik/traefik/blob/HEAD/CHANGELOG.md#v367-2026-01-14)

[Compare Source](traefik/traefik@v3.6.6...v3.6.7)

[All Commits](traefik/traefik@v3.6.6...v3.6.7)

**Bug fixes:**

- **\[acme]** Bump github.com/go-acme/lego/v4 to v4.31.0 ([#&#8203;12529](traefik/traefik#12529) by [ldez](https://github.com/ldez))
- **\[acme]** Add missing renew options ([#&#8203;12467](traefik/traefik#12467) by [ldez](https://github.com/ldez))
- **\[acme]** Replace hardcoded references to LetsEncrypt in log messages ([#&#8203;12464](traefik/traefik#12464) by [schildbach](https://github.com/schildbach))
- **\[k8s/ingress-nginx]** Fix use-regex nginx annotation ([#&#8203;12531](traefik/traefik#12531) by [LBF38](https://github.com/LBF38))
- **\[k8s/ingress-nginx]** Prevent Ingress Nginx provider http router to attach to an entrypoint with TLS ([#&#8203;12528](traefik/traefik#12528) by [rtribotte](https://github.com/rtribotte))
- **\[k8s/ingress]** Fix panic for empty defaultBackend and defaultBackend without resources ([#&#8203;12509](traefik/traefik#12509) by [gndz07](https://github.com/gndz07))
- **\[k8s]** Fix condition used for serving and fenced endpoints ([#&#8203;12521](traefik/traefik#12521) by [LBF38](https://github.com/LBF38))
- **\[webui]** Validate X-Forwarded-Prefix value for dashboard redirect ([#&#8203;12514](traefik/traefik#12514) by [LBF38](https://github.com/LBF38))
- **\[acme]** Add timeout to ACME-TLS/1 challenge handshake ([#&#8203;12516](traefik/traefik#12516) by [LBF38](https://github.com/LBF38))
- **\[server]** Make encoded character options opt-in ([#&#8203;12540](traefik/traefik#12540) by [gndz07](https://github.com/gndz07))

**Documentation:**

- **\[docker/swarm]** Update swarm.md traefik version ([#&#8203;12508](traefik/traefik#12508) by [DBouraoui](https://github.com/DBouraoui))
- **\[k8s/ingress-nginx]** Fix ingress-nginx annotations documentation ([#&#8203;12510](traefik/traefik#12510) by [nmengin](https://github.com/nmengin))
- **\[k8s]** Fix Kubernetes reference yml file ([#&#8203;12406](traefik/traefik#12406) by [mmatur](https://github.com/mmatur))
- Fix code copy button positioning ([#&#8203;12520](traefik/traefik#12520) by [AnuragEkkati](https://github.com/AnuragEkkati))
- Fix typo in kubernetes.md ([#&#8203;12515](traefik/traefik#12515) by [EdwardSalkeld](https://github.com/EdwardSalkeld))
- Bring back security section on API & Dashboard documentation page ([#&#8203;12507](traefik/traefik#12507) by [gndz07](https://github.com/gndz07))
- Fix link description in Traefik Proxy documentation ([#&#8203;12488](traefik/traefik#12488) by [schaerfo](https://github.com/schaerfo))
- Add product comparison matrix and features page ([#&#8203;12037](traefik/traefik#12037) by [sheddy-traefik](https://github.com/sheddy-traefik))

**Misc:**

- Merge branch v2.11 into v3.6 ([#&#8203;12552](traefik/traefik#12552) by [rtribotte](https://github.com/rtribotte))
- Merge branch v2.11 into v3.6 ([#&#8203;12533](traefik/traefik#12533) by [mmatur](https://github.com/mmatur))
- Merge branch v2.11 into v3.6 ([#&#8203;12497](traefik/traefik#12497) by [mmatur](https://github.com/mmatur))

### [`v3.6.6`](https://github.com/traefik/traefik/blob/HEAD/CHANGELOG.md#v367-2026-01-14)

[Compare Source](traefik/traefik@v3.6.5...v3.6.6)

[All Commits](traefik/traefik@v3.6.6...v3.6.7)

**Bug fixes:**

- **\[acme]** Bump github.com/go-acme/lego/v4 to v4.31.0 ([#&#8203;12529](traefik/traefik#12529) by [ldez](https://github.com/ldez))
- **\[acme]** Add missing renew options ([#&#8203;12467](traefik/traefik#12467) by [ldez](https://github.com/ldez))
- **\[acme]** Replace hardcoded references to LetsEncrypt in log messages ([#&#8203;12464](traefik/traefik#12464) by [schildbach](https://github.com/schildbach))
- **\[k8s/ingress-nginx]** Fix use-regex nginx annotation ([#&#8203;12531](traefik/traefik#12531) by [LBF38](https://github.com/LBF38))
- **\[k8s/ingress-nginx]** Prevent Ingress Nginx provider http router to attach to an entrypoint with TLS ([#&#8203;12528](traefik/traefik#12528) by [rtribotte](https://github.com/rtribotte))
- **\[k8s/ingress]** Fix panic for empty defaultBackend and defaultBackend without resources ([#&#8203;12509](traefik/traefik#12509) by [gndz07](https://github.com/gndz07))
- **\[k8s]** Fix condition used for serving and fenced endpoints ([#&#8203;12521](traefik/traefik#12521) by [LBF38](https://github.com/LBF38))
- **\[webui]** Validate X-Forwarded-Prefix value for dashboard redirect ([#&#8203;12514](traefik/traefik#12514) by [LBF38](https://github.com/LBF38))
- **\[acme]** Add timeout to ACME-TLS/1 challenge handshake ([#&#8203;12516](traefik/traefik#12516) by [LBF38](https://github.com/LBF38))
- **\[server]** Make encoded character options opt-in ([#&#8203;12540](traefik/traefik#12540) by [gndz07](https://github.com/gndz07))

**Documentation:**

- **\[docker/swarm]** Update swarm.md traefik version ([#&#8203;12508](traefik/traefik#12508) by [DBouraoui](https://github.com/DBouraoui))
- **\[k8s/ingress-nginx]** Fix ingress-nginx annotations documentation ([#&#8203;12510](traefik/traefik#12510) by [nmengin](https://github.com/nmengin))
- **\[k8s]** Fix Kubernetes reference yml file ([#&#8203;12406](traefik/traefik#12406) by [mmatur](https://github.com/mmatur))
- Fix code copy button positioning ([#&#8203;12520](traefik/traefik#12520) by [AnuragEkkati](https://github.com/AnuragEkkati))
- Fix typo in kubernetes.md ([#&#8203;12515](traefik/traefik#12515) by [EdwardSalkeld](https://github.com/EdwardSalkeld))
- Bring back security section on API & Dashboard documentation page ([#&#8203;12507](traefik/traefik#12507) by [gndz07](https://github.com/gndz07))
- Fix link description in Traefik Proxy documentation ([#&#8203;12488](traefik/traefik#12488) by [schaerfo](https://github.com/schaerfo))
- Add product comparison matrix and features page ([#&#8203;12037](traefik/traefik#12037) by [sheddy-traefik](https://github.com/sheddy-traefik))

**Misc:**

- Merge branch v2.11 into v3.6 ([#&#8203;12552](traefik/traefik#12552) by [rtribotte](https://github.com/rtribotte))
- Merge branch v2.11 into v3.6 ([#&#8203;12533](traefik/traefik#12533) by [mmatur](https://github.com/mmatur))
- Merge branch v2.11 into v3.6 ([#&#8203;12497](traefik/traefik#12497) by [mmatur](https://github.com/mmatur))

### [`v3.6.5`](https://github.com/traefik/traefik/blob/HEAD/CHANGELOG.md#v366-2025-12-29)

[Compare Source](traefik/traefik@v3.6.4...v3.6.5)

[All Commits](traefik/traefik@v3.6.5...v3.6.6)

**Bug fixes:**

- **\[acme]** Bump github.com/go-acme/lego/v4 to v4.30.1 ([#&#8203;12432](traefik/traefik#12432) by [ldez](https://github.com/ldez))
- **\[http3]** Bump github.com/quic-go/quic-go to v0.58.0 ([#&#8203;12448](traefik/traefik#12448) by [GreyXor](https://github.com/GreyXor))
- **\[redis]** Fix mutually exclusive verification for Redis ([#&#8203;12442](traefik/traefik#12442) by [juliens](https://github.com/juliens))
- **\[server]** Fix deny encoded characters ([#&#8203;12454](traefik/traefik#12454) by [rtribotte](https://github.com/rtribotte))

**Documentation:**

- **\[k8s/ingress,k8s]** Fix Kubernetes Ingress provider documentation ([#&#8203;12443](traefik/traefik#12443) by [nmengin](https://github.com/nmengin))
- **\[k8s/ingress-nginx]** Add RBAC documentation for Ingress NGINX provider ([#&#8203;12445](traefik/traefik#12445) by [nmn3m](https://github.com/nmn3m))
- **\[k8s]** Improve the K8S multi-tenancy security note ([#&#8203;12444](traefik/traefik#12444) by [nmengin](https://github.com/nmengin))
- Restore documentation on http.maxHeaderBytes ([#&#8203;12440](traefik/traefik#12440) by [mloiseleur](https://github.com/mloiseleur))
- Fix Menu Item Naming ([#&#8203;12431](traefik/traefik#12431) by [sheddy-traefik](https://github.com/sheddy-traefik))

**Misc:**

- Merge branch v2.11 into v3.6 ([#&#8203;12475](traefik/traefik#12475) by [mmatur](https://github.com/mmatur))
- Merge branch v2.11 into v3.6 ([#&#8203;12438](traefik/traefik#12438) by [kevinpollet](https://github.com/kevinpollet))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi42OS4yIiwidXBkYXRlZEluVmVyIjoiNDIuNjkuMiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Reviewed-on: https://gitea.alexlebens.dev/alexlebens/infrastructure/pulls/3392
Co-authored-by: Renovate Bot <renovate-bot@alexlebens.net>
Co-committed-by: Renovate Bot <renovate-bot@alexlebens.net>
@rtribotte rtribotte deleted the merge-branch-v2.11-into-v3.6 branch March 5, 2026 14:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants