baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge current v3.0 into v3.1

Browse source
This commit is contained in:
romain 2024-07-15 15:22:14 +02:00
commit fc174062b6
7 changed files with 43 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/content/contributing/submitting-pull-requests.md
View file

@ -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. * 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 the validation check.
* Pass all tests. * Pass all tests.
* Receive 3 approving reviews from maintainers. * Receive 2 approving reviews from maintainers.
## Pull Request Review Cycle ## 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`. 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: This label can be used when:

8
docs/content/routing/providers/consul-catalog.md
View file

@ -12,6 +12,14 @@ A Story of Tags, Services & Instances
Attach tags to your services and let Traefik do the rest! 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 ## Routing Configuration
!!! info "tags" !!! info "tags"

8
docs/content/routing/providers/docker.md
View file

@ -12,6 +12,14 @@ A Story of Labels & Containers
Attach labels to your containers and let Traefik do the rest! 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 ## Configuration Examples
??? example "Configuring Docker & Deploying / Exposing Services" ??? example "Configuring Docker & Deploying / Exposing Services"

8
docs/content/routing/providers/ecs.md
View file

@ -10,6 +10,14 @@ A Story of Labels & Elastic Containers
Attach labels to your containers and let Traefik do the rest! 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 ## Routing Configuration
!!! info "labels" !!! info "labels"

8
docs/content/routing/providers/nomad.md
View file

@ -12,6 +12,14 @@ A story of Tags, Services & Nomads
Attach tags to your Nomad services and let Traefik do the rest! 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 ## Routing Configuration
!!! info "tags" !!! info "tags"

8
docs/content/routing/providers/swarm.md
View file

@ -12,6 +12,14 @@ A Story of Labels & Containers
Attach labels to your containers and let Traefik do the rest! 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 Swarm, 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).
## Configuration Examples ## Configuration Examples
??? example "Configuring Docker Swarm & Deploying / Exposing Services" ??? example "Configuring Docker Swarm & Deploying / Exposing Services"

2
docs/content/routing/routers/index.md
View file

@ -479,7 +479,7 @@ A value of `0` for the priority is ignored: `priority = 0` means that the defaul
| Name | Rule | Priority | | 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 | | Router-2 | ```Host(`foobar.traefik.com`)``` | 26 |
The previous table shows that `Router-1` has a higher priority than `Router-2`. The previous table shows that `Router-1` has a higher priority than `Router-2`.