From 7243e65b51ea7254ad97e1009adbc9825ee4a7c3 Mon Sep 17 00:00:00 2001 From: Nick Reilingh Date: Wed, 23 Mar 2022 04:26:08 -0400 Subject: [PATCH 1/3] Fix certificates resolver typo --- docs/content/https/acme.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/content/https/acme.md b/docs/content/https/acme.md index 75b8dbf0a..6cd060aba 100644 --- a/docs/content/https/acme.md +++ b/docs/content/https/acme.md @@ -25,7 +25,7 @@ You can read more about this retrieval mechanism in the following section: [ACME !!! warning "Defining an [ACME challenge type](#the-different-acme-challenges) is a requirement for a certificate resolver to be functional." -!!! important "Defining a certificates resolver does not result in all routers automatically using it. Each router that is supposed to use the resolver must [reference](../routing/routers/index.md#certresolver) it." +!!! important "Defining a certificate resolver does not result in all routers automatically using it. Each router that is supposed to use the resolver must [reference](../routing/routers/index.md#certresolver) it." ??? note "Configuration Reference" @@ -116,7 +116,7 @@ Please check the [configuration examples below](#configuration-examples) for mor --certificatesresolvers.myresolver.acme.httpchallenge.entrypoint=web ``` -!!! important "Defining a certificates resolver does not result in all routers automatically using it. Each router that is supposed to use the resolver must [reference](../routing/routers/index.md#certresolver) it." +!!! important "Defining a certificate resolver does not result in all routers automatically using it. Each router that is supposed to use the resolver must [reference](../routing/routers/index.md#certresolver) it." ??? example "Single Domain from Router's Rule Example" @@ -145,7 +145,7 @@ Traefik automatically tracks the expiry date of ACME certificates it generates. By default, Traefik manages 90 days certificates, and starts to renew certificates 30 days before their expiry. -When using a certificates resolver that issues certificates with custom durations, +When using a certificate resolver that issues certificates with custom durations, one can configure the certificates' duration with the [`certificatesDuration`](#certificatesduration) option. !!! info "" @@ -162,7 +162,7 @@ When using LetsEncrypt with kubernetes, there are some known caveats with both t !!! warning "Defining one ACME challenge is a requirement for a certificate resolver to be functional." -!!! important "Defining a certificates resolver does not result in all routers automatically using it. Each router that is supposed to use the resolver must [reference](../routing/routers/index.md#certresolver) it." +!!! important "Defining a certificate resolver does not result in all routers automatically using it. Each router that is supposed to use the resolver must [reference](../routing/routers/index.md#certresolver) it." ### `tlsChallenge` From ba2d09f6fb15851c25d1c80ecba2749293a77a3c Mon Sep 17 00:00:00 2001 From: Nikolay Stankov <27363885+nstankov-bg@users.noreply.github.com> Date: Wed, 23 Mar 2022 04:38:09 -0500 Subject: [PATCH 2/3] Update entrypoint.md to add consistent CLI syntax --- docs/content/routing/entrypoints.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/content/routing/entrypoints.md b/docs/content/routing/entrypoints.md index ea15aeeda..2aa6b6faf 100644 --- a/docs/content/routing/entrypoints.md +++ b/docs/content/routing/entrypoints.md @@ -258,7 +258,8 @@ In most scenarios, this entryPoint is the same as the one used for TLS traffic. ``` ```bash tab="CLI" - --experimental.http3=true --entrypoints.name.http3 + --experimental.http3=true + --entrypoints.name.http3 ``` #### `advertisedPort` @@ -288,7 +289,8 @@ It can be used to override the authority in the `alt-svc` header, for example if ``` ```bash tab="CLI" - --experimental.http3=true --entrypoints.name.http3.advertisedport=443 + --experimental.http3=true + --entrypoints.name.http3.advertisedport=443 ``` ### Forwarded Headers From 9398222db766a276bb0e01969b6a4c39fa57931c Mon Sep 17 00:00:00 2001 From: Romain Date: Thu, 24 Mar 2022 17:14:57 +0100 Subject: [PATCH 3/3] Prepare release v2.6.2 --- CHANGELOG.md | 22 ++++++++++++++++++++++ script/gcg/traefik-bugfix.toml | 6 +++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 048a60f76..b2ef6b140 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,25 @@ +## [v2.6.2](https://github.com/traefik/traefik/tree/v2.6.2) (2022-03-24) +[All Commits](https://github.com/traefik/traefik/compare/v2.6.1...v2.6.2) + +**Bug fixes:** +- **[file]** Bump paerser to v0.1.5 ([#8850](https://github.com/traefik/traefik/pull/8850) by [ldez](https://github.com/ldez)) + +**Documentation:** +- **[acme]** Fix certificates resolver typo ([#8859](https://github.com/traefik/traefik/pull/8859) by [NReilingh](https://github.com/NReilingh)) +- **[docker]** doc: fix, docker uses Label(), not Tag() ([#8823](https://github.com/traefik/traefik/pull/8823) by [mpl](https://github.com/mpl)) +- **[http3]** Fix CLI syntax in HTTP/3 documentation ([#8864](https://github.com/traefik/traefik/pull/8864) by [nstankov-bg](https://github.com/nstankov-bg)) +- **[kv]** Fix small typo in Redis provider documentation ([#8858](https://github.com/traefik/traefik/pull/8858) by [lczw](https://github.com/lczw)) +- **[marathon]** Fix brand typo ([#8788](https://github.com/traefik/traefik/pull/8788) by [0xflotus](https://github.com/0xflotus)) +- **[middleware]** Fix fenced code block typo in Buffering middleware page ([#8855](https://github.com/traefik/traefik/pull/8855) by [Wingysam](https://github.com/Wingysam)) +- **[rules]** Adjust rule length in routers documentation ([#8819](https://github.com/traefik/traefik/pull/8819) by [rtribotte](https://github.com/rtribotte)) +- **[rules]** Fix HostRegexp examples ([#8817](https://github.com/traefik/traefik/pull/8817) by [kevinpollet](https://github.com/kevinpollet)) +- **[tls,k8s/crd,k8s]** Add default certificate definition example for Kubernetes ([#8863](https://github.com/traefik/traefik/pull/8863) by [jwausle](https://github.com/jwausle)) +- **[tls,k8s]** Clarify TLS Option documentation ([#8756](https://github.com/traefik/traefik/pull/8756) by [mloiseleur](https://github.com/mloiseleur)) +- Clarify concepts documentation page ([#8836](https://github.com/traefik/traefik/pull/8836) by [NReilingh](https://github.com/NReilingh)) +- Spelling ([#8791](https://github.com/traefik/traefik/pull/8791) by [jsoref](https://github.com/jsoref)) +- Fix routing overview examples ([#8840](https://github.com/traefik/traefik/pull/8840) by [NReilingh](https://github.com/NReilingh)) +- Add a deprecation notices section ([#8829](https://github.com/traefik/traefik/pull/8829) by [ddtmachado](https://github.com/ddtmachado)) + ## [v2.6.1](https://github.com/traefik/traefik/tree/v2.6.1) (2022-02-14) [All Commits](https://github.com/traefik/traefik/compare/v2.6.0...v2.6.1) diff --git a/script/gcg/traefik-bugfix.toml b/script/gcg/traefik-bugfix.toml index 84ee76471..299bc5f31 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.6.1 +# example new bugfix v2.6.2 CurrentRef = "v2.6" -PreviousRef = "v2.6.0" +PreviousRef = "v2.6.1" BaseBranch = "v2.6" -FutureCurrentRefName = "v2.6.1" +FutureCurrentRefName = "v2.6.2" ThresholdPreviousRef = 10 ThresholdCurrentRef = 10