From f32884d9b819e5680df1ed80531ae0c076d5bd48 Mon Sep 17 00:00:00 2001 From: Emile Vauge Date: Wed, 10 Jul 2024 11:46:03 +0200 Subject: [PATCH 1/3] Update PR approval process --- docs/content/contributing/submitting-pull-requests.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/content/contributing/submitting-pull-requests.md b/docs/content/contributing/submitting-pull-requests.md index 8dfbaeb5c..c5d76f6f1 100644 --- a/docs/content/contributing/submitting-pull-requests.md +++ b/docs/content/contributing/submitting-pull-requests.md @@ -56,7 +56,7 @@ Merging a PR requires the following steps to be completed before it is merged au * Ensure your PR is not a draft. We do not review drafts, but do answer questions and confer with developers on them as needed. * Pass the validation check. * Pass all tests. -* Receive 3 approving reviews from maintainers. +* Receive 2 approving reviews from maintainers. ## Pull Request Review Cycle @@ -112,7 +112,7 @@ In such a situation, solve the conflicts/CI/... and then remove the label `bot/n To prevent the bot from automatically merging a PR, add the label `bot/no-merge`. -The label `bot/light-review` decreases the number of required LGTM from 3 to 1. +The label `bot/light-review` decreases the number of required LGTM from 2 to 1. This label can be used when: From 127c0a7542eb669eaf3dee3aa471fa162d55b43d Mon Sep 17 00:00:00 2001 From: Emile Vauge Date: Thu, 11 Jul 2024 14:40:07 +0200 Subject: [PATCH 2/3] Improve doc on sensitive data stored into labels/tags --- docs/content/routing/providers/consul-catalog.md | 8 ++++++++ docs/content/routing/providers/docker.md | 8 ++++++++ docs/content/routing/providers/ecs.md | 8 ++++++++ docs/content/routing/providers/nomad.md | 8 ++++++++ docs/content/routing/providers/rancher.md | 8 ++++++++ 5 files changed, 40 insertions(+) diff --git a/docs/content/routing/providers/consul-catalog.md b/docs/content/routing/providers/consul-catalog.md index 16e9f531b..786cea2ae 100644 --- a/docs/content/routing/providers/consul-catalog.md +++ b/docs/content/routing/providers/consul-catalog.md @@ -12,6 +12,14 @@ A Story of Tags, Services & Instances Attach tags to your services and let Traefik do the rest! +One of the best feature of Traefik is to delegate the routing configuration to the application level. +With Consul Catalog, Traefik can leverage tags attached to a service to generate routing rules. + +!!! warning "Tags & sensitive data" + + We recommend to *not* use tags to store sensitive data (certificates, credentials, etc). + Instead, we recommend to store sensitive data in a safer storage (secrets, file, etc). + ## Routing Configuration !!! info "tags" diff --git a/docs/content/routing/providers/docker.md b/docs/content/routing/providers/docker.md index 0ebdf827f..b120abbb7 100644 --- a/docs/content/routing/providers/docker.md +++ b/docs/content/routing/providers/docker.md @@ -12,6 +12,14 @@ A Story of Labels & Containers Attach labels to your containers and let Traefik do the rest! +One of the best feature of Traefik is to delegate the routing configuration to the application level. +With Docker, Traefik can leverage labels attached to a container to generate routing rules. + +!!! warning "Labels & sensitive data" + + We recommend to *not* use labels to store sensitive data (certificates, credentials, etc). + Instead, we recommend to store sensitive data in a safer storage (secrets, file, etc). + ## Configuration Examples ??? example "Configuring Docker & Deploying / Exposing Services" diff --git a/docs/content/routing/providers/ecs.md b/docs/content/routing/providers/ecs.md index 0dad42781..1d2e523ba 100644 --- a/docs/content/routing/providers/ecs.md +++ b/docs/content/routing/providers/ecs.md @@ -10,6 +10,14 @@ A Story of Labels & Elastic Containers Attach labels to your containers and let Traefik do the rest! +One of the best feature of Traefik is to delegate the routing configuration to the application level. +With ECS, Traefik can leverage labels attached to a container to generate routing rules. + +!!! warning "Labels & sensitive data" + + We recommend to *not* use labels to store sensitive data (certificates, credentials, etc). + Instead, we recommend to store sensitive data in a safer storage (secrets, file, etc). + ## Routing Configuration !!! info "labels" diff --git a/docs/content/routing/providers/nomad.md b/docs/content/routing/providers/nomad.md index ccc6316e7..35a2c5a5f 100644 --- a/docs/content/routing/providers/nomad.md +++ b/docs/content/routing/providers/nomad.md @@ -12,6 +12,14 @@ A story of Tags, Services & Nomads Attach tags to your Nomad services and let Traefik do the rest! +One of the best feature of Traefik is to delegate the routing configuration to the application level. +With Nomad, Traefik can leverage tags attached to a service to generate routing rules. + +!!! warning "Tags & sensitive data" + + We recommend to *not* use tags to store sensitive data (certificates, credentials, etc). + Instead, we recommend to store sensitive data in a safer storage (secrets, file, etc). + ## Routing Configuration !!! info "tags" diff --git a/docs/content/routing/providers/rancher.md b/docs/content/routing/providers/rancher.md index fef132c4b..49215542f 100644 --- a/docs/content/routing/providers/rancher.md +++ b/docs/content/routing/providers/rancher.md @@ -12,6 +12,14 @@ A Story of Labels, Services & Containers Attach labels to your services and let Traefik do the rest! +One of the best feature of Traefik is to delegate the routing configuration to the application level. +With Rancher, Traefik can leverage labels attached to a service to generate routing rules. + +!!! warning "Labels & sensitive data" + + We recommend to *not* use labels to store sensitive data (certificates, credentials, etc). + Instead, we recommend to store sensitive data in a safer storage (secrets, file, etc). + !!! important "This provider is specific to Rancher 1.x." Rancher 2.x requires Kubernetes and does not have a metadata endpoint of its own for Traefik to query. From a52c81fd910e079c7e5cc053c6faa04077ec0d46 Mon Sep 17 00:00:00 2001 From: Tammo <112475628+rltas@users.noreply.github.com> Date: Thu, 11 Jul 2024 15:46:03 +0200 Subject: [PATCH 3/3] Incorrect value in default priority computation example --- docs/content/routing/routers/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/routing/routers/index.md b/docs/content/routing/routers/index.md index 117dc5b2a..99c06852b 100644 --- a/docs/content/routing/routers/index.md +++ b/docs/content/routing/routers/index.md @@ -479,7 +479,7 @@ A value of `0` for the priority is ignored: `priority = 0` means that the defaul | Name | Rule | Priority | |----------|------------------------------------------|----------| - | Router-1 | ```HostRegexp(`[a-z]+\.traefik\.com`)``` | 44 | + | Router-1 | ```HostRegexp(`[a-z]+\.traefik\.com`)``` | 34 | | Router-2 | ```Host(`foobar.traefik.com`)``` | 26 | The previous table shows that `Router-1` has a higher priority than `Router-2`.