From 2f47bb0df6aa1677388dc1d10d98509b476d0534 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Doumenjou <925513+jbdoumenjou@users.noreply.github.com> Date: Tue, 13 Jul 2021 16:54:08 +0200 Subject: [PATCH 1/4] Prepare release v2.4.10 --- CHANGELOG.md | 18 ++++++++++++++++++ script/gcg/traefik-bugfix.toml | 6 +++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fd11ed9d..1ce787918 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,21 @@ +## [v2.4.10](https://github.com/traefik/traefik/tree/v2.4.10) (2021-07-13) +[All Commits](https://github.com/traefik/traefik/compare/v2.4.9...v2.4.10) + +**Bug fixes:** +- **[k8s,k8s/crd,k8s/ingress]** Disable ExternalName Services by default on Kubernetes providers ([#8261](https://github.com/traefik/traefik/pull/8261) by [dtomcej](https://github.com/dtomcej)) +- **[k8s,k8s/crd,k8s/ingress]** Fix: malformed Kubernetes resource names and references in tests ([#8226](https://github.com/traefik/traefik/pull/8226) by [rtribotte](https://github.com/rtribotte)) +- **[k8s,k8s/crd]** Disable Cross-Namespace by default for IngressRoute provider ([#8260](https://github.com/traefik/traefik/pull/8260) by [dtomcej](https://github.com/dtomcej)) +- **[logs,middleware]** Accesslog: support multiple values for a given header ([#8258](https://github.com/traefik/traefik/pull/8258) by [ldez](https://github.com/ldez)) +- **[logs]** Ignore http 1.0 request host missing errors ([#8252](https://github.com/traefik/traefik/pull/8252) by [dtomcej](https://github.com/dtomcej)) +- **[middleware]** Headers Middleware: support http.CloseNotifier interface ([#8238](https://github.com/traefik/traefik/pull/8238) by [dtomcej](https://github.com/dtomcej)) +- **[tls]** Detect certificates content modifications ([#8243](https://github.com/traefik/traefik/pull/8243) by [jbdoumenjou](https://github.com/jbdoumenjou)) + +**Documentation:** +- **[middleware,k8s]** Fix invalid subdomain ([#8212](https://github.com/traefik/traefik/pull/8212) by [WLun001](https://github.com/WLun001)) +- Add the list of available provider names ([#8225](https://github.com/traefik/traefik/pull/8225) by [WLun001](https://github.com/WLun001)) +- Fix maintainers-guidelines page title ([#8216](https://github.com/traefik/traefik/pull/8216) by [kubopanda](https://github.com/kubopanda)) +- Typos in contributing section ([#8215](https://github.com/traefik/traefik/pull/8215) by [kubopanda](https://github.com/kubopanda)) + ## [v2.4.9](https://github.com/traefik/traefik/tree/v2.4.9) (2021-06-21) [All Commits](https://github.com/traefik/traefik/compare/v2.4.8...v2.4.9) diff --git a/script/gcg/traefik-bugfix.toml b/script/gcg/traefik-bugfix.toml index 8d51a360c..a8b39fa53 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.4.9 +# example new bugfix v2.4.10 CurrentRef = "v2.4" -PreviousRef = "v2.4.8" +PreviousRef = "v2.4.9" BaseBranch = "v2.4" -FutureCurrentRefName = "v2.4.9" +FutureCurrentRefName = "v2.4.10" ThresholdPreviousRef = 10 ThresholdCurrentRef = 10 From 985f8778e96c48af0b5e3e9b3a5038c48874c448 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Doumenjou <925513+jbdoumenjou@users.noreply.github.com> Date: Thu, 15 Jul 2021 00:09:51 +0200 Subject: [PATCH 2/4] fix doc verify script (#8266) --- docs/scripts/verify.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/scripts/verify.sh b/docs/scripts/verify.sh index 8dd7c3cfb..03ddaefea 100755 --- a/docs/scripts/verify.sh +++ b/docs/scripts/verify.sh @@ -22,7 +22,7 @@ find "${PATH_TO_SITE}" -type f -not -path "/app/site/theme/*" \ --alt_ignore="/traefikproxy-vertical-logo-color.svg/" \ --http_status_ignore="0,500,501,503" \ --file_ignore="/404.html/" \ - --url_ignore="/https://groups.google.com/a/traefik.io/forum/#!forum/security/,/localhost:/,/127.0.0.1:/,/fonts.gstatic.com/,/.minikube/,/github.com\/traefik\/traefik\/*edit*/,/github.com\/traefik\/traefik/,/doc.traefik.io/,/github\.com\/golang\/oauth2\/blob\/36a7019397c4c86cf59eeab3bc0d188bac444277\/.+/,/www.akamai.com/,/pilot.traefik.io\/profile/,/traefik.io/,/doc.traefik.io\/traefik-mesh/,/www.mkdocs.org/,/squidfunk.github.io/,/ietf.org/,/www.namesilo.com/,/www.youtube.com/,/www.linode.com/" \ + --url_ignore="/https://groups.google.com/a/traefik.io/forum/#!forum/security/,/localhost:/,/127.0.0.1:/,/fonts.gstatic.com/,/.minikube/,/github.com\/traefik\/traefik\/*edit*/,/github.com\/traefik\/traefik/,/doc.traefik.io/,/github\.com\/golang\/oauth2\/blob\/36a7019397c4c86cf59eeab3bc0d188bac444277\/.+/,/www.akamai.com/,/pilot.traefik.io\/profile/,/traefik.io/,/doc.traefik.io\/traefik-mesh/,/www.mkdocs.org/,/squidfunk.github.io/,/ietf.org/,/www.namesilo.com/,/www.youtube.com/,/www.linode.com/,/www.alibabacloud.com/" \ '{}' 1>/dev/null ## HTML-proofer options at https://github.com/gjtorikian/html-proofer#configuration From 2a2f7f783fede2863292b6ade682d85f587c06c0 Mon Sep 17 00:00:00 2001 From: Romain Date: Thu, 15 Jul 2021 16:48:11 +0200 Subject: [PATCH 3/4] Prepare release v2.4.11 --- CHANGELOG.md | 9 +++++++-- script/gcg/traefik-bugfix.toml | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ce787918..8da39faff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ -## [v2.4.10](https://github.com/traefik/traefik/tree/v2.4.10) (2021-07-13) -[All Commits](https://github.com/traefik/traefik/compare/v2.4.9...v2.4.10) +## [v2.4.11](https://github.com/traefik/traefik/tree/v2.4.11) (2021-07-15) +[All Commits](https://github.com/traefik/traefik/compare/v2.4.9...v2.4.11) **Bug fixes:** - **[k8s,k8s/crd,k8s/ingress]** Disable ExternalName Services by default on Kubernetes providers ([#8261](https://github.com/traefik/traefik/pull/8261) by [dtomcej](https://github.com/dtomcej)) @@ -16,6 +16,11 @@ - Fix maintainers-guidelines page title ([#8216](https://github.com/traefik/traefik/pull/8216) by [kubopanda](https://github.com/kubopanda)) - Typos in contributing section ([#8215](https://github.com/traefik/traefik/pull/8215) by [kubopanda](https://github.com/kubopanda)) +## [v2.4.10](https://github.com/traefik/traefik/tree/v2.4.10) (2021-07-13) +[All Commits](https://github.com/traefik/traefik/compare/v2.4.9...v2.4.10) + +Release canceled. + ## [v2.4.9](https://github.com/traefik/traefik/tree/v2.4.9) (2021-06-21) [All Commits](https://github.com/traefik/traefik/compare/v2.4.8...v2.4.9) diff --git a/script/gcg/traefik-bugfix.toml b/script/gcg/traefik-bugfix.toml index a8b39fa53..4d1cc91d3 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.4.10 +# example new bugfix v2.4.11 CurrentRef = "v2.4" PreviousRef = "v2.4.9" BaseBranch = "v2.4" -FutureCurrentRefName = "v2.4.10" +FutureCurrentRefName = "v2.4.11" ThresholdPreviousRef = 10 ThresholdCurrentRef = 10 From 8d4620dc53b355e8ca8a122e4523835078fdcbe3 Mon Sep 17 00:00:00 2001 From: Daniel Tomcej Date: Mon, 19 Jul 2021 01:58:14 -0600 Subject: [PATCH 4/4] check if defaultcertificate is defined in store --- pkg/provider/file/file.go | 4 ++++ pkg/provider/file/file_test.go | 7 +++++++ pkg/provider/file/fixtures/yaml/simple_empty_store.yml | 3 +++ 3 files changed, 14 insertions(+) create mode 100644 pkg/provider/file/fixtures/yaml/simple_empty_store.yml diff --git a/pkg/provider/file/file.go b/pkg/provider/file/file.go index f6a48b613..7dc49fd7d 100644 --- a/pkg/provider/file/file.go +++ b/pkg/provider/file/file.go @@ -191,6 +191,10 @@ func (p *Provider) loadFileConfig(ctx context.Context, filename string, parseTem // TLS stores if len(configuration.TLS.Stores) > 0 { for name, store := range configuration.TLS.Stores { + if store.DefaultCertificate == nil { + continue + } + content, err := store.DefaultCertificate.CertFile.Read() if err != nil { log.FromContext(ctx).Error(err) diff --git a/pkg/provider/file/file_test.go b/pkg/provider/file/file_test.go index 23d820891..76fb49282 100644 --- a/pkg/provider/file/file_test.go +++ b/pkg/provider/file/file_test.go @@ -262,6 +262,13 @@ func getTestCases() []ProvideTestCase { expectedNumRouter: 20, expectedNumService: 20, }, + { + desc: "simple file with empty store yaml", + filePath: "./fixtures/yaml/simple_empty_store.yml", + expectedNumRouter: 0, + expectedNumService: 0, + expectedNumTLSConf: 0, + }, } } diff --git a/pkg/provider/file/fixtures/yaml/simple_empty_store.yml b/pkg/provider/file/fixtures/yaml/simple_empty_store.yml new file mode 100644 index 000000000..b9c8e3242 --- /dev/null +++ b/pkg/provider/file/fixtures/yaml/simple_empty_store.yml @@ -0,0 +1,3 @@ +tls: + stores: + default: {}