Merge branch v2.10 into v3.0

This commit is contained in:
mmatur 2023-07-24 10:18:23 +02:00 committed by Fernandez Ludovic
commit eb585740a1
27 changed files with 530 additions and 428 deletions

View file

@ -45,6 +45,9 @@ Activate dashboard. (Default: ```true```)
`--api.debug`:
Enable additional endpoints for debugging and profiling. (Default: ```false```)
`--api.disabledashboardad`:
Disable ad in the dashboard. (Default: ```false```)
`--api.insecure`:
Activate API directly on the entryPoint named traefik. (Default: ```false```)

View file

@ -45,6 +45,9 @@ Activate dashboard. (Default: ```true```)
`TRAEFIK_API_DEBUG`:
Enable additional endpoints for debugging and profiling. (Default: ```false```)
`TRAEFIK_API_DISABLEDASHBOARDAD`:
Disable ad in the dashboard. (Default: ```false```)
`TRAEFIK_API_INSECURE`:
Activate API directly on the entryPoint named traefik. (Default: ```false```)

View file

@ -262,6 +262,7 @@
insecure = true
dashboard = true
debug = true
disabledashboardad = false
[metrics]
[metrics.prometheus]
@ -446,13 +447,6 @@
[certificatesResolvers.CertificateResolver0.acme.tlsChallenge]
[certificatesResolvers.CertificateResolver1.tailscale]
[hub]
[hub.tls]
insecure = true
ca = "foobar"
cert = "foobar"
key = "foobar"
[experimental]
kubernetesGateway = true
http3 = true

View file

@ -290,6 +290,7 @@ api:
insecure: true
dashboard: true
debug: true
disabledashboardad: false
metrics:
prometheus:
buckets:
@ -476,12 +477,6 @@ certificatesResolvers:
tlsChallenge: {}
CertificateResolver1:
tailscale: {}
hub:
tls:
insecure: true
ca: foobar
cert: foobar
key: foobar
experimental:
kubernetesGateway: true
http3: true