Merge current v2.4 into master

This commit is contained in:
romain 2021-06-22 14:05:57 +02:00
commit ce2e02b690
119 changed files with 4628 additions and 4165 deletions

View file

@ -538,7 +538,7 @@ KV Username
Enable debug logging of generated configuration template. (Default: ```false```)
`--providers.file.directory`:
Load dynamic configuration from one or more .toml or .yml files in a directory.
Load dynamic configuration from one or more .yml or .toml files in a directory.
`--providers.file.filename`:
Load dynamic configuration from a file.

View file

@ -538,7 +538,7 @@ KV Username
Enable debug logging of generated configuration template. (Default: ```false```)
`TRAEFIK_PROVIDERS_FILE_DIRECTORY`:
Load dynamic configuration from one or more .toml or .yml files in a directory.
Load dynamic configuration from one or more .yml or .toml files in a directory.
`TRAEFIK_PROVIDERS_FILE_FILENAME`:
Load dynamic configuration from a file.

View file

@ -1,9 +1,9 @@
# Static Configuration: File
```toml tab="TOML"
--8<-- "content/reference/static-configuration/file.toml"
```
```yml tab="YAML"
--8<-- "content/reference/static-configuration/file.yaml"
```
```toml tab="TOML"
--8<-- "content/reference/static-configuration/file.toml"
```

View file

@ -386,6 +386,7 @@
[pilot]
token = "foobar"
dashboard = true
[experimental]
kubernetesGateway = true

View file

@ -407,6 +407,7 @@ certificatesResolvers:
tlsChallenge: {}
pilot:
token: foobar
dashboard: true
experimental:
kubernetesGateway: true
http3: true