chore: fix PyYAML version

.dockerignore

@@ -1,5 +1,3 @@
 dist/
 !dist/traefik
 site/
-vendor/
-.idea/

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,11 +3,11 @@ PLEASE READ THIS MESSAGE.
 
 Documentation fixes or enhancements:
 - for Traefik v1: use branch v1.7
-- for Traefik v2: use branch v2.2
+- for Traefik v2: use branch v2.1
 
 Bug fixes:
 - for Traefik v1: use branch v1.7
-- for Traefik v2: use branch v2.2
+- for Traefik v2: use branch v2.1
 
 Enhancements:
 - for Traefik v1: we only accept bug fixes

.golangci.toml

@@ -49,11 +49,6 @@
     "wsl", # Too strict
     "gomnd", # Too strict
     "stylecheck", # skip because report issues related to some generated files.
-    "testpackage", # Too strict
-    "goerr113", # Too strict
-    "nestif", # Too many false-positive.
-    "noctx", # Too strict
-    "exhaustive", # Too strict
   ]
 
 [issues]
@@ -67,7 +62,7 @@
   ]
  [[issues.exclude-rules]]
     path = "(.+)_test.go"
-    linters = ["goconst", "funlen", "godot"]
+    linters = ["goconst", "funlen"]
  [[issues.exclude-rules]]
     path = "integration/.+_test.go"
     text = "Error return value of `cmd\\.Process\\.Kill` is not checked"
@@ -110,6 +105,3 @@
  [[issues.exclude-rules]]
     path = "pkg/tracing/tracing.go"
     text = "printf-like formatting function 'SetErrorWithEvent' should be named 'SetErrorWithEventf'"
- [[issues.exclude-rules]]
-    path = "pkg/log/deprecated.go"
-    linters = ["godot"]

.semaphoreci/setup.sh

@@ -18,9 +18,9 @@ echo ${SHOULD_TEST}
 #if [ -n "$SHOULD_TEST" ]; then sudo -E apt-get -yq update; fi
 #if [ -n "$SHOULD_TEST" ]; then sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install docker-ce=${DOCKER_VERSION}*; fi
 if [ -n "$SHOULD_TEST" ]; then docker version; fi
-export GO_VERSION=1.13
+export GO_VERSION=1.12
 if [ -f "./go.mod" ]; then GO_VERSION="$(grep '^go .*' go.mod | awk '{print $2}')"; export GO_VERSION; fi
-#if [ "${GO_VERSION}" == '1.14' ]; then export GO_VERSION=1.14rc2; fi
+#if [ "${GO_VERSION}" == '1.13' ]; then export GO_VERSION=1.13rc2; fi
 echo "Selected Go version: ${GO_VERSION}"
 
 if [ -f "./.semaphoreci/golang.sh" ]; then ./.semaphoreci/golang.sh; fi

.semaphoreci/vars

@@ -10,7 +10,7 @@ else
   export VERSION=''
 fi
 
-export CODENAME=chevrotin
+export CODENAME=cantal
 
 export N_MAKE_JOBS=2
 

.travis.yml

@@ -11,7 +11,7 @@ env:
   global:
     - REPO=$TRAVIS_REPO_SLUG
     - VERSION=$TRAVIS_TAG
-    - CODENAME=chevrotin
+    - CODENAME=cantal
     - GO111MODULE=on
 
 script:

CHANGELOG.md

@@ -1,213 +1,3 @@
-## [v2.2.6](https://github.com/containous/traefik/tree/v2.2.6) (2020-07-17)
-[All Commits](https://github.com/containous/traefik/compare/v2.2.5...v2.2.6)
-
-**Bug fixes:**
-- **[logs]** fix: access logs header names filtering is case insensitive ([#6900](https://github.com/containous/traefik/pull/6900) by [mjeanroy](https://github.com/mjeanroy))
-- **[provider]** Get Entrypoints Port Address without protocol for redirect ([#7047](https://github.com/containous/traefik/pull/7047) by [SantoDE](https://github.com/SantoDE))
-- **[tls]** Fix domain fronting ([#7064](https://github.com/containous/traefik/pull/7064) by [juliens](https://github.com/juliens))
-
-**Documentation:**
-- fix: documentation references. ([#7049](https://github.com/containous/traefik/pull/7049) by [ldez](https://github.com/ldez))
-- Add example for entrypoint on one ip address ([#6483](https://github.com/containous/traefik/pull/6483) by [SimonHeimberg](https://github.com/SimonHeimberg))
-
-## [v2.2.5](https://github.com/containous/traefik/tree/v2.2.5) (2020-07-13)
-[All Commits](https://github.com/containous/traefik/compare/v2.2.4...v2.2.5)
-
-**Bug fixes:**
-- **[k8s,k8s/crd]** fix k8s crd to read contentType middleware into dynamic config ([#7034](https://github.com/containous/traefik/pull/7034) by [johnpekcan](https://github.com/johnpekcan))
-- **[rules,server,tls]** Revert domain fronting fix ([#7039](https://github.com/containous/traefik/pull/7039) by [rtribotte](https://github.com/rtribotte))
-- **[tls]** Fix default value for InsecureSNI when global is not set ([#7037](https://github.com/containous/traefik/pull/7037) by [juliens](https://github.com/juliens))
-
-## [v2.2.4](https://github.com/containous/traefik/tree/v2.2.4) (2020-07-10)
-[All Commits](https://github.com/containous/traefik/compare/v2.2.3...v2.2.4)
-
-**Bug fixes:**
-- **[tls]** Change the default value of insecureSNI ([#7027](https://github.com/containous/traefik/pull/7027) by [jbdoumenjou](https://github.com/jbdoumenjou))
-
-## [v2.2.3](https://github.com/containous/traefik/tree/v2.2.3) (2020-07-09)
-[All Commits](https://github.com/containous/traefik/compare/v2.2.2...v2.2.3)
-
-**Bug fixes:**
-- **[middleware]** Fix panic when using chain middleware. ([#7016](https://github.com/containous/traefik/pull/7016) by [juliens](https://github.com/juliens))
-
-## [v2.2.2](https://github.com/containous/traefik/tree/v2.2.2) (2020-07-08)
-[All Commits](https://github.com/containous/traefik/compare/v2.2.1...v2.2.2)
-
-**Bug fixes:**
-- **[acme]** Update go-acme/lego to v3.8.0 ([#6988](https://github.com/containous/traefik/pull/6988) by [ldez](https://github.com/ldez))
-- **[acme]** Fix triggering multiple concurrent requests to ACME ([#6939](https://github.com/containous/traefik/pull/6939) by [ddtmachado](https://github.com/ddtmachado))
-- **[acme]** Update go-acme/lego to v3.7.0 ([#6792](https://github.com/containous/traefik/pull/6792) by [ldez](https://github.com/ldez))
-- **[acme]** added required quotes to domains config ([#6867](https://github.com/containous/traefik/pull/6867) by [tompson](https://github.com/tompson))
-- **[authentication,logs,middleware]** Provide username in log data on auth failure ([#6827](https://github.com/containous/traefik/pull/6827) by [rtribotte](https://github.com/rtribotte))
-- **[docker]** Use specified network for "container" network mode ([#6763](https://github.com/containous/traefik/pull/6763) by [bjeanes](https://github.com/bjeanes))
-- **[k8s,k8s/crd]** Remove checkStringQuoteValidity in loadIngressRouteConf ([#6775](https://github.com/containous/traefik/pull/6775) by [fefe982](https://github.com/fefe982))
-- **[middleware,websocket]** Fix wss in x-forwarded-proto ([#6752](https://github.com/containous/traefik/pull/6752) by [juliens](https://github.com/juliens))
-- **[middleware]** internal handlers: support for response modifiers ([#6750](https://github.com/containous/traefik/pull/6750) by [mpl](https://github.com/mpl))
-- **[middleware]** Fix ipv6 handling in redirect middleware ([#6902](https://github.com/containous/traefik/pull/6902) by [rtribotte](https://github.com/rtribotte))
-- **[middleware]** refactor X-Forwarded-Proto ([#6863](https://github.com/containous/traefik/pull/6863) by [jcgruenhage](https://github.com/jcgruenhage))
-- **[provider]** Fix race condition issues with provided dynamic configuration ([#6979](https://github.com/containous/traefik/pull/6979) by [kevinpollet](https://github.com/kevinpollet))
-- **[rules,server,tls]** Disable domain fronting ([#7008](https://github.com/containous/traefik/pull/7008) by [rtribotte](https://github.com/rtribotte))
-- **[udp]** Fix mem leak on UDP connections ([#6815](https://github.com/containous/traefik/pull/6815) by [ddtmachado](https://github.com/ddtmachado))
-- **[udp]** Avoid overwriting already received UDP messages ([#6797](https://github.com/containous/traefik/pull/6797) by [cbachert](https://github.com/cbachert))
-- **[webui]** Add missing accessControlAllowOrigin list to middleware view ([#6747](https://github.com/containous/traefik/pull/6747) by [barthez](https://github.com/barthez))
-
-**Documentation:**
-- **[acme]** Fix doc url for Aurora DNS provider ([#6899](https://github.com/containous/traefik/pull/6899) by [rtribotte](https://github.com/rtribotte))
-- **[acme]** Fix acme.md typo ([#6817](https://github.com/containous/traefik/pull/6817) by [juliocc](https://github.com/juliocc))
-- **[acme]** fix certResolver typo ([#6983](https://github.com/containous/traefik/pull/6983) by [DavidBadura](https://github.com/DavidBadura))
-- **[acme]** Fix statement about lego _FILE env var ([#6964](https://github.com/containous/traefik/pull/6964) by [solvaholic](https://github.com/solvaholic))
-- **[acme]** Improve acme CLI options in Let's Encrypt documentation  ([#6762](https://github.com/containous/traefik/pull/6762) by [netoax](https://github.com/netoax))
-- **[docker]** fix a broken link on Docker plugins documentation ([#6908](https://github.com/containous/traefik/pull/6908) by [jbdoumenjou](https://github.com/jbdoumenjou))
-- **[docker]** Fix healthcheck.interval in docs ([#6847](https://github.com/containous/traefik/pull/6847) by [OndrejIT](https://github.com/OndrejIT))
-- **[k8s,k8s/ingress]** Remove redundant paragraph in Kubernetes ingress documentation ([#6806](https://github.com/containous/traefik/pull/6806) by [lpfann](https://github.com/lpfann))
-- **[k8s,k8s/ingress]** Fix sticky cookie ingress annotation doc ([#6938](https://github.com/containous/traefik/pull/6938) by [rtribotte](https://github.com/rtribotte))
-- **[k8s]** fixing typo in Provider KubernetesIngress at Routing documentation ([#6845](https://github.com/containous/traefik/pull/6845) by [sw360cab](https://github.com/sw360cab))
-- **[k8s]** Update kubernetes-crd.md ([#6878](https://github.com/containous/traefik/pull/6878) by [rherrick](https://github.com/rherrick))
-- **[logs]** Fixed incorrect logging parameter in documentation ([#6819](https://github.com/containous/traefik/pull/6819) by [cplewnia](https://github.com/cplewnia))
-- **[logs]** Use "headers" instead of "header" in access log docs ([#6836](https://github.com/containous/traefik/pull/6836) by [bradjones1](https://github.com/bradjones1))
-- **[middleware,k8s/crd]** Fix Headers middleware documentation, usage of proper bool ([#6928](https://github.com/containous/traefik/pull/6928) by [rtribotte](https://github.com/rtribotte))
-- **[middleware]** Improve redirectScheme documentation ([#6769](https://github.com/containous/traefik/pull/6769) by [dtomcej](https://github.com/dtomcej))
-- **[middleware]** Update basicauth.md ([#6967](https://github.com/containous/traefik/pull/6967) by [vitalets](https://github.com/vitalets))
-- Update Dashboard examples and move it after 'Router Rule' section ([#6874](https://github.com/containous/traefik/pull/6874) by [ddtmachado](https://github.com/ddtmachado))
-- Fix log field names in documentation ([#6952](https://github.com/containous/traefik/pull/6952) by [gysel](https://github.com/gysel))
-- Minor fix to Go templating documentation ([#6977](https://github.com/containous/traefik/pull/6977) by [PCM2](https://github.com/PCM2))
-- Add rtribotte to maintainers ([#6936](https://github.com/containous/traefik/pull/6936) by [emilevauge](https://github.com/emilevauge))
-- Update Copyright ([#6795](https://github.com/containous/traefik/pull/6795) by [mmatur](https://github.com/mmatur))
-- fix: dead link. ([#6876](https://github.com/containous/traefik/pull/6876) by [ldez](https://github.com/ldez))
-- Fix v1-> v2 migration: unify domain name in documentation example ([#6904](https://github.com/containous/traefik/pull/6904) by [sinacek](https://github.com/sinacek))
-
-## [v2.2.1](https://github.com/containous/traefik/tree/v2.2.1) (2020-04-29)
-[All Commits](https://github.com/containous/traefik/compare/v2.2.0...v2.2.1)
-
-**Bug fixes:**
-- **[acme]** Update go-acme/lego to v3.6.0 ([#6727](https://github.com/containous/traefik/pull/6727) by [ldez](https://github.com/ldez))
-- **[consulcatalog]** Normalize default names for ConsulCatalog. ([#6593](https://github.com/containous/traefik/pull/6593) by [ldez](https://github.com/ldez))
-- **[internal]** Change the default priority on the router created by the redirect. ([#6588](https://github.com/containous/traefik/pull/6588) by [ldez](https://github.com/ldez))
-- **[k8s,k8s/ingress]** Delete an unnecessary warning log ([#6624](https://github.com/containous/traefik/pull/6624) by [jbdoumenjou](https://github.com/jbdoumenjou))
-- **[middleware]** ratelimit: do not default to ipstrategy too early ([#6713](https://github.com/containous/traefik/pull/6713) by [mpl](https://github.com/mpl))
-- **[rancher,webui]** It's just the one TLS, actually. ([#6606](https://github.com/containous/traefik/pull/6606) by [RealOrangeOne](https://github.com/RealOrangeOne))
-- **[server]** Fix case-sensitive header Sec-Websocket-Version ([#6698](https://github.com/containous/traefik/pull/6698) by [tbrandstetter](https://github.com/tbrandstetter))
-- **[udp]** fix: consider UDP when checking for empty config ([#6683](https://github.com/containous/traefik/pull/6683) by [nrwiersma](https://github.com/nrwiersma))
-- **[websocket]** FIx wS heAder ([#6660](https://github.com/containous/traefik/pull/6660) by [mmatur](https://github.com/mmatur))
-- **[websocket]** Manage case for all Websocket headers ([#6705](https://github.com/containous/traefik/pull/6705) by [mmatur](https://github.com/mmatur))
-- **[webui]** Disable distribution of the WebUI as PWA ([#6717](https://github.com/containous/traefik/pull/6717) by [SantoDE](https://github.com/SantoDE))
-- **[webui]** Add polling for getOverview in toolbar ([#6611](https://github.com/containous/traefik/pull/6611) by [lukashass](https://github.com/lukashass))
-
-**Documentation:**
-- **[api]** Fix documentation about api.insecure defaults ([#6671](https://github.com/containous/traefik/pull/6671) by [thisismydesign](https://github.com/thisismydesign))
-- **[docker,k8s,k8s/ingress,marathon,rancher,sticky-session]** fix: cookie documentation. ([#6745](https://github.com/containous/traefik/pull/6745) by [ldez](https://github.com/ldez))
-- **[file]** Edit code indentation for correct alignment ([#6691](https://github.com/containous/traefik/pull/6691) by [fbruetting](https://github.com/fbruetting))
-- **[healthcheck,k8s,k8s/crd]** Add note about health check in kubernetes ([#6647](https://github.com/containous/traefik/pull/6647) by [mmatur](https://github.com/mmatur))
-- **[k8s,k8s/crd]** docs: Update kubernetes-crd-resource.yml ([#6741](https://github.com/containous/traefik/pull/6741) by [rdxmb](https://github.com/rdxmb))
-- **[k8s,k8s/crd]** doc: improve CRD documentation. ([#6681](https://github.com/containous/traefik/pull/6681) by [ldez](https://github.com/ldez))
-- **[k8s/crd]** doc: add apiVersion for "kind: Middleware" ([#6734](https://github.com/containous/traefik/pull/6734) by [yuyicai](https://github.com/yuyicai))
-- **[k8s/helm]** Update the documentation for helm chart ([#6744](https://github.com/containous/traefik/pull/6744) by [mmatur](https://github.com/mmatur))
-- **[k8s]** Add sentence about the resource namespace and middleware ([#6719](https://github.com/containous/traefik/pull/6719) by [SantoDE](https://github.com/SantoDE))
-- **[kv]** fix KV service docs for http:url and tcp:address ([#6720](https://github.com/containous/traefik/pull/6720) by [bryfry](https://github.com/bryfry))
-- **[logs]** Add Access log chapter for migration v1->v2 ([#6689](https://github.com/containous/traefik/pull/6689) by [MartinKoerner](https://github.com/MartinKoerner))
-- **[middleware]** Update headers.md ([#6675](https://github.com/containous/traefik/pull/6675) by [jamct](https://github.com/jamct))
-- **[middleware]** Doc middleware compress content type ([#6738](https://github.com/containous/traefik/pull/6738) by [rtribotte](https://github.com/rtribotte))
-- **[tracing]** Add link to tracing with elastic ([#6673](https://github.com/containous/traefik/pull/6673) by [collinmutembei](https://github.com/collinmutembei))
-- Added missing text `a yaml file` in Configuration ([#6663](https://github.com/containous/traefik/pull/6663) by [fsoedjede](https://github.com/fsoedjede))
-- Fix typos in the documentation ([#6650](https://github.com/containous/traefik/pull/6650) by [SuperSandro2000](https://github.com/SuperSandro2000))
-- Fix documentation ([#6648](https://github.com/containous/traefik/pull/6648) by [mmatur](https://github.com/mmatur))
-- Fix bad address syntax in Global HTTP to HTTPS redirection v2 TOML ([#6619](https://github.com/containous/traefik/pull/6619) by [Beetix](https://github.com/Beetix))
-- Doc Fix for 2.2 Redirects ([#6595](https://github.com/containous/traefik/pull/6595) by [ajschmidt8](https://github.com/ajschmidt8))
-
-## [v2.2.0](https://github.com/containous/traefik/tree/v2.2.0) (2020-03-25)
-[All Commits](https://github.com/containous/traefik/compare/v2.1.0-rc1...v2.2.0)
-
-**Enhancements:**
-- **[acme,middleware,tls]** Entry point redirection and default routers configuration ([#6417](https://github.com/containous/traefik/pull/6417) by [ldez](https://github.com/ldez))
-- **[consul,etcd,kv,redis,zk]** Add KV store providers (dynamic configuration only) ([#5899](https://github.com/containous/traefik/pull/5899) by [ldez](https://github.com/ldez))
-- **[consulcatalog,docker,marathon,rancher,udp]** Add UDP in providers with labels ([#6327](https://github.com/containous/traefik/pull/6327) by [juliens](https://github.com/juliens))
-- **[docker]** Fix traefik behavior when network_mode is host ([#5698](https://github.com/containous/traefik/pull/5698) by [FuNK3Y](https://github.com/FuNK3Y))
-- **[docker]** Support SSH connection to Docker ([#5969](https://github.com/containous/traefik/pull/5969) by [sh7dm](https://github.com/sh7dm))
-- **[healthcheck]** Do not follow redirects for the health check URLs ([#5147](https://github.com/containous/traefik/pull/5147) by [coder-hugo](https://github.com/coder-hugo))
-- **[k8s,k8s/crd,udp]** Add UDP support in kubernetesCRD provider ([#6348](https://github.com/containous/traefik/pull/6348) by [jbdoumenjou](https://github.com/jbdoumenjou))
-- **[k8s,k8s/crd]** Add TLSStores to Kubernetes CRD ([#6270](https://github.com/containous/traefik/pull/6270) by [dtomcej](https://github.com/dtomcej))
-- **[k8s,k8s/crd]** Add namespace attribute on IngressRouteTCP service ([#6085](https://github.com/containous/traefik/pull/6085) by [jbdoumenjou](https://github.com/jbdoumenjou))
-- **[k8s,k8s/ingress]** Support 'networking.k8s.io/v1beta1' ingress apiVersion ([#6171](https://github.com/containous/traefik/pull/6171) by [ldez](https://github.com/ldez))
-- **[k8s,k8s/ingress]** Update deprecated function call in k8s providers  ([#5241](https://github.com/containous/traefik/pull/5241) by [Wagum](https://github.com/Wagum))
-- **[k8s,k8s/ingress]** Add Ingress annotations support ([#6160](https://github.com/containous/traefik/pull/6160) by [ldez](https://github.com/ldez))
-- **[k8s,k8s/ingress]** systematically call updateIngressStatus ([#6148](https://github.com/containous/traefik/pull/6148) by [mpl](https://github.com/mpl))
-- **[logs,middleware]** Rename the non-exposed field "count" to "size" ([#6048](https://github.com/containous/traefik/pull/6048) by [sylr](https://github.com/sylr))
-- **[logs,middleware]** Add http request scheme to logger ([#6226](https://github.com/containous/traefik/pull/6226) by [valtlfelipe](https://github.com/valtlfelipe))
-- **[logs]** Decrease log level for client related error ([#6204](https://github.com/containous/traefik/pull/6204) by [sylr](https://github.com/sylr))
-- **[metrics]** Add metrics about TLS ([#6255](https://github.com/containous/traefik/pull/6255) by [sylr](https://github.com/sylr))
-- **[middleware]** Add period for rate limiter middleware ([#6055](https://github.com/containous/traefik/pull/6055) by [mpl](https://github.com/mpl))
-- **[middleware]** Let metrics libs handle the atomicity ([#5738](https://github.com/containous/traefik/pull/5738) by [sylr](https://github.com/sylr))
-- **[middleware]** Rework access control origin configuration ([#5996](https://github.com/containous/traefik/pull/5996) by [dtomcej](https://github.com/dtomcej))
-- **[middleware]** Add serial number certificate to forward headers ([#5915](https://github.com/containous/traefik/pull/5915) by [dkijkuit](https://github.com/dkijkuit))
-- **[rancher]** Duration order consistency when multiplying number by time unit ([#5885](https://github.com/containous/traefik/pull/5885) by [maxifom](https://github.com/maxifom))
-- **[server,udp]** UDP support ([#6172](https://github.com/containous/traefik/pull/6172) by [mpl](https://github.com/mpl))
-- **[service]** Use EDF schedule algorithm for WeightedRoundRobin ([#6206](https://github.com/containous/traefik/pull/6206) by [pkumza](https://github.com/pkumza))
-- **[service]** Support mirroring request body ([#6080](https://github.com/containous/traefik/pull/6080) by [dmitriyminer](https://github.com/dmitriyminer))
-- **[tls]** Allow PreferServerCipherSuites as a TLS Option ([#6248](https://github.com/containous/traefik/pull/6248) by [dtomcej](https://github.com/dtomcej))
-- **[tracing]** Update APM client. ([#6152](https://github.com/containous/traefik/pull/6152) by [ldez](https://github.com/ldez))
-- **[tracing]** Elastic APM tracer implementation ([#5870](https://github.com/containous/traefik/pull/5870) by [amine7536](https://github.com/amine7536))
-- **[udp,webui]** WebUI: add udp pages ([#6313](https://github.com/containous/traefik/pull/6313) by [matthieuh](https://github.com/matthieuh))
-- **[webui]** Web UI: Polling on tables ([#5909](https://github.com/containous/traefik/pull/5909) by [matthieuh](https://github.com/matthieuh))
-- **[webui]** Proxy API to Traefik in dev mode ([#5980](https://github.com/containous/traefik/pull/5980) by [sh7dm](https://github.com/sh7dm))
-- **[webui]** Web UI: Table infinite scroll ([#5875](https://github.com/containous/traefik/pull/5875) by [matthieuh](https://github.com/matthieuh))
-- **[webui]** Web UI: Take off logic from generic table component ([#5910](https://github.com/containous/traefik/pull/5910) by [matthieuh](https://github.com/matthieuh))
-- **[webui]** Add dark theme for Web UI ([#6036](https://github.com/containous/traefik/pull/6036) by [sh7dm](https://github.com/sh7dm))
-- Update dependencies ([#6359](https://github.com/containous/traefik/pull/6359) by [ldez](https://github.com/ldez))
-
-**Bug fixes:**
-- **[acme]** Update go-acme/lego to v3.5.0 ([#6491](https://github.com/containous/traefik/pull/6491) by [ldez](https://github.com/ldez))
-- **[authentication,middleware]** digest auth: use RequireAuthStale when appropriate ([#6569](https://github.com/containous/traefik/pull/6569) by [mpl](https://github.com/mpl))
-- **[file]** Revert "Allow fsnotify to reload config files on k8s (or symlinks)" ([#6416](https://github.com/containous/traefik/pull/6416) by [juliens](https://github.com/juliens))
-- **[internal]** Fix entry point redirect behavior ([#6512](https://github.com/containous/traefik/pull/6512) by [ldez](https://github.com/ldez))
-- **[internal]** Router entry points on reload. ([#6444](https://github.com/containous/traefik/pull/6444) by [ldez](https://github.com/ldez))
-- **[k8s,k8s/crd]** Improve kubernetes external name service support ([#6428](https://github.com/containous/traefik/pull/6428) by [rtribotte](https://github.com/rtribotte))
-- **[k8s,k8s/ingress]** fix: Ingress TLS support ([#6504](https://github.com/containous/traefik/pull/6504) by [ldez](https://github.com/ldez))
-- **[k8s,k8s/ingress]** Improvement of the unique name of the router for Ingress. ([#6325](https://github.com/containous/traefik/pull/6325) by [ldez](https://github.com/ldez))
-- **[kv,redis]** Update valkeyrie to fix the support of Redis. ([#6291](https://github.com/containous/traefik/pull/6291) by [ldez](https://github.com/ldez))
-- **[kv]** fix: KV flaky tests. ([#6300](https://github.com/containous/traefik/pull/6300) by [ldez](https://github.com/ldez))
-- **[etcd,kv]** fix: etcd provider name. ([#6212](https://github.com/containous/traefik/pull/6212) by [ldez](https://github.com/ldez))
-- **[middleware]** fix: period field name. ([#6549](https://github.com/containous/traefik/pull/6549) by [ldez](https://github.com/ldez))
-- **[middleware]** fix: custom Host header. ([#6502](https://github.com/containous/traefik/pull/6502) by [ldez](https://github.com/ldez))
-- **[server,udp]** udp: replace concurrently reset timer with ticker ([#6498](https://github.com/containous/traefik/pull/6498) by [mpl](https://github.com/mpl))
-- **[server]** Drop traefik from default entry points. ([#6477](https://github.com/containous/traefik/pull/6477) by [ldez](https://github.com/ldez))
-- **[server]** fix: use MaxInt32. ([#5845](https://github.com/containous/traefik/pull/5845) by [ldez](https://github.com/ldez))
-- **[tracing]** Disable default APM tracer. ([#6410](https://github.com/containous/traefik/pull/6410) by [ldez](https://github.com/ldez))
-- **[udp]** Add missing generated element for UDP. ([#6309](https://github.com/containous/traefik/pull/6309) by [ldez](https://github.com/ldez))
-- **[udp]** Build all UDP services on an entrypoint ([#6329](https://github.com/containous/traefik/pull/6329) by [juliens](https://github.com/juliens))
-
-**Documentation:**
-- **[authentication,middleware]** docs: terminology, replace 'encoded' by 'hashed' ([#6478](https://github.com/containous/traefik/pull/6478) by [debovema](https://github.com/debovema))
-- **[acme]** Doc: fix wrong name of config format ([#6519](https://github.com/containous/traefik/pull/6519) by [Nek-](https://github.com/Nek-))
-- **[docker]** Fix example values for swarmModeRefreshSeconds ([#6460](https://github.com/containous/traefik/pull/6460) by [skjnldsv](https://github.com/skjnldsv))
-- **[k8s,k8s/crd,sticky-session]** docs: clarify multi-levels stickiness ([#6475](https://github.com/containous/traefik/pull/6475) by [mpl](https://github.com/mpl))
-- **[k8s,k8s/crd]** doc: fix terminationDelay word case. ([#6532](https://github.com/containous/traefik/pull/6532) by [ldez](https://github.com/ldez))
-- **[k8s,k8s/crd]** Update the k8s CRD documentation ([#6426](https://github.com/containous/traefik/pull/6426) by [jbdoumenjou](https://github.com/jbdoumenjou))
-- **[k8s,k8s/ingress]** Improve documentation for kubernetes ingress configuration ([#6440](https://github.com/containous/traefik/pull/6440) by [rtribotte](https://github.com/rtribotte))
-- **[k8s/helm]** Update traefik install documentation ([#6466](https://github.com/containous/traefik/pull/6466) by [mmatur](https://github.com/mmatur))
-- **[provider]** Update supported providers list. ([#6190](https://github.com/containous/traefik/pull/6190) by [ldez](https://github.com/ldez))
-- **[tcp,tls]** Specify passthrough for TCP/TLS in its own section ([#6459](https://github.com/containous/traefik/pull/6459) by [mpl](https://github.com/mpl))
-- doc: Use neutral domains. ([#6471](https://github.com/containous/traefik/pull/6471) by [ldez](https://github.com/ldez))
-- doc: fix typo. ([#6472](https://github.com/containous/traefik/pull/6472) by [ldez](https://github.com/ldez))
-- Improve ping documentation. ([#6476](https://github.com/containous/traefik/pull/6476) by [ldez](https://github.com/ldez))
-- Remove  @dduportal from the maintainers team ([#6464](https://github.com/containous/traefik/pull/6464) by [emilevauge](https://github.com/emilevauge))
-- Fix wrong copy/pasted with service name warning ([#6510](https://github.com/containous/traefik/pull/6510) by [Nek-](https://github.com/Nek-))
-- Update migration documentation ([#6447](https://github.com/containous/traefik/pull/6447) by [ldez](https://github.com/ldez))
-- Update version references. ([#6434](https://github.com/containous/traefik/pull/6434) by [ldez](https://github.com/ldez))
-- Fix broken documentation link ([#6430](https://github.com/containous/traefik/pull/6430) by [pbek](https://github.com/pbek))
-
-**Misc:**
-- **[rancher]** Stop using fork of go-rancher-metadata ([#6469](https://github.com/containous/traefik/pull/6469) by [ibuildthecloud](https://github.com/ibuildthecloud))
-- Merge current v2.1 branch into v2.2 ([#6564](https://github.com/containous/traefik/pull/6564) by [ldez](https://github.com/ldez))
-- Merge current v2.1 branch into v2.2 ([#6525](https://github.com/containous/traefik/pull/6525) by [ldez](https://github.com/ldez))
-- Merge current v2.1 branch into v2.2 ([#6516](https://github.com/containous/traefik/pull/6516) by [ldez](https://github.com/ldez))
-- Merge current v2.1 branch into master ([#6429](https://github.com/containous/traefik/pull/6429) by [ldez](https://github.com/ldez))
-- Merge current v2.1 branch into master ([#6409](https://github.com/containous/traefik/pull/6409) by [ldez](https://github.com/ldez))
-- Merge current v2.1 branch into master ([#6302](https://github.com/containous/traefik/pull/6302) by [ldez](https://github.com/ldez))
-- Merge current v2.1 branch into master ([#6216](https://github.com/containous/traefik/pull/6216) by [ldez](https://github.com/ldez))
-- Merge current v2.1 branch into master ([#6138](https://github.com/containous/traefik/pull/6138) by [ldez](https://github.com/ldez))
-- Merge current v2.1 branch into master ([#6004](https://github.com/containous/traefik/pull/6004) by [ldez](https://github.com/ldez))
-- Merge current v2.1 branch into master ([#5933](https://github.com/containous/traefik/pull/5933) by [ldez](https://github.com/ldez))
-
 ## [v2.1.9](https://github.com/containous/traefik/tree/v2.1.9) (2020-03-23)
 [All Commits](https://github.com/containous/traefik/compare/v2.1.8...v2.1.9)
 
@@ -218,46 +8,12 @@
 **Documentation:**
 - Fix tab name ([#6543](https://github.com/containous/traefik/pull/6543) by [mavimo](https://github.com/mavimo))
 
-## [v2.2.0-rc4](https://github.com/containous/traefik/tree/v2.2.0-rc4) (2020-03-19)
-[All Commits](https://github.com/containous/traefik/compare/v2.2.0-rc3...v2.2.0-rc4)
-
-**Documentation:**
-- **[acme]** Doc: fix wrong name of config format ([#6519](https://github.com/containous/traefik/pull/6519) by [Nek-](https://github.com/Nek-))
-
-**Misc:**
-- **[middleware]** Merge current v2.1 branch into v2.2 ([#6525](https://github.com/containous/traefik/pull/6525) by [ldez](https://github.com/ldez))
-
 ## [v2.1.8](https://github.com/containous/traefik/tree/v2.1.8) (2020-03-19)
 [All Commits](https://github.com/containous/traefik/compare/v2.1.7...v2.1.8)
 
 **Bug fixes:**
 - **[middleware,metrics]** Fix memory leak in metrics ([#6522](https://github.com/containous/traefik/pull/6522) by [juliens](https://github.com/juliens))
 
-## [v2.2.0-rc3](https://github.com/containous/traefik/tree/v2.2.0-rc3) (2020-03-18)
-[All Commits](https://github.com/containous/traefik/compare/v2.2.0-rc2...v2.2.0-rc3)
-
-**Enhancements:**
-- **[authentication,middleware]** docs: terminology, replace 'encoded' by 'hashed' ([#6478](https://github.com/containous/traefik/pull/6478) by [debovema](https://github.com/debovema))
-
-**Bug fixes:**
-- **[acme]** Update go-acme/lego to v3.5.0 ([#6491](https://github.com/containous/traefik/pull/6491) by [ldez](https://github.com/ldez))
-- **[internal]** Fix entry point redirect behavior ([#6512](https://github.com/containous/traefik/pull/6512) by [ldez](https://github.com/ldez))
-- **[k8s,k8s/ingress]** fix: Ingress TLS support ([#6504](https://github.com/containous/traefik/pull/6504) by [ldez](https://github.com/ldez))
-- **[middleware]** fix: custom Host header. ([#6502](https://github.com/containous/traefik/pull/6502) by [ldez](https://github.com/ldez))
-- **[server,udp]** udp: replace concurrently reset timer with ticker ([#6498](https://github.com/containous/traefik/pull/6498) by [mpl](https://github.com/mpl))
-- **[server]** Drop traefik from default entry points. ([#6477](https://github.com/containous/traefik/pull/6477) by [ldez](https://github.com/ldez))
-
-**Documentation:**
-- **[k8s,k8s/crd,sticky-session]** docs: clarify multi-levels stickiness ([#6475](https://github.com/containous/traefik/pull/6475) by [mpl](https://github.com/mpl))
-- **[k8s/helm]** Update traefik install documentation ([#6466](https://github.com/containous/traefik/pull/6466) by [mmatur](https://github.com/mmatur))
-- Fix wrong copy/pasted with service name warning ([#6510](https://github.com/containous/traefik/pull/6510) by [Nek-](https://github.com/Nek-))
-- Improve ping documentation. ([#6476](https://github.com/containous/traefik/pull/6476) by [ldez](https://github.com/ldez))
-- doc: fix typo. ([#6472](https://github.com/containous/traefik/pull/6472) by [ldez](https://github.com/ldez))
-- doc: Use neutral domains. ([#6471](https://github.com/containous/traefik/pull/6471) by [ldez](https://github.com/ldez))
-
-**Misc:**
-- **[rancher]** Stop using fork of go-rancher-metadata ([#6469](https://github.com/containous/traefik/pull/6469) by [ibuildthecloud](https://github.com/ibuildthecloud))
-
 ## [v2.1.7](https://github.com/containous/traefik/tree/v2.1.7) (2020-03-18)
 [All Commits](https://github.com/containous/traefik/compare/v2.1.6...v2.1.7)
 
@@ -271,86 +27,6 @@
 - **[acme]** Added wildcard ACME example ([#6423](https://github.com/containous/traefik/pull/6423) by [Basster](https://github.com/Basster))
 - **[acme]** fix typo ([#6408](https://github.com/containous/traefik/pull/6408) by [hamiltont](https://github.com/hamiltont))
 
-## [v2.2.0-rc2](https://github.com/containous/traefik/tree/v2.2.0-rc2) (2020-03-11)
-[All Commits](https://github.com/containous/traefik/compare/v2.2.0-rc1...v2.2.0-rc2)
-
-**Bug fixes:**
-- **[internal]** Router entry points on reload. ([#6444](https://github.com/containous/traefik/pull/6444) by [ldez](https://github.com/ldez))
-- **[k8s,k8s/crd]** Improve kubernetes external name service support ([#6428](https://github.com/containous/traefik/pull/6428) by [rtribotte](https://github.com/rtribotte))
-
-**Documentation:**
-- **[docker]** Fix example values for swarmModeRefreshSeconds ([#6460](https://github.com/containous/traefik/pull/6460) by [skjnldsv](https://github.com/skjnldsv))
-- **[k8s,k8s/ingress]** Improve documentation for kubernetes ingress configuration ([#6440](https://github.com/containous/traefik/pull/6440) by [rtribotte](https://github.com/rtribotte))
-- **[tcp,tls]** Specify passthrough for TCP/TLS in its own section ([#6459](https://github.com/containous/traefik/pull/6459) by [mpl](https://github.com/mpl))
-- Remove  @dduportal from the maintainers team ([#6464](https://github.com/containous/traefik/pull/6464) by [emilevauge](https://github.com/emilevauge))
-- Update migration documentation ([#6447](https://github.com/containous/traefik/pull/6447) by [ldez](https://github.com/ldez))
-- Update version references. ([#6434](https://github.com/containous/traefik/pull/6434) by [ldez](https://github.com/ldez))
-- Fix broken documentation link ([#6430](https://github.com/containous/traefik/pull/6430) by [pbek](https://github.com/pbek))
-
-## [v2.2.0-rc1](https://github.com/containous/traefik/tree/v2.2.0-rc1) (2020-03-05)
-[All Commits](https://github.com/containous/traefik/compare/v2.1.0-rc1...v2.2.0-rc1)
-
-**Enhancements:**
-- **[acme,middleware,tls]** Entry point redirection and default routers configuration ([#6417](https://github.com/containous/traefik/pull/6417) by [ldez](https://github.com/ldez))
-- **[consul,etcd,kv,redis,zk]** Add KV store providers (dynamic configuration only) ([#5899](https://github.com/containous/traefik/pull/5899) by [ldez](https://github.com/ldez))
-- **[consulcatalog,docker,marathon,rancher,udp]** Add UDP in providers with labels ([#6327](https://github.com/containous/traefik/pull/6327) by [juliens](https://github.com/juliens))
-- **[docker]** Fix traefik behavior when network_mode is host ([#5698](https://github.com/containous/traefik/pull/5698) by [FuNK3Y](https://github.com/FuNK3Y))
-- **[docker]** Support SSH connection to Docker ([#5969](https://github.com/containous/traefik/pull/5969) by [sh7dm](https://github.com/sh7dm))
-- **[healthcheck]** Do not follow redirects for the health check URLs ([#5147](https://github.com/containous/traefik/pull/5147) by [coder-hugo](https://github.com/coder-hugo))
-- **[k8s,k8s/crd,udp]** Add UDP support in kubernetesCRD provider ([#6348](https://github.com/containous/traefik/pull/6348) by [jbdoumenjou](https://github.com/jbdoumenjou))
-- **[k8s,k8s/crd]** Add TLSStores to Kubernetes CRD ([#6270](https://github.com/containous/traefik/pull/6270) by [dtomcej](https://github.com/dtomcej))
-- **[k8s,k8s/crd]** Add namespace attribute on IngressRouteTCP service ([#6085](https://github.com/containous/traefik/pull/6085) by [jbdoumenjou](https://github.com/jbdoumenjou))
-- **[k8s,k8s/ingress]** Support 'networking.k8s.io/v1beta1' ingress apiVersion ([#6171](https://github.com/containous/traefik/pull/6171) by [ldez](https://github.com/ldez))
-- **[k8s,k8s/ingress]** Update deprecated function call in k8s providers  ([#5241](https://github.com/containous/traefik/pull/5241) by [Wagum](https://github.com/Wagum))
-- **[k8s,k8s/ingress]** Add Ingress annotations support ([#6160](https://github.com/containous/traefik/pull/6160) by [ldez](https://github.com/ldez))
-- **[k8s,k8s/ingress]** systematically call updateIngressStatus ([#6148](https://github.com/containous/traefik/pull/6148) by [mpl](https://github.com/mpl))
-- **[logs,middleware]** Rename the non-exposed field "count" to "size" ([#6048](https://github.com/containous/traefik/pull/6048) by [sylr](https://github.com/sylr))
-- **[logs,middleware]** Add http request scheme to logger ([#6226](https://github.com/containous/traefik/pull/6226) by [valtlfelipe](https://github.com/valtlfelipe))
-- **[logs]** Decrease log level for client related error ([#6204](https://github.com/containous/traefik/pull/6204) by [sylr](https://github.com/sylr))
-- **[metrics]** Add metrics about TLS ([#6255](https://github.com/containous/traefik/pull/6255) by [sylr](https://github.com/sylr))
-- **[middleware]** Add period for rate limiter middleware ([#6055](https://github.com/containous/traefik/pull/6055) by [mpl](https://github.com/mpl))
-- **[middleware]** Let metrics libs handle the atomicity ([#5738](https://github.com/containous/traefik/pull/5738) by [sylr](https://github.com/sylr))
-- **[middleware]** Rework access control origin configuration ([#5996](https://github.com/containous/traefik/pull/5996) by [dtomcej](https://github.com/dtomcej))
-- **[middleware]** Add serial number certificate to forward headers ([#5915](https://github.com/containous/traefik/pull/5915) by [dkijkuit](https://github.com/dkijkuit))
-- **[rancher]** Duration order consistency when multiplying number by time unit ([#5885](https://github.com/containous/traefik/pull/5885) by [maxifom](https://github.com/maxifom))
-- **[server,udp]** UDP support ([#6172](https://github.com/containous/traefik/pull/6172) by [mpl](https://github.com/mpl))
-- **[service]** Use EDF schedule algorithm for WeightedRoundRobin ([#6206](https://github.com/containous/traefik/pull/6206) by [pkumza](https://github.com/pkumza))
-- **[service]** Support mirroring request body ([#6080](https://github.com/containous/traefik/pull/6080) by [dmitriyminer](https://github.com/dmitriyminer))
-- **[tls]** Allow PreferServerCipherSuites as a TLS Option ([#6248](https://github.com/containous/traefik/pull/6248) by [dtomcej](https://github.com/dtomcej))
-- **[tracing]** Update APM client. ([#6152](https://github.com/containous/traefik/pull/6152) by [ldez](https://github.com/ldez))
-- **[tracing]** Elastic APM tracer implementation ([#5870](https://github.com/containous/traefik/pull/5870) by [amine7536](https://github.com/amine7536))
-- **[udp,webui]** WebUI: add udp pages ([#6313](https://github.com/containous/traefik/pull/6313) by [matthieuh](https://github.com/matthieuh))
-- **[webui]** Web UI: Polling on tables ([#5909](https://github.com/containous/traefik/pull/5909) by [matthieuh](https://github.com/matthieuh))
-- **[webui]** Proxy API to Traefik in dev mode ([#5980](https://github.com/containous/traefik/pull/5980) by [sh7dm](https://github.com/sh7dm))
-- **[webui]** Web UI: Table infinite scroll ([#5875](https://github.com/containous/traefik/pull/5875) by [matthieuh](https://github.com/matthieuh))
-- **[webui]** Web UI: Take off logic from generic table component ([#5910](https://github.com/containous/traefik/pull/5910) by [matthieuh](https://github.com/matthieuh))
-- **[webui]** Add dark theme for Web UI ([#6036](https://github.com/containous/traefik/pull/6036) by [sh7dm](https://github.com/sh7dm))
-- Update dependencies ([#6359](https://github.com/containous/traefik/pull/6359) by [ldez](https://github.com/ldez))
-
-**Bug fixes:**
-- **[etcd,kv]** fix: etcd provider name. ([#6212](https://github.com/containous/traefik/pull/6212) by [ldez](https://github.com/ldez))
-- **[file]** Revert "Allow fsnotify to reload config files on k8s (or symlinks)" ([#6416](https://github.com/containous/traefik/pull/6416) by [juliens](https://github.com/juliens))
-- **[k8s,k8s/ingress]** Improvement of the unique name of the router for Ingress. ([#6325](https://github.com/containous/traefik/pull/6325) by [ldez](https://github.com/ldez))
-- **[kv,redis]** Update valkeyrie to fix the support of Redis. ([#6291](https://github.com/containous/traefik/pull/6291) by [ldez](https://github.com/ldez))
-- **[kv]** fix: KV flaky tests. ([#6300](https://github.com/containous/traefik/pull/6300) by [ldez](https://github.com/ldez))
-- **[server]** fix: use MaxInt32. ([#5845](https://github.com/containous/traefik/pull/5845) by [ldez](https://github.com/ldez))
-- **[tracing]** Disable default APM tracer. ([#6410](https://github.com/containous/traefik/pull/6410) by [ldez](https://github.com/ldez))
-- **[udp]** Add missing generated element for UDP. ([#6309](https://github.com/containous/traefik/pull/6309) by [ldez](https://github.com/ldez))
-- **[udp]** Build all UDP services on an entrypoint ([#6329](https://github.com/containous/traefik/pull/6329) by [juliens](https://github.com/juliens))
-
-**Documentation:**
-- **[k8s,k8s/crd]** Update the k8s CRD documentation ([#6426](https://github.com/containous/traefik/pull/6426) by [jbdoumenjou](https://github.com/jbdoumenjou))
-- **[provider]** Update supported providers list. ([#6190](https://github.com/containous/traefik/pull/6190) by [ldez](https://github.com/ldez))
-
-**Misc:**
-- Merge current v2.1 branch into master ([#6429](https://github.com/containous/traefik/pull/6429) by [ldez](https://github.com/ldez))
-- Merge current v2.1 branch into master ([#6409](https://github.com/containous/traefik/pull/6409) by [ldez](https://github.com/ldez))
-- Merge current v2.1 branch into master ([#6302](https://github.com/containous/traefik/pull/6302) by [ldez](https://github.com/ldez))
-- Merge current v2.1 branch into master ([#6216](https://github.com/containous/traefik/pull/6216) by [ldez](https://github.com/ldez))
-- Merge current v2.1 branch into master ([#6138](https://github.com/containous/traefik/pull/6138) by [ldez](https://github.com/ldez))
-- Merge current v2.1 branch into master ([#6004](https://github.com/containous/traefik/pull/6004) by [ldez](https://github.com/ldez))
-- Merge current v2.1 branch into master ([#5933](https://github.com/containous/traefik/pull/5933) by [ldez](https://github.com/ldez))
-
 ## [v2.1.6](https://github.com/containous/traefik/tree/v2.1.6) (2020-02-28)
 [All Commits](https://github.com/containous/traefik/compare/v2.1.4...v2.1.6)
 

Makefile

@@ -31,9 +31,8 @@ TRAEFIK_ENVS := \
 
 TRAEFIK_MOUNT := -v "$(CURDIR)/$(BIND_DIR):/go/src/github.com/containous/traefik/$(BIND_DIR)"
 DOCKER_RUN_OPTS := $(TRAEFIK_ENVS) $(TRAEFIK_MOUNT) "$(TRAEFIK_DEV_IMAGE)"
-DOCKER_NON_INTERACTIVE ?= false
-DOCKER_RUN_TRAEFIK := docker run --add-host=host.docker.internal:127.0.0.1 $(INTEGRATION_OPTS) $(if $(DOCKER_NON_INTERACTIVE), , -it) $(DOCKER_RUN_OPTS)
-DOCKER_RUN_TRAEFIK_NOTTY := docker run $(INTEGRATION_OPTS) $(if $(DOCKER_NON_INTERACTIVE), , -i) $(DOCKER_RUN_OPTS)
+DOCKER_RUN_TRAEFIK := docker run $(INTEGRATION_OPTS) -it $(DOCKER_RUN_OPTS)
+DOCKER_RUN_TRAEFIK_NOTTY := docker run $(INTEGRATION_OPTS) -i $(DOCKER_RUN_OPTS)
 
 PRE_TARGET ?= build-dev-image
 

build.Dockerfile

@@ -19,10 +19,10 @@ RUN mkdir -p /usr/local/bin \
     && chmod +x /usr/local/bin/go-bindata
 
 # Download golangci-lint binary to bin folder in $GOPATH
-RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.28.0
+RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.23.8
 
-# Download misspell binary to bin folder in $GOPATH
-RUN  curl -sfL https://raw.githubusercontent.com/client9/misspell/master/install-misspell.sh | bash -s -- -b $GOPATH/bin v0.3.4
+# Download golangci-lint and misspell binary to bin folder in $GOPATH
+RUN GO111MODULE=off go get github.com/client9/misspell/cmd/misspell
 
 # Download goreleaser binary to bin folder in $GOPATH
 RUN curl -sfL https://install.goreleaser.com/github.com/goreleaser/goreleaser.sh | sh

cmd/context.go

@@ -7,7 +7,7 @@ import (
 	"syscall"
 )
 
-// ContextWithSignal creates a context canceled when SIGINT or SIGTERM are notified.
+// ContextWithSignal creates a context canceled when SIGINT or SIGTERM are notified
 func ContextWithSignal(ctx context.Context) context.Context {
 	newCtx, cancel := context.WithCancel(ctx)
 	signals := make(chan os.Signal)

cmd/healthcheck/healthcheck.go

@@ -45,7 +45,7 @@ func runCmd(traefikConfiguration *static.Configuration) func(_ []string) error {
 	}
 }
 
-// Do try to do a healthcheck.
+// Do try to do a healthcheck
 func Do(staticConfiguration static.Configuration) (*http.Response, error) {
 	if staticConfiguration.Ping == nil {
 		return nil, errors.New("please enable `ping` to use health check")
@@ -75,5 +75,5 @@ func Do(staticConfiguration static.Configuration) (*http.Response, error) {
 
 	path := "/"
 
-	return client.Head(protocol + "://" + pingEntryPoint.GetAddress() + path + "ping")
+	return client.Head(protocol + "://" + pingEntryPoint.Address + path + "ping")
 }

cmd/traefik/traefik.go

@@ -7,7 +7,6 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
-	"sort"
 	"strings"
 	"time"
 
@@ -178,11 +177,6 @@ func setupServer(staticConfiguration *static.Configuration) (*server.Server, err
 		return nil, err
 	}
 
-	serverEntryPointsUDP, err := server.NewUDPEntryPoints(staticConfiguration.EntryPoints)
-	if err != nil {
-		return nil, err
-	}
-
 	ctx := context.Background()
 	routinesPool := safe.NewPool(ctx)
 
@@ -190,29 +184,9 @@ func setupServer(staticConfiguration *static.Configuration) (*server.Server, err
 	accessLog := setupAccessLog(staticConfiguration.AccessLog)
 	chainBuilder := middleware.NewChainBuilder(*staticConfiguration, metricsRegistry, accessLog)
 	managerFactory := service.NewManagerFactory(*staticConfiguration, routinesPool, metricsRegistry)
-	routerFactory := server.NewRouterFactory(*staticConfiguration, managerFactory, tlsManager, chainBuilder)
+	tcpRouterFactory := server.NewTCPRouterFactory(*staticConfiguration, managerFactory, tlsManager, chainBuilder)
 
-	var defaultEntryPoints []string
-	for name, cfg := range staticConfiguration.EntryPoints {
-		protocol, err := cfg.GetProtocol()
-		if err != nil {
-			// Should never happen because Traefik should not start if protocol is invalid.
-			log.WithoutContext().Errorf("Invalid protocol: %v", err)
-		}
-
-		if protocol != "udp" && name != static.DefaultInternalEntryPointName {
-			defaultEntryPoints = append(defaultEntryPoints, name)
-		}
-	}
-
-	sort.Strings(defaultEntryPoints)
-
-	watcher := server.NewConfigurationWatcher(
-		routinesPool,
-		providerAggregator,
-		time.Duration(staticConfiguration.Providers.ProvidersThrottleDuration),
-		defaultEntryPoints,
-	)
+	watcher := server.NewConfigurationWatcher(routinesPool, providerAggregator, time.Duration(staticConfiguration.Providers.ProvidersThrottleDuration))
 
 	watcher.AddListener(func(conf dynamic.Configuration) {
 		ctx := context.Background()
@@ -224,7 +198,7 @@ func setupServer(staticConfiguration *static.Configuration) (*server.Server, err
 		metricsRegistry.LastConfigReloadSuccessGauge().Set(float64(time.Now().Unix()))
 	})
 
-	watcher.AddListener(switchRouter(routerFactory, acmeProviders, serverEntryPointsTCP, serverEntryPointsUDP))
+	watcher.AddListener(switchRouter(tcpRouterFactory, acmeProviders, serverEntryPointsTCP))
 
 	watcher.AddListener(func(conf dynamic.Configuration) {
 		if metricsRegistry.IsEpEnabled() || metricsRegistry.IsSvcEnabled() {
@@ -255,12 +229,12 @@ func setupServer(staticConfiguration *static.Configuration) (*server.Server, err
 		}
 	})
 
-	return server.NewServer(routinesPool, serverEntryPointsTCP, serverEntryPointsUDP, watcher, chainBuilder, accessLog), nil
+	return server.NewServer(routinesPool, serverEntryPointsTCP, watcher, chainBuilder, accessLog), nil
 }
 
-func switchRouter(routerFactory *server.RouterFactory, acmeProviders []*acme.Provider, serverEntryPointsTCP server.TCPEntryPoints, serverEntryPointsUDP server.UDPEntryPoints) func(conf dynamic.Configuration) {
+func switchRouter(tcpRouterFactory *server.TCPRouterFactory, acmeProviders []*acme.Provider, serverEntryPointsTCP server.TCPEntryPoints) func(conf dynamic.Configuration) {
 	return func(conf dynamic.Configuration) {
-		routers, udpRouters := routerFactory.CreateRouters(conf)
+		routers := tcpRouterFactory.CreateTCPRouters(conf)
 		for entryPointName, rt := range routers {
 			for _, p := range acmeProviders {
 				if p != nil && p.HTTPChallenge != nil && p.HTTPChallenge.EntryPoint == entryPointName {
@@ -270,11 +244,10 @@ func switchRouter(routerFactory *server.RouterFactory, acmeProviders []*acme.Pro
 			}
 		}
 		serverEntryPointsTCP.Switch(routers)
-		serverEntryPointsUDP.Switch(udpRouters)
 	}
 }
 
-// initACMEProvider creates an acme provider from the ACME part of globalConfiguration.
+// initACMEProvider creates an acme provider from the ACME part of globalConfiguration
 func initACMEProvider(c *static.Configuration, providerAggregator *aggregator.ProviderAggregator, tlsManager *traefiktls.Manager) []*acme.Provider {
 	challengeStore := acme.NewLocalChallengeStore()
 	localStores := map[string]*acme.LocalStore{}
@@ -403,7 +376,7 @@ func configureLogging(staticConfiguration *static.Configuration) {
 	if len(logFile) > 0 {
 		dir := filepath.Dir(logFile)
 
-		if err := os.MkdirAll(dir, 0o755); err != nil {
+		if err := os.MkdirAll(dir, 0755); err != nil {
 			log.WithoutContext().Errorf("Failed to create log path %s: %s", dir, err)
 		}
 

cmd/version/version.go

@@ -17,7 +17,7 @@ Go version:   {{.GoVersion}}
 Built:        {{.BuildTime}}
 OS/Arch:      {{.Os}}/{{.Arch}}`
 
-// NewCmd builds a new Version command.
+// NewCmd builds a new Version command
 func NewCmd() *cli.Command {
 	return &cli.Command{
 		Name:          "version",
@@ -33,7 +33,7 @@ func NewCmd() *cli.Command {
 	}
 }
 
-// GetPrint write Printable version.
+// GetPrint write Printable version
 func GetPrint(wr io.Writer) error {
 	tmpl, err := template.New("").Parse(versionTemplate)
 	if err != nil {

docs/check.Dockerfile

@@ -1,5 +1,4 @@
-
-FROM alpine:3.10 as alpine
+FROM alpine:3.15 as alpine
 
 RUN apk --no-cache --no-progress add \
     libcurl \
@@ -9,7 +8,7 @@ RUN apk --no-cache --no-progress add \
     ruby-ffi \
     ruby-json \
     ruby-nokogiri
-RUN gem install html-proofer --version 3.13.0 --no-document -- --use-system-libraries
+RUN gem install html-proofer --version 3.19.3 --no-document -- --use-system-libraries
 
 # After Ruby, some NodeJS YAY!
 RUN apk --no-cache --no-progress add \

docs/content/contributing/building-testing.md

@@ -16,8 +16,6 @@ For changes to its dependencies, the `dep` dependency management tool is require
 Run make with the `binary` target.
 This will create binaries for the Linux platform in the `dist` folder.
 
-In case when you run build on CI, you may probably want to run docker in non-interactive mode. To achieve that define `DOCKER_NON_INTERACTIVE=true` environment variable.
-
 ```bash
 $ make binary
 docker build -t traefik-webui -f webui/Dockerfile webui
@@ -30,7 +28,7 @@ Successfully tagged traefik-webui:latest
 [...]
 docker build  -t "traefik-dev:4475--feature-documentation" -f build.Dockerfile .
 Sending build context to Docker daemon    279MB
-Step 1/10 : FROM golang:1.14-alpine
+Step 1/10 : FROM golang:1.13-alpine
  ---> f4bfb3d22bda
 [...]
 Successfully built 5c3c1a911277

docs/content/contributing/maintainers.md

@@ -15,8 +15,8 @@
 * Michaël Matur [@mmatur](https://github.com/mmatur)
 * Gérald Croës [@geraldcroes](https://github.com/geraldcroes)
 * Jean-Baptiste Doumenjou [@jbdoumenjou](https://github.com/jbdoumenjou)
+* Damien Duportal [@dduportal](https://github.com/dduportal)
 * Mathieu Lonjaret [@mpl](https://github.com/mpl)
-* Romain Tribotté [@rtribotte](https://github.com/rtribotte)
 
 ## Contributions Daily Meeting
 

docs/content/getting-started/install-traefik.md

@@ -3,17 +3,17 @@
 You can install Traefik with the following flavors:
 
 * [Use the official Docker image](./#use-the-official-docker-image)
-* [Use the Helm Chart](./#use-the-helm-chart)
+* [(Experimental) Use the Helm Chart](./#use-the-helm-chart)
 * [Use the binary distribution](./#use-the-binary-distribution)
 * [Compile your binary from the sources](./#compile-your-binary-from-the-sources)
 
 ## Use the Official Docker Image
 
-Choose one of the [official Docker images](https://hub.docker.com/_/traefik) and run it with the [sample configuration file](https://raw.githubusercontent.com/containous/traefik/v2.2/traefik.sample.toml):
+Choose one of the [official Docker images](https://hub.docker.com/_/traefik) and run it with the [sample configuration file](https://raw.githubusercontent.com/containous/traefik/v2.1/traefik.sample.toml):
 
 ```bash
 docker run -d -p 8080:8080 -p 80:80 \
-    -v $PWD/traefik.toml:/etc/traefik/traefik.toml traefik:v2.2
+    -v $PWD/traefik.toml:/etc/traefik/traefik.toml traefik:v2.1
 ```
 
 For more details, go to the [Docker provider documentation](../providers/docker.md)
@@ -27,104 +27,67 @@ For more details, go to the [Docker provider documentation](../providers/docker.
 
 ## Use the Helm Chart
 
-!!! warning
+!!! warning "Experimental Helm Chart"
     
-    The Traefik Chart from 
+    Please note that the Helm Chart for Traefik v2 is still experimental.
+    
+    The Traefik Stable Chart from 
     [Helm's default charts repository](https://github.com/helm/charts/tree/master/stable/traefik) is still using [Traefik v1.7](https://docs.traefik.io/v1.7).
 
-Traefik can be installed in Kubernetes using the Helm chart from <https://github.com/containous/traefik-helm-chart>.
+Traefik can be installed in Kubernetes using the v2.0 Helm chart from <https://github.com/containous/traefik-helm-chart>.
 
 Ensure that the following requirements are met:
 
 * Kubernetes 1.14+
-* Helm version 3.x is [installed](https://helm.sh/docs/intro/install/)
+* Helm version 2.x is [installed](https://v2.helm.sh/docs/using_helm/) and initialized with Tiller
 
-Add Traefik's chart repository to Helm:
+Retrieve the latest chart version from the repository:
 
 ```bash
-helm repo add traefik https://containous.github.io/traefik-helm-chart
-```
-
-You can update the chart repository by running:
-
-```bash
-helm repo update
+# Retrieve Chart from the repository
+git clone https://github.com/containous/traefik-helm-chart
 ```
 
 And install it with the `helm` command line:
 
 ```bash
-helm install traefik traefik/traefik
+helm install ./traefik-helm-chart
 ```
 
 !!! tip "Helm Features"
     
-    All [Helm features](https://helm.sh/docs/intro/using_helm/) are supported.
+    All [Helm features](https://v2.helm.sh/docs/using_helm/#using-helm) are supported.
     For instance, installing the chart in a dedicated namespace:
 
     ```bash tab="Install in a Dedicated Namespace"
-    kubectl create ns traefik-v2
     # Install in the namespace "traefik-v2"
     helm install --namespace=traefik-v2 \
-        traefik traefik/traefik
+        ./traefik-helm-chart
     ```
 
 ??? example "Installing with Custom Values"
     
     You can customize the installation by specifying custom values,
-    as with [any helm chart](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing).
+    as with [any helm chart](https://v2.helm.sh/docs/using_helm/#customizing-the-chart-before-installing).
     {: #helm-custom-values }
     
     The values are not (yet) documented, but are self-explanatory:
     you can look at the [default `values.yaml`](https://github.com/containous/traefik-helm-chart/blob/master/traefik/values.yaml) file to explore possibilities.
     
-    You can also set Traefik command line flags using `additionalArguments`.
     Example of installation with logging set to `DEBUG`:
     
     ```bash tab="Using Helm CLI"
     helm install --namespace=traefik-v2 \
-        --set="additionalArguments={--log.level=DEBUG}" \
-        traefik traefik/traefik
+        --set="logs.loglevel=DEBUG" \
+        ./traefik-helm-chart
     ```
     
     ```yml tab="With a custom values file"
     # File custom-values.yml
-    ## Install with "helm install --values=./custom-values.yml traefik traefik/traefik
-    additionalArguments:
-      - "--log.level=DEBUG"
+    ## Install with "helm install --values=./custom-values.yml ./traefik-helm-chart
+    logs:
+        loglevel: DEBUG
     ```
-    
-### Exposing the Traefik dashboard
-
-This HelmChart does not expose the Traefik dashboard by default, for security concerns.
-Thus, there are multiple ways to expose the dashboard.
-For instance, the dashboard access could be achieved through a port-forward :
-
-```shell
-kubectl port-forward $(kubectl get pods --selector "app.kubernetes.io/name=traefik" --output=name) 9000:9000
-```
-
-Accessible with the url: http://127.0.0.1:9000/dashboard/
-
-Another way would be to apply your own configuration, for instance,
-by defining and applying an IngressRoute CRD (`kubectl apply -f dashboard.yaml`):
-
-```yaml
-# dashboard.yaml
-apiVersion: traefik.containo.us/v1alpha1
-kind: IngressRoute
-metadata:
-  name: dashboard
-spec:
-  entryPoints:
-    - web
-  routes:
-    - match: Host(`traefik.localhost`) && (PathPrefix(`/dashboard`) || PathPrefix(`/api`))
-      kind: Rule
-      services:
-        - name: api@internal
-          kind: TraefikService
-```
 
 ## Use the Binary Distribution
 

docs/content/getting-started/quick-start.md

@@ -15,7 +15,7 @@ version: '3'
 services:
   reverse-proxy:
     # The official v2 Traefik docker image
-    image: traefik:v2.2
+    image: traefik:v2.1
     # Enables the web UI and tells Traefik to listen to docker
     command: --api.insecure=true --providers.docker
     ports:

docs/content/https/acme.md

@@ -79,7 +79,7 @@ Please check the [configuration examples below](#configuration-examples) for mor
         address = ":443"
     
     [certificatesResolvers.myresolver.acme]
-      email = "your-email@example.com"
+      email = "your-email@your-domain.org"
       storage = "acme.json"
       [certificatesResolvers.myresolver.acme.httpChallenge]
         # used during the challenge
@@ -97,7 +97,7 @@ Please check the [configuration examples below](#configuration-examples) for mor
     certificatesResolvers:
       myresolver:
         acme:
-          email: your-email@example.com
+          email: your-email@your-domain.org
           storage: acme.json
           httpChallenge:
             # used during the challenge
@@ -105,33 +105,33 @@ Please check the [configuration examples below](#configuration-examples) for mor
     ```
     
     ```bash tab="CLI"
-    --entrypoints.web.address=:80
-    --entrypoints.websecure.address=:443
+    --entryPoints.web.address=:80
+    --entryPoints.websecure.address=:443
     # ...
-    --certificatesresolvers.myresolver.acme.email=your-email@example.com
-    --certificatesresolvers.myresolver.acme.storage=acme.json
+    --certificatesResolvers.myresolver.acme.email=your-email@your-domain.org
+    --certificatesResolvers.myresolver.acme.storage=acme.json
     # used during the challenge
-    --certificatesresolvers.myresolver.acme.httpchallenge.entrypoint=web
+    --certificatesResolvers.myresolver.acme.httpChallenge.entryPoint=web
     ```
 
 !!! important "Defining a certificates resolver does not result in all routers automatically using it. Each router that is supposed to use the resolver must [reference](../routing/routers/index.md#certresolver) it."
 
 ??? example "Single Domain from Router's Rule Example"
     
-    * A certificate for the domain `example.com` is requested:
+    * A certificate for the domain `company.com` is requested:
 
     --8<-- "content/https/include-acme-single-domain-example.md"
 
 ??? example "Multiple Domains from Router's Rule Example"
  
-    * A certificate for the domains `example.com` (main) and `blog.example.org`
+    * A certificate for the domains `company.com` (main) and `blog.company.org`
       is requested:
     
     --8<-- "content/https/include-acme-multiple-domains-from-rule-example.md"
     
 ??? example "Multiple Domains from Router's `tls.domain` Example"
 
-    * A certificate for the domains `example.com` (main) and `*.example.org` (SAN)
+    * A certificate for the domains `company.com` (main) and `*.company.org` (SAN)
       is requested:
       
     --8<-- "content/https/include-acme-multiple-domains-example.md"
@@ -181,7 +181,7 @@ when using the `TLS-ALPN-01` challenge, Traefik must be reachable by Let's Encry
     
     ```bash tab="CLI"
     # ...
-    --certificatesresolvers.myresolver.acme.tlschallenge=true
+    --certificatesResolvers.myresolver.acme.tlsChallenge=true
     ```
 
 ### `httpChallenge`
@@ -189,7 +189,7 @@ when using the `TLS-ALPN-01` challenge, Traefik must be reachable by Let's Encry
 Use the `HTTP-01` challenge to generate and renew ACME certificates by provisioning an HTTP resource under a well-known URI.
 
 As described on the Let's Encrypt [community forum](https://community.letsencrypt.org/t/support-for-ports-other-than-80-and-443/3419/72),
-when using the `HTTP-01` challenge, `certificatesresolvers.myresolver.acme.httpchallenge.entrypoint` must be reachable by Let's Encrypt through port 80.
+when using the `HTTP-01` challenge, `certificatesResolvers.myresolver.acme.httpChallenge.entryPoint` must be reachable by Let's Encrypt through port 80.
 
 ??? example "Using an EntryPoint Called web for the `httpChallenge`"
 
@@ -224,10 +224,10 @@ when using the `HTTP-01` challenge, `certificatesresolvers.myresolver.acme.httpc
     ```
     
     ```bash tab="CLI"
-    --entrypoints.web.address=:80
-    --entrypoints.websecure.address=:443
+    --entryPoints.web.address=:80
+    --entryPoints.websecure.address=:443
     # ...
-    --certificatesresolvers.myresolver.acme.httpchallenge.entrypoint=web
+    --certificatesResolvers.myresolver.acme.httpChallenge.entryPoint=web
     ```
 
 !!! info ""
@@ -261,8 +261,8 @@ Use the `DNS-01` challenge to generate and renew ACME certificates by provisioni
     
     ```bash tab="CLI"
     # ...
-    --certificatesresolvers.myresolver.acme.dnschallenge.provider=digitalocean
-    --certificatesresolvers.myresolver.acme.dnschallenge.delaybeforecheck=0
+    --certificatesResolvers.myresolver.acme.dnsChallenge.provider=digitalocean
+    --certificatesResolvers.myresolver.acme.dnsChallenge.delayBeforeCheck=0
     # ...
     ```
 
@@ -275,29 +275,24 @@ Here is a list of supported `providers`, that can automate the DNS verification,
 along with the required environment variables and their [wildcard & root domain support](#wildcard-domains).
 Do not hesitate to complete it.
 
-Many lego environment variables can be overridden by their respective `_FILE` counterpart, which should have a filepath to a file that contains the secret as its value.
+Every lego environment variable can be overridden by their respective `_FILE` counterpart, which should have a filepath to a file that contains the secret as its value.
 For example, `CF_API_EMAIL_FILE=/run/secrets/traefik_cf-api-email` could be used to provide a Cloudflare API email address as a Docker secret named `traefik_cf-api-email`.
 
-For complete details, refer to your provider's _Additional configuration_ link.
-
 | Provider Name                                               | Provider Code  | Environment Variables                                                                                                                       |                                                                             |
 |-------------------------------------------------------------|----------------|---------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------|
 | [ACME DNS](https://github.com/joohoi/acme-dns)              | `acme-dns`     | `ACME_DNS_API_BASE`, `ACME_DNS_STORAGE_PATH`                                                                                                | [Additional configuration](https://go-acme.github.io/lego/dns/acme-dns)     |
 | [Alibaba Cloud](https://www.alibabacloud.com)               | `alidns`       | `ALICLOUD_ACCESS_KEY`, `ALICLOUD_SECRET_KEY`, `ALICLOUD_REGION_ID`                                                                          | [Additional configuration](https://go-acme.github.io/lego/dns/alidns)       |
-| [ArvanCloud](https://arvancloud.com)                        | `arvancloud`   | `ARVANCLOUD_API_KEY`                                                                                                                        | [Additional configuration](https://go-acme.github.io/lego/dns/arvancloud)   |
-| [Auroradns](https://www.pcextreme.com/dns-health-checks)    | `auroradns`    | `AURORA_USER_ID`, `AURORA_KEY`, `AURORA_ENDPOINT`                                                                                           | [Additional configuration](https://go-acme.github.io/lego/dns/auroradns)    |
+| [Auroradns](https://www.pcextreme.com/aurora/dns)           | `auroradns`    | `AURORA_USER_ID`, `AURORA_KEY`, `AURORA_ENDPOINT`                                                                                           | [Additional configuration](https://go-acme.github.io/lego/dns/auroradns)    |
 | [Autodns](https://www.internetx.com/domains/autodns/)       | `autodns`      | `AUTODNS_API_USER`, `AUTODNS_API_PASSWORD`                                                                                                  | [Additional configuration](https://go-acme.github.io/lego/dns/autodns)      |
 | [Azure](https://azure.microsoft.com/services/dns/)          | `azure`        | `AZURE_CLIENT_ID`, `AZURE_CLIENT_SECRET`, `AZURE_SUBSCRIPTION_ID`, `AZURE_TENANT_ID`, `AZURE_RESOURCE_GROUP`, `[AZURE_METADATA_ENDPOINT]`   | [Additional configuration](https://go-acme.github.io/lego/dns/azure)        |
 | [Bindman](https://github.com/labbsr0x/bindman-dns-webhook)  | `bindman`      | `BINDMAN_MANAGER_ADDRESS`                                                                                                                   | [Additional configuration](https://go-acme.github.io/lego/dns/bindman)      |
 | [Blue Cat](https://www.bluecatnetworks.com/)                | `bluecat`      | `BLUECAT_SERVER_URL`, `BLUECAT_USER_NAME`, `BLUECAT_PASSWORD`, `BLUECAT_CONFIG_NAME`, `BLUECAT_DNS_VIEW`                                    | [Additional configuration](https://go-acme.github.io/lego/dns/bluecat)      |
 | [Checkdomain](https://www.checkdomain.de/)                  | `checkdomain`  | `CHECKDOMAIN_TOKEN`,                                                                                                                        | [Additional configuration](https://go-acme.github.io/lego/dns/checkdomain/) |
-| [CloudDNS](https://vshosting.eu/)                           | `clouddns`     | `CLOUDDNS_CLIENT_ID`, `CLOUDDNS_EMAIL`, `CLOUDDNS_PASSWORD`                                                                                 | [Additional configuration](https://go-acme.github.io/lego/dns/clouddns)     |
 | [ClouDNS](https://www.cloudns.net/)                         | `cloudns`      | `CLOUDNS_AUTH_ID`, `CLOUDNS_AUTH_PASSWORD`                                                                                                  | [Additional configuration](https://go-acme.github.io/lego/dns/cloudns)      |
 | [Cloudflare](https://www.cloudflare.com)                    | `cloudflare`   | `CF_API_EMAIL`, `CF_API_KEY` [^5] or `CF_DNS_API_TOKEN`, `[CF_ZONE_API_TOKEN]`                                                              | [Additional configuration](https://go-acme.github.io/lego/dns/cloudflare)   |
 | [CloudXNS](https://www.cloudxns.net)                        | `cloudxns`     | `CLOUDXNS_API_KEY`, `CLOUDXNS_SECRET_KEY`                                                                                                   | [Additional configuration](https://go-acme.github.io/lego/dns/cloudxns)     |
 | [ConoHa](https://www.conoha.jp)                             | `conoha`       | `CONOHA_TENANT_ID`, `CONOHA_API_USERNAME`, `CONOHA_API_PASSWORD`                                                                            | [Additional configuration](https://go-acme.github.io/lego/dns/conoha)       |
 | [Constellix](https://constellix.com)                        | `constellix`   | `CONSTELLIX_API_KEY`, `CONSTELLIX_SECRET_KEY`                                                                                               | [Additional configuration](https://go-acme.github.io/lego/dns/constellix)   |
-| [deSEC](https://desec.io)                                   | `desec`        | `DESEC_TOKEN`                                                                                                                               | [Additional configuration](https://go-acme.github.io/lego/dns/desec)        |
 | [DigitalOcean](https://www.digitalocean.com)                | `digitalocean` | `DO_AUTH_TOKEN`                                                                                                                             | [Additional configuration](https://go-acme.github.io/lego/dns/digitalocean) |
 | [DNSimple](https://dnsimple.com)                            | `dnsimple`     | `DNSIMPLE_OAUTH_TOKEN`, `DNSIMPLE_BASE_URL`                                                                                                 | [Additional configuration](https://go-acme.github.io/lego/dns/dnsimple)     |
 | [DNS Made Easy](https://dnsmadeeasy.com)                    | `dnsmadeeasy`  | `DNSMADEEASY_API_KEY`, `DNSMADEEASY_API_SECRET`, `DNSMADEEASY_SANDBOX`                                                                      | [Additional configuration](https://go-acme.github.io/lego/dns/dnsmadeeasy)  |
@@ -306,7 +301,6 @@ For complete details, refer to your provider's _Additional configuration_ link.
 | [DreamHost](https://www.dreamhost.com/)                     | `dreamhost`    | `DREAMHOST_API_KEY`                                                                                                                         | [Additional configuration](https://go-acme.github.io/lego/dns/dreamhost)    |
 | [Duck DNS](https://www.duckdns.org/)                        | `duckdns`      | `DUCKDNS_TOKEN`                                                                                                                             | [Additional configuration](https://go-acme.github.io/lego/dns/duckdns)      |
 | [Dyn](https://dyn.com)                                      | `dyn`          | `DYN_CUSTOMER_NAME`, `DYN_USER_NAME`, `DYN_PASSWORD`                                                                                        | [Additional configuration](https://go-acme.github.io/lego/dns/dyn)          |
-| [Dynu](https://www.dynu.com)                                | `dynu`         | `DYNU_API_KEY`                                                                                                                              | [Additional configuration](https://go-acme.github.io/lego/dns/dynu)         |
 | [EasyDNS](https://easydns.com/)                             | `easydns`      | `EASYDNS_TOKEN`, `EASYDNS_KEY`                                                                                                              | [Additional configuration](https://go-acme.github.io/lego/dns/easydns)      |
 | External Program                                            | `exec`         | `EXEC_PATH`                                                                                                                                 | [Additional configuration](https://go-acme.github.io/lego/dns/exec)         |
 | [Exoscale](https://www.exoscale.com)                        | `exoscale`     | `EXOSCALE_API_KEY`, `EXOSCALE_API_SECRET`, `EXOSCALE_ENDPOINT`                                                                              | [Additional configuration](https://go-acme.github.io/lego/dns/exoscale)     |
@@ -316,7 +310,6 @@ For complete details, refer to your provider's _Additional configuration_ link.
 | [Glesys](https://glesys.com/)                               | `glesys`       | `GLESYS_API_USER`, `GLESYS_API_KEY`, `GLESYS_DOMAIN`                                                                                        | [Additional configuration](https://go-acme.github.io/lego/dns/glesys)       |
 | [GoDaddy](https://godaddy.com/)                             | `godaddy`      | `GODADDY_API_KEY`, `GODADDY_API_SECRET`                                                                                                     | [Additional configuration](https://go-acme.github.io/lego/dns/godaddy)      |
 | [Google Cloud DNS](https://cloud.google.com/dns/docs/)      | `gcloud`       | `GCE_PROJECT`, Application Default Credentials [^2] [^3], [`GCE_SERVICE_ACCOUNT_FILE`]                                                      | [Additional configuration](https://go-acme.github.io/lego/dns/gcloud)       |
-| [Hetzner](https://hetzner.com)                              | `hetzner`      | `HETZNER_API_KEY`                                                                                                                           | [Additional configuration](https://go-acme.github.io/lego/dns/hetzner)      |
 | [hosting.de](https://www.hosting.de)                        | `hostingde`    | `HOSTINGDE_API_KEY`, `HOSTINGDE_ZONE_NAME`                                                                                                  | [Additional configuration](https://go-acme.github.io/lego/dns/hostingde)    |
 | HTTP request                                                | `httpreq`      | `HTTPREQ_ENDPOINT`, `HTTPREQ_MODE`, `HTTPREQ_USERNAME`, `HTTPREQ_PASSWORD` [^1]                                                             | [Additional configuration](https://go-acme.github.io/lego/dns/httpreq)      |
 | [IIJ](https://www.iij.ad.jp/)                               | `iij`          | `IIJ_API_ACCESS_KEY`, `IIJ_API_SECRET_KEY`, `IIJ_DO_SERVICE_CODE`                                                                           | [Additional configuration](https://go-acme.github.io/lego/dns/iij)          |
@@ -326,15 +319,12 @@ For complete details, refer to your provider's _Additional configuration_ link.
 | [Linode](https://www.linode.com)                            | `linode`       | `LINODE_API_KEY`                                                                                                                            | [Additional configuration](https://go-acme.github.io/lego/dns/linode)       |
 | [Linode v4](https://www.linode.com)                         | `linodev4`     | `LINODE_TOKEN`                                                                                                                              | [Additional configuration](https://go-acme.github.io/lego/dns/linodev4)     |
 | [Liquid Web](https://www.liquidweb.com/)                    | `liquidweb`    | `LIQUID_WEB_PASSWORD`, `LIQUID_WEB_USERNAME`, `LIQUID_WEB_ZONE`                                                                             | [Additional configuration](https://go-acme.github.io/lego/dns/liquidweb)    |
-| [LuaDNS](https://luadns.com)                                | `luadns`       | `LUADNS_API_USERNAME`, `LUADNS_API_TOKEN`                                                                                                   | [Additional configuration](https://go-acme.github.io/lego/dns/luadns)       |
-| manual                                                      | `manual`       | none, but you need to run Traefik interactively [^4], turn on debug log to see instructions and press <kbd>Enter</kbd>.                     |                                                                             |
+| manual                                                      | -              | none, but you need to run Traefik interactively [^4], turn on debug log to see instructions and press <kbd>Enter</kbd>.                     |                                                                             |
 | [MyDNS.jp](https://www.mydns.jp/)                           | `mydnsjp`      | `MYDNSJP_MASTER_ID`, `MYDNSJP_PASSWORD`                                                                                                     | [Additional configuration](https://go-acme.github.io/lego/dns/mydnsjp)      |
-| [Mythic Beasts](https://www.mythic-beasts.com)              | `mythicbeasts` | `MYTHICBEASTS_USER_NAME`, `MYTHICBEASTS_PASSWORD`                                                                                           | [Additional configuration](https://go-acme.github.io/lego/dns/mythicbeasts) |
 | [Namecheap](https://www.namecheap.com)                      | `namecheap`    | `NAMECHEAP_API_USER`, `NAMECHEAP_API_KEY`                                                                                                   | [Additional configuration](https://go-acme.github.io/lego/dns/namecheap)    |
 | [name.com](https://www.name.com/)                           | `namedotcom`   | `NAMECOM_USERNAME`, `NAMECOM_API_TOKEN`, `NAMECOM_SERVER`                                                                                   | [Additional configuration](https://go-acme.github.io/lego/dns/namedotcom)   |
 | [Namesilo](https://www.namesilo.com/)                       | `namesilo`     | `NAMESILO_API_KEY`                                                                                                                          | [Additional configuration](https://go-acme.github.io/lego/dns/namesilo)     |
 | [Netcup](https://www.netcup.eu/)                            | `netcup`       | `NETCUP_CUSTOMER_NUMBER`, `NETCUP_API_KEY`, `NETCUP_API_PASSWORD`                                                                           | [Additional configuration](https://go-acme.github.io/lego/dns/netcup)       |
-| [Netlify](https://www.netlify.com)                          | `netlify`      | `NETLIFY_TOKEN`                                                                                                                             | [Additional configuration](https://go-acme.github.io/lego/dns/netlify)      |
 | [NIFCloud](https://cloud.nifty.com/service/dns.htm)         | `nifcloud`     | `NIFCLOUD_ACCESS_KEY_ID`, `NIFCLOUD_SECRET_ACCESS_KEY`                                                                                      | [Additional configuration](https://go-acme.github.io/lego/dns/nifcloud)     |
 | [Ns1](https://ns1.com/)                                     | `ns1`          | `NS1_API_KEY`                                                                                                                               | [Additional configuration](https://go-acme.github.io/lego/dns/ns1)          |
 | [Open Telekom Cloud](https://cloud.telekom.de)              | `otc`          | `OTC_DOMAIN_NAME`, `OTC_USER_NAME`, `OTC_PASSWORD`, `OTC_PROJECT_NAME`, `OTC_IDENTITY_ENDPOINT`                                             | [Additional configuration](https://go-acme.github.io/lego/dns/otc)          |
@@ -343,10 +333,8 @@ For complete details, refer to your provider's _Additional configuration_ link.
 | [Oracle Cloud](https://cloud.oracle.com/home)               | `oraclecloud`  | `OCI_COMPARTMENT_OCID`, `OCI_PRIVKEY_FILE`, `OCI_PRIVKEY_PASS`, `OCI_PUBKEY_FINGERPRINT`, `OCI_REGION`, `OCI_TENANCY_OCID`, `OCI_USER_OCID` | [Additional configuration](https://go-acme.github.io/lego/dns/oraclecloud)  |
 | [PowerDNS](https://www.powerdns.com)                        | `pdns`         | `PDNS_API_KEY`, `PDNS_API_URL`                                                                                                              | [Additional configuration](https://go-acme.github.io/lego/dns/pdns)         |
 | [Rackspace](https://www.rackspace.com/cloud/dns)            | `rackspace`    | `RACKSPACE_USER`, `RACKSPACE_API_KEY`                                                                                                       | [Additional configuration](https://go-acme.github.io/lego/dns/rackspace)    |
-| [reg.ru](https://www.reg.ru)                                | `regru`        | `REGRU_USERNAME`, `REGRU_PASSWORD`                                                                                                          | [Additional configuration](https://go-acme.github.io/lego/dns/regru)        |
 | [RFC2136](https://tools.ietf.org/html/rfc2136)              | `rfc2136`      | `RFC2136_TSIG_KEY`, `RFC2136_TSIG_SECRET`, `RFC2136_TSIG_ALGORITHM`, `RFC2136_NAMESERVER`                                                   | [Additional configuration](https://go-acme.github.io/lego/dns/rfc2136)      |
 | [Route 53](https://aws.amazon.com/route53/)                 | `route53`      | `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY`, `[AWS_REGION]`, `[AWS_HOSTED_ZONE_ID]` or a configured user/instance IAM profile.             | [Additional configuration](https://go-acme.github.io/lego/dns/route53)      |
-| [RimuHosting](https://rimuhosting.com)                      | `rimuhosting`  | `RIMUHOSTING_API_KEY`                                                                                                                       | [Additional configuration](https://go-acme.github.io/lego/dns/rimuhosting)  |
 | [Sakura Cloud](https://cloud.sakura.ad.jp/)                 | `sakuracloud`  | `SAKURACLOUD_ACCESS_TOKEN`, `SAKURACLOUD_ACCESS_TOKEN_SECRET`                                                                               | [Additional configuration](https://go-acme.github.io/lego/dns/sakuracloud)  |
 | [Scaleway](https://www.scaleway.com)                        | `scaleway`     | `SCALEWAY_API_TOKEN`                                                                                                                        | [Additional configuration](https://go-acme.github.io/lego/dns/scaleway)     |
 | [Selectel](https://selectel.ru/en/)                         | `selectel`     | `SELECTEL_API_TOKEN`                                                                                                                        | [Additional configuration](https://go-acme.github.io/lego/dns/selectel)     |
@@ -357,9 +345,7 @@ For complete details, refer to your provider's _Additional configuration_ link.
 | [Versio](https://www.versio.nl/domeinnamen)                 | `versio`       | `VERSIO_USERNAME`, `VERSIO_PASSWORD`                                                                                                        | [Additional configuration](https://go-acme.github.io/lego/dns/versio)       |
 | [Vscale](https://vscale.io/)                                | `vscale`       | `VSCALE_API_TOKEN`                                                                                                                          | [Additional configuration](https://go-acme.github.io/lego/dns/vscale)       |
 | [VULTR](https://www.vultr.com)                              | `vultr`        | `VULTR_API_KEY`                                                                                                                             | [Additional configuration](https://go-acme.github.io/lego/dns/vultr)        |
-| [Yandex](https://yandex.com)                                | `yandex`       | `YANDEX_PDD_TOKEN`                                                                                                                          | [Additional configuration](https://go-acme.github.io/lego/dns/yandex)       |
 | [Zone.ee](https://www.zone.ee)                              | `zoneee`       | `ZONEEE_API_USER`, `ZONEEE_API_KEY`                                                                                                         | [Additional configuration](https://go-acme.github.io/lego/dns/zoneee)       |
-| [Zonomi](https://zonomi.com)                                | `zonomi`       | `ZONOMI_API_KEY`                                                                                                                            | [Additional configuration](https://go-acme.github.io/lego/dns/zonomi)       |
 
 [^1]: more information about the HTTP message format can be found [here](https://go-acme.github.io/lego/dns/httpreq/)
 [^2]: [providing_credentials_to_your_application](https://cloud.google.com/docs/authentication/production#providing_credentials_to_your_application)
@@ -398,7 +384,7 @@ certificatesResolvers:
 
 ```bash tab="CLI"
 # ...
---certificatesresolvers.myresolver.acme.dnschallenge.resolvers=1.1.1.1:53,8.8.8.8:53
+--certificatesResolvers.myresolver.acme.dnsChallenge.resolvers=1.1.1.1:53,8.8.8.8:53
 ```
 
 #### Wildcard Domains
@@ -437,7 +423,7 @@ The CA server to use:
 
     ```bash tab="CLI"
     # ...
-    --certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory
+    --certificatesResolvers.myresolver.acme.caServer=https://acme-staging-v02.api.letsencrypt.org/directory
     # ...
     ```
 
@@ -465,7 +451,7 @@ certificatesResolvers:
 
 ```bash tab="CLI"
 # ...
---certificatesresolvers.myresolver.acme.storage=acme.json
+--certificatesResolvers.myresolver.acme.storage=acme.json
 # ...
 ```
 
@@ -482,7 +468,7 @@ docker run -v "/my/host/acme:/etc/traefik/acme" traefik
 ```
 
 !!! warning
-    For concurrency reasons, this file cannot be shared across multiple instances of Traefik.
+    For concurrency reason, this file cannot be shared across multiple instances of Traefik.
 
 ## Fallback
 

docs/content/https/include-acme-multiple-domains-example.md

@@ -2,23 +2,23 @@
 ```yaml tab="Docker"
 ## Dynamic configuration
 labels:
-  - traefik.http.routers.blog.rule=Host(`example.com`) && Path(`/blog`)
+  - traefik.http.routers.blog.rule=Host(`company.com`) && Path(`/blog`)
   - traefik.http.routers.blog.tls=true
   - traefik.http.routers.blog.tls.certresolver=myresolver
-  - traefik.http.routers.blog.tls.domains[0].main=example.org
-  - traefik.http.routers.blog.tls.domains[0].sans=*.example.org
+  - traefik.http.routers.blog.tls.domains[0].main=company.org
+  - traefik.http.routers.blog.tls.domains[0].sans=*.company.org
 ```
 
 ```yaml tab="Docker (Swarm)"
 ## Dynamic configuration
 deploy:
   labels:
-    - traefik.http.routers.blog.rule=Host(`example.com`) && Path(`/blog`)
+    - traefik.http.routers.blog.rule=Host(`company.com`) && Path(`/blog`)
     - traefik.http.services.blog-svc.loadbalancer.server.port=8080"
     - traefik.http.routers.blog.tls=true
     - traefik.http.routers.blog.tls.certresolver=myresolver
-    - traefik.http.routers.blog.tls.domains[0].main=example.org
-    - traefik.http.routers.blog.tls.domains[0].sans=*.example.org
+    - traefik.http.routers.blog.tls.domains[0].main=company.org
+    - traefik.http.routers.blog.tls.domains[0].sans=*.company.org
 ```
 
 ```yaml tab="Kubernetes"
@@ -30,7 +30,7 @@ spec:
   entryPoints:
     - websecure
   routes:
-  - match: Host(`example.com`) && Path(`/blog`)
+  - match: Host(`company.com`) && Path(`/blog`)
     kind: Rule
     services:
     - name: blog
@@ -38,18 +38,18 @@ spec:
   tls:
     certResolver: myresolver
     domains:
-    - main: example.org
+    - main: company.org
       sans:
-      - '*.example.org'
+      - *.company.org
 ```
 
 ```json tab="Marathon"
 labels: {
-  "traefik.http.routers.blog.rule": "Host(`example.com`) && Path(`/blog`)",
+  "traefik.http.routers.blog.rule": "Host(`company.com`) && Path(`/blog`)",
   "traefik.http.routers.blog.tls": "true",
   "traefik.http.routers.blog.tls.certresolver": "myresolver",
-  "traefik.http.routers.blog.tls.domains[0].main": "example.com",
-  "traefik.http.routers.blog.tls.domains[0].sans": "*.example.com",
+  "traefik.http.routers.blog.tls.domains[0].main": "company.com",
+  "traefik.http.routers.blog.tls.domains[0].sans": "*.company.com",
   "traefik.http.services.blog-svc.loadbalancer.server.port": "8080"
 }
 ```
@@ -57,23 +57,23 @@ labels: {
 ```yaml tab="Rancher"
 ## Dynamic configuration
 labels:
-  - traefik.http.routers.blog.rule=Host(`example.com`) && Path(`/blog`)
+  - traefik.http.routers.blog.rule=Host(`company.com`) && Path(`/blog`)
   - traefik.http.routers.blog.tls=true
   - traefik.http.routers.blog.tls.certresolver=myresolver
-  - traefik.http.routers.blog.tls.domains[0].main=example.org
-  - traefik.http.routers.blog.tls.domains[0].sans=*.example.org
+  - traefik.http.routers.blog.tls.domains[0].main=company.org
+  - traefik.http.routers.blog.tls.domains[0].sans=*.company.org
 ```
 
 ```toml tab="File (TOML)"
 ## Dynamic configuration
 [http.routers]
   [http.routers.blog]
-    rule = "Host(`example.com`) && Path(`/blog`)"
+    rule = "Host(`company.com`) && Path(`/blog`)"
     [http.routers.blog.tls]
       certResolver = "myresolver" # From static configuration
       [[http.routers.blog.tls.domains]]
-        main = "example.org"
-        sans = ["*.example.org"]
+        main = "company.org"
+        sans = ["*.company.org"]
 ```
 
 ```yaml tab="File (YAML)"
@@ -81,11 +81,11 @@ labels:
 http:
   routers:
     blog:
-      rule: "Host(`example.com`) && Path(`/blog`)"
+      rule: "Host(`company.com`) && Path(`/blog`)"
       tls:
         certResolver: myresolver
         domains:
-          - main: "example.org"
+          - main: "company.org"
             sans:
-              - "*.example.org"
+              - "*.company.org"
 ```

docs/content/https/include-acme-multiple-domains-from-rule-example.md

@@ -2,7 +2,7 @@
 ```yaml tab="Docker"
 ## Dynamic configuration
 labels:
-  - traefik.http.routers.blog.rule=(Host(`example.com`) && Path(`/blog`)) || Host(`blog.example.org`)
+  - traefik.http.routers.blog.rule=(Host(`company.com`) && Path(`/blog`)) || Host(`blog.company.org`)
   - traefik.http.routers.blog.tls=true
   - traefik.http.routers.blog.tls.certresolver=myresolver
 ```
@@ -11,7 +11,7 @@ labels:
 ## Dynamic configuration
 deploy:
   labels:
-    - traefik.http.routers.blog.rule=(Host(`example.com`) && Path(`/blog`)) || Host(`blog.example.org`)
+    - traefik.http.routers.blog.rule=(Host(`company.com`) && Path(`/blog`)) || Host(`blog.company.org`)
     - traefik.http.routers.blog.tls=true
     - traefik.http.routers.blog.tls.certresolver=myresolver
     - traefik.http.services.blog-svc.loadbalancer.server.port=8080"
@@ -26,18 +26,18 @@ spec:
   entryPoints:
     - websecure
   routes:
-  - match: (Host(`example.com`) && Path(`/blog`)) || Host(`blog.example.org`)
+  - match: (Host(`company.com`) && Path(`/blog`)) || Host(`blog.company.org`)
     kind: Rule
     services:
     - name: blog
       port: 8080
   tls:
-    certResolver: myresolver
+    certresolver: myresolver
 ```
 
 ```json tab="Marathon"
 labels: {
-  "traefik.http.routers.blog.rule": "(Host(`example.com`) && Path(`/blog`)) || Host(`blog.example.org`)",
+  "traefik.http.routers.blog.rule": "(Host(`company.com`) && Path(`/blog`)) || Host(`blog.company.org`)",
   "traefik.http.routers.blog.tls": "true",
   "traefik.http.routers.blog.tls.certresolver": "myresolver",
   "traefik.http.services.blog-svc.loadbalancer.server.port": "8080"
@@ -47,7 +47,7 @@ labels: {
 ```yaml tab="Rancher"
 ## Dynamic configuration
 labels:
-  - traefik.http.routers.blog.rule=(Host(`example.com`) && Path(`/blog`)) || Host(`blog.example.org`)
+  - traefik.http.routers.blog.rule=(Host(`company.com`) && Path(`/blog`)) || Host(`blog.company.org`)
   - traefik.http.routers.blog.tls=true
   - traefik.http.routers.blog.tls.certresolver=myresolver
 ```
@@ -56,7 +56,7 @@ labels:
 ## Dynamic configuration
 [http.routers]
   [http.routers.blog]
-    rule = "(Host(`example.com`) && Path(`/blog`)) || Host(`blog.example.org`)"
+    rule = "(Host(`company.com`) && Path(`/blog`)) || Host(`blog.company.org`)"
     [http.routers.blog.tls]
       certResolver = "myresolver"
 ```
@@ -66,7 +66,7 @@ labels:
 http:
   routers:
     blog:
-      rule: "(Host(`example.com`) && Path(`/blog`)) || Host(`blog.example.org`)"
+      rule: "(Host(`company.com`) && Path(`/blog`)) || Host(`blog.company.org`)"
       tls:
         certResolver: myresolver
 ```

docs/content/https/include-acme-single-domain-example.md

@@ -2,7 +2,7 @@
 ```yaml tab="Docker"
 ## Dynamic configuration
 labels:
-  - traefik.http.routers.blog.rule=Host(`example.com`) && Path(`/blog`)
+  - traefik.http.routers.blog.rule=Host(`company.com`) && Path(`/blog`)
   - traefik.http.routers.blog.tls=true
   - traefik.http.routers.blog.tls.certresolver=myresolver
 ```
@@ -11,7 +11,7 @@ labels:
 ## Dynamic configuration
 deploy:
   labels:
-    - traefik.http.routers.blog.rule=Host(`example.com`) && Path(`/blog`)
+    - traefik.http.routers.blog.rule=Host(`company.com`) && Path(`/blog`)
     - traefik.http.routers.blog.tls=true
     - traefik.http.routers.blog.tls.certresolver=myresolver
     - traefik.http.services.blog-svc.loadbalancer.server.port=8080"
@@ -26,18 +26,18 @@ spec:
   entryPoints:
     - websecure
   routes:
-  - match: Host(`example.com`) && Path(`/blog`)
+  - match: Host(`company.com`) && Path(`/blog`)
     kind: Rule
     services:
     - name: blog
       port: 8080
   tls:
-    certResolver: myresolver
+    certresolver: myresolver
 ```
 
 ```json tab="Marathon"
 labels: {
-  "traefik.http.routers.blog.rule": "Host(`example.com`) && Path(`/blog`)",
+  "traefik.http.routers.blog.rule": "Host(`company.com`) && Path(`/blog`)",
   "traefik.http.routers.blog.tls": "true",
   "traefik.http.routers.blog.tls.certresolver": "myresolver",
   "traefik.http.services.blog-svc.loadbalancer.server.port": "8080"
@@ -47,7 +47,7 @@ labels: {
 ```yaml tab="Rancher"
 ## Dynamic configuration
 labels:
-  - traefik.http.routers.blog.rule=Host(`example.com`) && Path(`/blog`)
+  - traefik.http.routers.blog.rule=Host(`company.com`) && Path(`/blog`)
   - traefik.http.routers.blog.tls=true
   - traefik.http.routers.blog.tls.certresolver=myresolver
 ```
@@ -56,7 +56,7 @@ labels:
 ## Dynamic configuration
 [http.routers]
   [http.routers.blog]
-  rule = "Host(`example.com`) && Path(`/blog`)"
+  rule = "Host(`company.com`) && Path(`/blog`)"
   [http.routers.blog.tls]
     certResolver = "myresolver"
 ```
@@ -66,7 +66,7 @@ labels:
 http:
   routers:
     blog:
-      rule: "Host(`example.com`) && Path(`/blog`)"
+      rule: "Host(`company.com`) && Path(`/blog`)"
       tls:
         certResolver: myresolver
 ```

docs/content/https/ref-acme.toml

@@ -5,7 +5,7 @@
   #
   # Required
   #
-  email = "test@example.com"
+  email = "test@traefik.io"
 
   # File or key used for certificates storage.
   #

docs/content/https/ref-acme.txt

@@ -4,13 +4,13 @@
 #
 # Required
 #
---certificatesresolvers.myresolver.acme.email=test@example.com
+--certificatesResolvers.myresolver.acme.email=test@traefik.io
 
 # File or key used for certificates storage.
 #
 # Required
 #
---certificatesresolvers.myresolver.acme.storage=acme.json
+--certificatesResolvers.myresolver.acme.storage=acme.json
 
 # CA server to use.
 # Uncomment the line to use Let's Encrypt's staging server,
@@ -19,7 +19,7 @@
 # Optional
 # Default: "https://acme-v02.api.letsencrypt.org/directory"
 #
---certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory
+--certificatesResolvers.myresolver.acme.caServer=https://acme-staging-v02.api.letsencrypt.org/directory
 
 # KeyType to use.
 #
@@ -28,38 +28,38 @@
 #
 # Available values : "EC256", "EC384", "RSA2048", "RSA4096", "RSA8192"
 #
---certificatesresolvers.myresolver.acme.keytype=RSA4096
+--certificatesResolvers.myresolver.acme.keyType=RSA4096
 
 # Use a TLS-ALPN-01 ACME challenge.
 #
 # Optional (but recommended)
 #
---certificatesresolvers.myresolver.acme.tlschallenge=true
+--certificatesResolvers.myresolver.acme.tlsChallenge=true
 
 # Use a HTTP-01 ACME challenge.
 #
 # Optional
 #
---certificatesresolvers.myresolver.acme.httpchallenge=true
+--certificatesResolvers.myresolver.acme.httpChallenge=true
 
 # EntryPoint to use for the HTTP-01 challenges.
 #
 # Required
 #
---certificatesresolvers.myresolver.acme.httpchallenge.entrypoint=web
+--certificatesResolvers.myresolver.acme.httpChallenge.entryPoint=web
 
 # Use a DNS-01 ACME challenge rather than HTTP-01 challenge.
 # Note: mandatory for wildcard certificate generation.
 #
 # Optional
 #
---certificatesresolvers.myresolver.acme.dnschallenge=true
+--certificatesResolvers.myresolver.acme.dnsChallenge=true
 
 # DNS provider used.
 #
 # Required
 #
---certificatesresolvers.myresolver.acme.dnschallenge.provider=digitalocean
+--certificatesResolvers.myresolver.acme.dnsChallenge.provider=digitalocean
 
 # By default, the provider will verify the TXT DNS challenge record before letting ACME verify.
 # If delayBeforeCheck is greater than zero, this check is delayed for the configured duration in seconds.
@@ -68,14 +68,14 @@
 # Optional
 # Default: 0
 #
---certificatesresolvers.myresolver.acme.dnschallenge.delaybeforecheck=0
+--certificatesResolvers.myresolver.acme.dnsChallenge.delayBeforeCheck=0
 
 # Use following DNS servers to resolve the FQDN authority.
 #
 # Optional
 # Default: empty
 #
---certificatesresolvers.myresolver.acme.dnschallenge.resolvers=1.1.1.1:53,8.8.8.8:53
+--certificatesResolvers.myresolver.acme.dnsChallenge.resolvers=1.1.1.1:53,8.8.8.8:53
 
 # Disable the DNS propagation checks before notifying ACME that the DNS challenge is ready.
 #
@@ -85,4 +85,4 @@
 # Optional
 # Default: false
 #
---certificatesresolvers.myresolver.acme.dnschallenge.disablepropagationcheck=true
+--certificatesResolvers.myresolver.acme.dnsChallenge.disablePropagationCheck=true

docs/content/https/ref-acme.yaml

@@ -7,7 +7,7 @@ certificatesResolvers:
       #
       # Required
       #
-      email: "test@example.com"
+      email: "test@traefik.io"
 
       # File or key used for certificates storage.
       #

docs/content/https/tls.md

@@ -317,7 +317,7 @@ spec:
 ### Strict SNI Checking
 
 With strict SNI checking, Traefik won't allow connections from clients connections
-that do not specify a server_name extension or don't match any certificate configured on the tlsOption.
+that do not specify a server_name extension.
 
 ```toml tab="File (TOML)"
 # Dynamic configuration
@@ -347,39 +347,6 @@ spec:
   sniStrict: true
 ```
 
-### Prefer Server Cipher Suites
-
-This option allows the server to choose its most preferred cipher suite instead of the client's.
-Please note that this is enabled automatically when `minVersion` or `maxVersion` are set.
-
-```toml tab="File (TOML)"
-# Dynamic configuration
-
-[tls.options]
-  [tls.options.default]
-    preferServerCipherSuites = true
-```
-
-```yaml tab="File (YAML)"
-# Dynamic configuration
-
-tls:
-  options:
-    default:
-      preferServerCipherSuites: true
-```
-
-```yaml tab="Kubernetes"
-apiVersion: traefik.containo.us/v1alpha1
-kind: TLSOption
-metadata:
-  name: default
-  namespace: default
-
-spec:
-  preferServerCipherSuites: true
-```
-
 ### Client Authentication (mTLS)
 
 Traefik supports mutual authentication, through the `clientAuth` section.

docs/content/middlewares/basicauth.md

@@ -12,11 +12,9 @@ The BasicAuth middleware is a quick way to restrict access to your services to k
 ```yaml tab="Docker"
 # Declaring the user list
 #
-# Note: when used in docker-compose.yml all dollar signs in the hash need to be doubled for escaping.
+# Note: all dollar signs in the hash need to be doubled for escaping.
 # To create user:password pair, it's possible to use this command:
 # echo $(htpasswd -nb user password) | sed -e s/\\$/\\$\\$/g
-#
-# Also note that dollar signs should NOT be doubled when they not evaluated (e.g. Ansible docker_container module).
 labels:
   - "traefik.http.middlewares.test-auth.basicauth.users=test:$$apr1$$H6uskkkW$$IgXLP6ewTrSuBkTrqE8wj/,test2:$$apr1$$d9hr9HBB$$4HxwgUir3HP4EsggP/QNo0"
 ```
@@ -73,7 +71,7 @@ http:
 
 ### General
 
-Passwords must be hashed using MD5, SHA1, or BCrypt.
+Passwords must be encoded using MD5, SHA1, or BCrypt.
 
 !!! tip 
 
@@ -81,7 +79,7 @@ Passwords must be hashed using MD5, SHA1, or BCrypt.
 
 ### `users`
 
-The `users` option is an array of authorized users. Each user will be declared using the `name:hashed-password` format.
+The `users` option is an array of authorized users. Each user will be declared using the `name:encoded-password` format.
 
 !!! note ""
     
@@ -167,7 +165,7 @@ http:
 
 The `usersFile` option is the path to an external file that contains the authorized users for the middleware.
 
-The file content is a list of `name:hashed-password`.
+The file content is a list of `name:encoded-password`.
 
 !!! note ""
     

docs/content/middlewares/compress.md

@@ -64,9 +64,6 @@ http:
     * The `Accept-Encoding` request header contains `gzip`.
     * The response is not already compressed, i.e. the `Content-Encoding` response header is not already set.
 
-    If Content-Type header is not defined, or empty, the compress middleware will automatically [detect](https://mimesniff.spec.whatwg.org/) a content type. 
-    It will also set accordingly the `Content-Type` header with the detected MIME type.
-    
 ## Configuration Options
 
 ### `excludedContentTypes`

docs/content/middlewares/contenttype.md

@@ -21,9 +21,6 @@ This middleware exists to enable the correct behavior until at least the default
     is still to automatically set the `Content-Type` header.
     Therefore, given the default value of the `autoDetect` option (false),
     simply enabling this middleware for a router switches the router's behavior.
-    
-    The scope of the Content-Type middleware is the MIME type detection done by the core of Traefik (the server part).
-    Therefore, it has no effect against any other `Content-Type` header modifications (e.g.: in another middleware such as compress).
 
 ## Configuration Examples
 

docs/content/middlewares/forwardauth.md

@@ -12,53 +12,53 @@ Otherwise, the response from the authentication server is returned.
 ## Configuration Examples
 
 ```yaml tab="Docker"
-# Forward authentication to example.com
+# Forward authentication to authserver.com
 labels:
-  - "traefik.http.middlewares.test-auth.forwardauth.address=https://example.com/auth"
+  - "traefik.http.middlewares.test-auth.forwardauth.address=https://authserver.com/auth"
 ```
 
 ```yaml tab="Kubernetes"
-# Forward authentication to example.com
+# Forward authentication to authserver.com
 apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
   name: test-auth
 spec:
   forwardAuth:
-    address: https://example.com/auth
+    address: https://authserver.com/auth
 ```
 
 ```yaml tab="Consul Catalog"
-# Forward authentication to example.com
-- "traefik.http.middlewares.test-auth.forwardauth.address=https://example.com/auth"
+# Forward authentication to authserver.com
+- "traefik.http.middlewares.test-auth.forwardauth.address=https://authserver.com/auth"
 ```
 
 ```json tab="Marathon"
 "labels": {
-  "traefik.http.middlewares.test-auth.forwardauth.address": "https://example.com/auth"
+  "traefik.http.middlewares.test-auth.forwardauth.address": "https://authserver.com/auth"
 }
 ```
 
 ```yaml tab="Rancher"
-# Forward authentication to example.com
+# Forward authentication to authserver.com
 labels:
-  - "traefik.http.middlewares.test-auth.forwardauth.address=https://example.com/auth"
+  - "traefik.http.middlewares.test-auth.forwardauth.address=https://authserver.com/auth"
 ```
 
 ```toml tab="File (TOML)"
-# Forward authentication to example.com
+# Forward authentication to authserver.com
 [http.middlewares]
   [http.middlewares.test-auth.forwardAuth]
-    address = "https://example.com/auth"
+    address = "https://authserver.com/auth"
 ```
 
 ```yaml tab="File (YAML)"
-# Forward authentication to example.com
+# Forward authentication to authserver.com
 http:
   middlewares:
     test-auth:
       forwardAuth:
-        address: "https://example.com/auth"
+        address: "https://authserver.com/auth"
 ```
 
 ## Configuration Options
@@ -69,7 +69,7 @@ The `address` option defines the authentication server address.
 
 ```yaml tab="Docker"
 labels:
-  - "traefik.http.middlewares.test-auth.forwardauth.address=https://example.com/auth"
+  - "traefik.http.middlewares.test-auth.forwardauth.address=https://authserver.com/auth"
 ```
 
 ```yaml tab="Kubernetes"
@@ -79,28 +79,28 @@ metadata:
   name: test-auth
 spec:
   forwardAuth:
-    address: https://example.com/auth 
+    address: https://authserver.com/auth 
 ```
 
 ```yaml tab="Consul Catalog"
-- "traefik.http.middlewares.test-auth.forwardauth.address=https://example.com/auth"
+- "traefik.http.middlewares.test-auth.forwardauth.address=https://authserver.com/auth"
 ```
 
 ```json tab="Marathon"
 "labels": {
-  "traefik.http.middlewares.test-auth.forwardauth.address": "https://example.com/auth"
+  "traefik.http.middlewares.test-auth.forwardauth.address": "https://authserver.com/auth"
 }
 ```
 
 ```yaml tab="Rancher"
 labels:
-  - "traefik.http.middlewares.test-auth.forwardauth.address=https://example.com/auth"
+  - "traefik.http.middlewares.test-auth.forwardauth.address=https://authserver.com/auth"
 ```
 
 ```toml tab="File (TOML)"
 [http.middlewares]
   [http.middlewares.test-auth.forwardAuth]
-    address = "https://example.com/auth"
+    address = "https://authserver.com/auth"
 ```
 
 ```yaml tab="File (YAML)"
@@ -108,7 +108,7 @@ http:
   middlewares:
     test-auth:
       forwardAuth:
-        address: "https://example.com/auth"
+        address: "https://authserver.com/auth"
 ```
 
 ### `trustForwardHeader`
@@ -127,7 +127,7 @@ metadata:
   name: test-auth
 spec:
   forwardAuth:
-    address: https://example.com/auth
+    address: https://authserver.com/auth
     trustForwardHeader: true
 ```
 
@@ -149,7 +149,7 @@ labels:
 ```toml tab="File (TOML)"
 [http.middlewares]
   [http.middlewares.test-auth.forwardAuth]
-    address = "https://example.com/auth"
+    address = "https://authserver.com/auth"
     trustForwardHeader = true
 ```
 
@@ -158,7 +158,7 @@ http:
   middlewares:
     test-auth:
       forwardAuth:
-        address: "https://example.com/auth"
+        address: "https://authserver.com/auth"
         trustForwardHeader: true
 ```
 
@@ -178,7 +178,7 @@ metadata:
   name: test-auth
 spec:
   forwardAuth:
-    address: https://example.com/auth
+    address: https://authserver.com/auth
     authResponseHeaders:
       - X-Auth-User
       - X-Secret
@@ -202,7 +202,7 @@ labels:
 ```toml tab="File (TOML)"
 [http.middlewares]
   [http.middlewares.test-auth.forwardAuth]
-    address = "https://example.com/auth"
+    address = "https://authserver.com/auth"
     authResponseHeaders = ["X-Auth-User", "X-Secret"]
 ```
 
@@ -211,7 +211,7 @@ http:
   middlewares:
     test-auth:
       forwardAuth:
-        address: "https://example.com/auth"
+        address: "https://authserver.com/auth"
         authResponseHeaders:
           - "X-Auth-User"
           - "X-Secret"
@@ -237,7 +237,7 @@ metadata:
   name: test-auth
 spec:
   forwardAuth:
-    address: https://example.com/auth
+    address: https://authserver.com/auth
     tls:
       caSecret: mycasercret
 
@@ -270,7 +270,7 @@ labels:
 ```toml tab="File (TOML)"
 [http.middlewares]
   [http.middlewares.test-auth.forwardAuth]
-    address = "https://example.com/auth"
+    address = "https://authserver.com/auth"
     [http.middlewares.test-auth.forwardAuth.tls]
       ca = "path/to/local.crt"
 ```
@@ -280,7 +280,7 @@ http:
   middlewares:
     test-auth:
       forwardAuth:
-        address: "https://example.com/auth"
+        address: "https://authserver.com/auth"
         tls:
           ca: "path/to/local.crt"
 ```
@@ -306,7 +306,7 @@ metadata:
   name: test-auth
 spec:
   forwardAuth:
-    address: https://example.com/auth
+    address: https://authserver.com/auth
     tls:
       caOptional: true
 ```
@@ -329,7 +329,7 @@ labels:
 ```toml tab="File (TOML)"
 [http.middlewares]
   [http.middlewares.test-auth.forwardAuth]
-    address = "https://example.com/auth"
+    address = "https://authserver.com/auth"
     [http.middlewares.test-auth.forwardAuth.tls]
       caOptional = true
 ```
@@ -339,7 +339,7 @@ http:
   middlewares:
     test-auth:
       forwardAuth:
-        address: "https://example.com/auth"
+        address: "https://authserver.com/auth"
         tls:
           caOptional: true
 ```
@@ -361,7 +361,7 @@ metadata:
   name: test-auth
 spec:
   forwardAuth:
-    address: https://example.com/auth
+    address: https://authserver.com/auth
     tls:
       certSecret: mytlscert
 
@@ -398,7 +398,7 @@ labels:
 ```toml tab="File (TOML)"
 [http.middlewares]
   [http.middlewares.test-auth.forwardAuth]
-    address = "https://example.com/auth"
+    address = "https://authserver.com/auth"
     [http.middlewares.test-auth.forwardAuth.tls]
       cert = "path/to/foo.cert"
       key = "path/to/foo.key"
@@ -409,7 +409,7 @@ http:
   middlewares:
     test-auth:
       forwardAuth:
-        address: "https://example.com/auth"
+        address: "https://authserver.com/auth"
         tls:
           cert: "path/to/foo.cert"
           key: "path/to/foo.key"
@@ -435,7 +435,7 @@ metadata:
   name: test-auth
 spec:
   forwardAuth:
-    address: https://example.com/auth
+    address: https://authserver.com/auth
     tls:
       certSecret: mytlscert
 
@@ -472,7 +472,7 @@ labels:
 ```toml tab="File (TOML)"
 [http.middlewares]
   [http.middlewares.test-auth.forwardAuth]
-    address = "https://example.com/auth"
+    address = "https://authserver.com/auth"
     [http.middlewares.test-auth.forwardAuth.tls]
       cert = "path/to/foo.cert"
       key = "path/to/foo.key"
@@ -483,7 +483,7 @@ http:
   middlewares:
     test-auth:
       forwardAuth:
-        address: "https://example.com/auth"
+        address: "https://authserver.com/auth"
         tls:
           cert: "path/to/foo.cert"
           key: "path/to/foo.key"
@@ -508,7 +508,7 @@ metadata:
   name: test-auth
 spec:
   forwardAuth:
-    address: https://example.com/auth
+    address: https://authserver.com/auth
     tls:
       insecureSkipVerify: true
 ```
@@ -531,7 +531,7 @@ labels:
 ```toml tab="File (TOML)"
 [http.middlewares]
   [http.middlewares.test-auth.forwardAuth]
-    address = "https://example.com/auth"
+    address = "https://authserver.com/auth"
     [http.middlewares.test-auth.forwardAuth.tls]
       insecureSkipVerify: true
 ```
@@ -541,7 +541,7 @@ http:
   middlewares:
     test-auth:
       forwardAuth:
-        address: "https://example.com/auth"
+        address: "https://authserver.com/auth"
         tls:
           insecureSkipVerify: true
 ```

docs/content/middlewares/headers.md

@@ -23,7 +23,7 @@ labels:
 apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: testHeader
+  name: test-header
 spec:
   headers:
     customRequestHeaders:
@@ -86,7 +86,7 @@ labels:
 apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: testHeader
+  name: test-header
 spec:
   headers:
     customRequestHeaders:
@@ -148,11 +148,11 @@ labels:
 apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: testHeader
+  name: test-header
 spec:
   headers:
-    frameDeny: true
-    sslRedirect: true
+    frameDeny: "true"
+    sslRedirect: "true"
 ```
 
 ```yaml tab="Consul Catalog"
@@ -197,7 +197,7 @@ This functionality allows for more advanced security features to quickly be set.
 ```yaml tab="Docker"
 labels:
   - "traefik.http.middlewares.testheader.headers.accesscontrolallowmethods=GET,OPTIONS,PUT"
-  - "traefik.http.middlewares.testheader.headers.accesscontrolalloworiginlist=https://foo.bar.org,https://example.org"
+  - "traefik.http.middlewares.testheader.headers.accesscontrolalloworigin=origin-list-or-null"
   - "traefik.http.middlewares.testheader.headers.accesscontrolmaxage=100"
   - "traefik.http.middlewares.testheader.headers.addvaryheader=true"
 ```
@@ -206,23 +206,21 @@ labels:
 apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: testHeader
+  name: test-header
 spec:
   headers:
     accessControlAllowMethods:
       - "GET"
       - "OPTIONS"
       - "PUT"
-    accessControlAllowOriginList:
-      - "https://foo.bar.org"
-      - "https://example.org"
+    accessControlAllowOrigin: "origin-list-or-null"
     accessControlMaxAge: 100
-    addVaryHeader: true
+    addVaryHeader: "true"
 ```
 
 ```yaml tab="Consul Catalog"
 - "traefik.http.middlewares.testheader.headers.accesscontrolallowmethods=GET,OPTIONS,PUT"
-- "traefik.http.middlewares.testheader.headers.accesscontrolalloworiginlist=https://foo.bar.org,https://example.org"
+- "traefik.http.middlewares.testheader.headers.accesscontrolalloworigin=origin-list-or-null"
 - "traefik.http.middlewares.testheader.headers.accesscontrolmaxage=100"
 - "traefik.http.middlewares.testheader.headers.addvaryheader=true"
 ```
@@ -230,7 +228,7 @@ spec:
 ```json tab="Marathon"
 "labels": {
   "traefik.http.middlewares.testheader.headers.accesscontrolallowmethods": "GET,OPTIONS,PUT",
-  "traefik.http.middlewares.testheader.headers.accesscontrolalloworiginlist": "https://foo.bar.org,https://example.org",
+  "traefik.http.middlewares.testheader.headers.accesscontrolalloworigin": "origin-list-or-null",
   "traefik.http.middlewares.testheader.headers.accesscontrolmaxage": "100",
   "traefik.http.middlewares.testheader.headers.addvaryheader": "true"
 }
@@ -239,7 +237,7 @@ spec:
 ```yaml tab="Rancher"
 labels:
   - "traefik.http.middlewares.testheader.headers.accesscontrolallowmethods=GET,OPTIONS,PUT"
-  - "traefik.http.middlewares.testheader.headers.accesscontrolalloworiginlist=https://foo.bar.org,https://example.org"
+  - "traefik.http.middlewares.testheader.headers.accesscontrolalloworigin=origin-list-or-null"
   - "traefik.http.middlewares.testheader.headers.accesscontrolmaxage=100"
   - "traefik.http.middlewares.testheader.headers.addvaryheader=true"
 ```
@@ -248,7 +246,7 @@ labels:
 [http.middlewares]
   [http.middlewares.testHeader.headers]
     accessControlAllowMethods= ["GET", "OPTIONS", "PUT"]
-    accessControlAllowOriginList = ["https://foo.bar.org","https://example.org"]
+    accessControlAllowOrigin = "origin-list-or-null"
     accessControlMaxAge = 100
     addVaryHeader = true
 ```
@@ -262,9 +260,7 @@ http:
           - GET
           - OPTIONS
           - PUT
-        accessControlAllowOriginList:
-          - https://foo.bar.org
-          - https://example.org
+        accessControlAllowOrigin: "origin-list-or-null"
         accessControlMaxAge: 100
         addVaryHeader: true
 ```
@@ -299,22 +295,14 @@ The `accessControlAllowHeaders` indicates which header field names can be used a
 
 The  `accessControlAllowMethods` indicates which methods can be used during requests.
 
-### `accessControlAllowOriginList`
+### `accessControlAllowOrigin`
 
-The `accessControlAllowOriginList` indicates whether a resource can be shared by returning different values.
+The `accessControlAllowOrigin` indicates whether a resource can be shared by returning different values.
+The three options for this value are:
 
-A wildcard origin `*` can also be configured, and will match all requests.
-If this value is set by a backend server, it will be overwritten by Traefik
-
-This value can contains a list of allowed origins.
-
-More information including how to use the settings can be found on:
-
-- [Mozilla.org](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin)
-- [w3](https://fetch.spec.whatwg.org/#http-access-control-allow-origin)
-- [IETF](https://tools.ietf.org/html/rfc6454#section-7.1)
-
-Traefik no longer supports the null value, as it is [no longer recommended as a return value](https://w3c.github.io/webappsec-cors-for-developers/#avoid-returning-access-control-allow-origin-null).
+- `origin-list-or-null`
+- `*`
+- `null`
 
 ### `accessControlExposeHeaders`
 
@@ -322,11 +310,11 @@ The `accessControlExposeHeaders` indicates which headers are safe to expose to t
 
 ### `accessControlMaxAge`
 
-The `accessControlMaxAge` indicates how long (in seconds) a preflight request can be cached.
+The `accessControlMaxAge` indicates how long a preflight request can be cached.
 
 ### `addVaryHeader`
 
-The `addVaryHeader` is used in conjunction with `accessControlAllowOriginList` to determine whether the vary header should be added or modified to demonstrate that server responses can differ based on the value of the origin header.
+The `addVaryHeader` is used in conjunction with `accessControlAllowOrigin` to determine whether the vary header should be added or modified to demonstrate that server responses can differ beased on the value of the origin header.
 
 ### `allowedHosts` 
 

docs/content/middlewares/ipwhitelist.md

@@ -90,7 +90,7 @@ The `depth` option tells Traefik to use the `X-Forwarded-For` header and take th
     apiVersion: traefik.containo.us/v1alpha1
     kind: Middleware
     metadata:
-      name: testIPwhitelist
+      name: test-ipwhitelist
     spec:
       ipWhiteList:
         sourceRange:

docs/content/middlewares/overview.md

@@ -188,7 +188,7 @@ then you'll have to append to the middleware name, the `@` separator, followed b
       entryPoints:
         - web
       routes:
-        - match: Host(`example.com`)
+        - match: Host(`bar.com`)
           kind: Rule
           services:
             - name: whoami

docs/content/middlewares/passtlsclientcert.md

@@ -70,7 +70,6 @@ http:
       - "traefik.http.middlewares.test-passtlsclientcert.passtlsclientcert.info.notafter=true"
       - "traefik.http.middlewares.test-passtlsclientcert.passtlsclientcert.info.notbefore=true"
       - "traefik.http.middlewares.test-passtlsclientcert.passtlsclientcert.info.sans=true"
-      - "traefik.http.middlewares.test-passtlsclientcert.passtlsclientcert.info.serialnumber=true"
       - "traefik.http.middlewares.test-passtlsclientcert.passtlsclientcert.info.subject.commonname=true"
       - "traefik.http.middlewares.test-passtlsclientcert.passtlsclientcert.info.subject.country=true"
       - "traefik.http.middlewares.test-passtlsclientcert.passtlsclientcert.info.subject.domaincomponent=true"
@@ -265,7 +264,7 @@ In the following example, you can see a complete certificate. We will use each p
             Validity
                 Not Before: Dec  6 11:10:16 2018 GMT
                 Not After : Dec  5 11:10:16 2020 GMT
-            Subject: DC=org, DC=cheese, O=Cheese, O=Cheese 2, OU=Simple Signing Section, OU=Simple Signing Section 2, CN=*.example.org, CN=*.example.com, C=FR, C=US, L=TOULOUSE, L=LYON, ST=Cheese org state, ST=Cheese com state/emailAddress=cert@example.org/emailAddress=cert@sexample.com
+            Subject: DC=org, DC=cheese, O=Cheese, O=Cheese 2, OU=Simple Signing Section, OU=Simple Signing Section 2, CN=*.cheese.org, CN=*.cheese.com, C=FR, C=US, L=TOULOUSE, L=LYON, ST=Cheese org state, ST=Cheese com state/emailAddress=cert@cheese.org/emailAddress=cert@scheese.com
             Subject Public Key Info:
                 Public Key Algorithm: rsaEncryption
                     RSA Public-Key: (2048 bit)
@@ -302,7 +301,7 @@ In the following example, you can see a complete certificate. We will use each p
                     keyid:1E:52:A2:E8:54:D5:37:EB:D5:A8:1D:E4:C2:04:1D:37:E2:F7:70:03
     
                 X509v3 Subject Alternative Name: 
-                    DNS:*.example.org, DNS:*.example.net, DNS:*.example.com, IP Address:10.0.1.0, IP Address:10.0.1.2, email:test@example.org, email:test@example.net
+                    DNS:*.cheese.org, DNS:*.cheese.net, DNS:*.cheese.com, IP Address:10.0.1.0, IP Address:10.0.1.2, email:test@cheese.org, email:test@cheese.net
         Signature Algorithm: sha1WithRSAEncryption
              76:6b:05:b0:0e:34:11:b1:83:99:91:dc:ae:1b:e2:08:15:8b:
              16:b2:9b:27:1c:02:ac:b5:df:1b:d0:d0:75:a4:2b:2c:5c:65:
@@ -422,7 +421,7 @@ The value of the header will be an escaped concatenation of all the selected cer
 The following example shows an unescaped result that uses all the available fields: 
 
 ```text
-Subject="DC=org,DC=cheese,C=FR,C=US,ST=Cheese org state,ST=Cheese com state,L=TOULOUSE,L=LYON,O=Cheese,O=Cheese 2,CN=*.example.com";Issuer="DC=org,DC=cheese,C=FR,C=US,ST=Signing State,ST=Signing State 2,L=TOULOUSE,L=LYON,O=Cheese,O=Cheese 2,CN=Simple Signing CA 2";NB="1544094616";NA="1607166616";SAN="*.example.org,*.example.net,*.example.com,test@example.org,test@example.net,10.0.1.0,10.0.1.2"
+Subject="DC=org,DC=cheese,C=FR,C=US,ST=Cheese org state,ST=Cheese com state,L=TOULOUSE,L=LYON,O=Cheese,O=Cheese 2,CN=*.cheese.com";Issuer="DC=org,DC=cheese,C=FR,C=US,ST=Signing State,ST=Signing State 2,L=TOULOUSE,L=LYON,O=Cheese,O=Cheese 2,CN=Simple Signing CA 2";NB="1544094616";NA="1607166616";SAN="*.cheese.org,*.cheese.net,*.cheese.com,test@cheese.org,test@cheese.net,10.0.1.0,10.0.1.2"
 ```
 
 !!! info "Multiple certificates"
@@ -471,19 +470,19 @@ The data are taken from the following certificate part:
 
 ```text
  X509v3 Subject Alternative Name: 
-    DNS:*.example.org, DNS:*.example.net, DNS:*.example.com, IP Address:10.0.1.0, IP Address:10.0.1.2, email:test@example.org, email:test@example.net
+    DNS:*.cheese.org, DNS:*.cheese.net, DNS:*.cheese.com, IP Address:10.0.1.0, IP Address:10.0.1.2, email:test@cheese.org, email:test@cheese.net
 ```
 
 The escape SANs info part will be like:
 
 ```text
-SAN="*.example.org,*.example.net,*.example.com,test@example.org,test@example.net,10.0.1.0,10.0.1.2"
+SAN="*.cheese.org,*.cheese.net,*.cheese.com,test@cheese.org,test@cheese.net,10.0.1.0,10.0.1.2"
 ```
 
 !!! info "multiple values"
 
     All the SANs data are separated by a `,`.
-
+    
 #### `info.subject`
 
 The `info.subject` select the specific client certificate subject details you want to add to the `X-Forwarded-Tls-Client-Cert-Info` header.
@@ -491,7 +490,7 @@ The `info.subject` select the specific client certificate subject details you wa
 The data are taken from the following certificate part :
 
 ```text
-Subject: DC=org, DC=cheese, O=Cheese, O=Cheese 2, OU=Simple Signing Section, OU=Simple Signing Section 2, CN=*.example.org, CN=*.example.com, C=FR, C=US, L=TOULOUSE, L=LYON, ST=Cheese org state, ST=Cheese com state/emailAddress=cert@example.org/emailAddress=cert@sexample.com
+Subject: DC=org, DC=cheese, O=Cheese, O=Cheese 2, OU=Simple Signing Section, OU=Simple Signing Section 2, CN=*.cheese.org, CN=*.cheese.com, C=FR, C=US, L=TOULOUSE, L=LYON, ST=Cheese org state, ST=Cheese com state/emailAddress=cert@cheese.org/emailAddress=cert@scheese.com
 ```
 
 ##### `info.subject.country`
@@ -549,7 +548,7 @@ The data are taken from the subject part with the `CN` key.
 The escape common name info in the subject part will be like :
 
 ```text
-CN=*.example.com
+CN=*.cheese.com
 ```
 
 ##### `info.subject.serialNumber`

docs/content/middlewares/ratelimit.md

@@ -3,7 +3,7 @@
 To Control the Number of Requests Going to a Service
 {: .subtitle }
 
-The RateLimit middleware ensures that services will receive a _fair_ number of requests, and allows one to define what fair is.
+The RateLimit middleware ensures that services will receive a _fair_ number of requests, and allows you define what is fair.
 
 ## Configuration Example
 
@@ -24,8 +24,8 @@ metadata:
   name: test-ratelimit
 spec:
   rateLimit:
-    average: 100
-    burst: 50
+      average: 100
+      burst: 50
 ```
 
 ```yaml tab="Consul Catalog"
@@ -74,32 +74,25 @@ http:
 
 ### `average`
 
-`average` is the maximum rate, by default in requests by second, allowed for the given source.
-
-It defaults to `0`, which means no rate limiting.
-
-The rate is actually defined by dividing `average` by `period`.
-So for a rate below 1 req/s, one needs to define a `period` larger than a second.
+Average is the maximum rate, in requests/s, allowed for the given source.
+It defaults to 0, which means no rate limiting.
 
 ```yaml tab="Docker"
-# 100 reqs/s
 labels:
   - "traefik.http.middlewares.test-ratelimit.ratelimit.average=100"
 ```
 
 ```yaml tab="Kubernetes"
-# 100 reqs/s
 apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
   name: test-ratelimit
 spec:
   rateLimit:
-    average: 100
+      average: 100
 ```
 
 ```yaml tab="Consul Catalog"
-# 100 reqs/s
 - "traefik.http.middlewares.test-ratelimit.ratelimit.average=100"
 ```
 
@@ -115,14 +108,12 @@ labels:
 ```
 
 ```toml tab="File (TOML)"
-# 100 reqs/s
 [http.middlewares]
   [http.middlewares.test-ratelimit.rateLimit]
     average = 100
 ```
 
 ```yaml tab="File (YAML)"
-# 100 reqs/s
 http:
   middlewares:
     test-ratelimit:
@@ -130,78 +121,10 @@ http:
         average: 100
 ```
 
-### `period`
-
-`period`, in combination with `average`, defines the actual maximum rate, such as:
-
-```go
-r = average / period
-```
-
-It defaults to `1` second.
-
-```yaml tab="Docker"
-# 6 reqs/minute
-labels:
-  - "traefik.http.middlewares.test-ratelimit.ratelimit.average=6"
-  - "traefik.http.middlewares.test-ratelimit.ratelimit.period=1m"
-```
-
-```yaml tab="Kubernetes"
-# 6 reqs/minute
-apiVersion: traefik.containo.us/v1alpha1
-kind: Middleware
-metadata:
-  name: test-ratelimit
-spec:
-  rateLimit:
-    period: 1m
-    average: 6
-```
-
-```yaml tab="Consul Catalog"
-# 6 reqs/minute
-- "traefik.http.middlewares.test-ratelimit.ratelimit.average=6"
-- "traefik.http.middlewares.test-ratelimit.ratelimit.period=1m"
-```
-
-```json tab="Marathon"
-"labels": {
-  "traefik.http.middlewares.test-ratelimit.ratelimit.average": "6",
-  "traefik.http.middlewares.test-ratelimit.ratelimit.period": "1m",
-}
-```
-
-```yaml tab="Rancher"
-# 6 reqs/minute
-labels:
-  - "traefik.http.middlewares.test-ratelimit.ratelimit.average=6"
-  - "traefik.http.middlewares.test-ratelimit.ratelimit.period=1m"
-```
-
-```toml tab="File (TOML)"
-# 6 reqs/minute
-[http.middlewares]
-  [http.middlewares.test-ratelimit.rateLimit]
-    average = 6
-    period = 1m
-```
-
-```yaml tab="File (YAML)"
-# 6 reqs/minute
-http:
-  middlewares:
-    test-ratelimit:
-      rateLimit:
-        average: 6
-        period: 1m
-```
-
 ### `burst`
 
-`burst` is the maximum number of requests allowed to go through in the same arbitrarily small period of time.
-
-It defaults to `1`.
+Burst is the maximum number of requests allowed to go through in the same arbitrarily small period of time.
+It defaults to 1.
 
 ```yaml tab="Docker"
 labels:
@@ -215,7 +138,7 @@ metadata:
   name: test-ratelimit
 spec:
   rateLimit:
-    burst: 100
+      burst: 100
 ```
 
 ```yaml tab="Consul Catalog"

docs/content/middlewares/redirectscheme.md

@@ -208,7 +208,7 @@ metadata:
 spec:
   redirectScheme:
     # ...
-    port: "443"
+    port: 443
 ```
 
 ```yaml tab="Consul Catalog"
@@ -247,7 +247,5 @@ http:
     test-redirectscheme:
       redirectScheme:
         # ...
-        port: "443"
+        port: 443
 ```
-
-!!! info "Port in this configuration is a string, not a numeric value."

docs/content/migration/v1-to-v2.md

@@ -40,7 +40,7 @@ Then any router can refer to an instance of the wanted middleware.
     ```
 
     ```yaml tab="K8s Ingress"
-    apiVersion: networking.k8s.io/v1beta1
+    apiVersion: extensions/v1beta1
     kind: Ingress
     metadata:
       name: traefik
@@ -50,7 +50,7 @@ Then any router can refer to an instance of the wanted middleware.
         traefik.ingress.kubernetes.io/rule-type: PathPrefix
     spec:
       rules:
-      - host: test.localhost
+      - host: test.locahost
         http:
           paths:
           - path: /test
@@ -97,14 +97,14 @@ Then any router can refer to an instance of the wanted middleware.
 
     ```yaml tab="Docker"
     labels:
-      - "traefik.http.routers.router0.rule=Host(`test.localhost`) && PathPrefix(`/test`)"
+      - "traefik.http.routers.router0.rule=Host(`bar.com`) && PathPrefix(`/test`)"
       - "traefik.http.routers.router0.middlewares=auth"
       - "traefik.http.middlewares.auth.basicauth.users=test:$$apr1$$H6uskkkW$$IgXLP6ewTrSuBkTrqE8wj/,test2:$$apr1$$d9hr9HBB$$4HxwgUir3HP4EsggP/QNo0"
     ```
 
     ```yaml tab="K8s IngressRoute"
     # The definitions below require the definitions for the Middleware and IngressRoute kinds.
-    # https://docs.traefik.io/v2.2/reference/dynamic-configuration/kubernetes-crd/#definitions
+    # https://docs.traefik.io/v2.1/reference/dynamic-configuration/kubernetes-crd/#definitions
     apiVersion: traefik.containo.us/v1alpha1
     kind: Middleware
     metadata:
@@ -205,8 +205,8 @@ Then, a [router's TLS field](../routing/routers/index.md#tls) can refer to one o
           cipherSuites = [
             "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
             "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
-            "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256",
-            "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256",
+            "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305",
+            "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305",
             "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
             "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
           ]
@@ -216,7 +216,7 @@ Then, a [router's TLS field](../routing/routers/index.md#tls) can refer to one o
     ```
 
     ```bash tab="CLI"
-    --entryPoints='Name:websecure Address::443 TLS:path/to/my.cert,path/to/my.key TLS.MinVersion:VersionTLS12 TLS.CipherSuites:TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256'
+    --entryPoints='Name:websecure Address::443 TLS:path/to/my.cert,path/to/my.key TLS.MinVersion:VersionTLS12 TLS.CipherSuites:TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256'
     ```
 
     !!! info "v2"
@@ -225,7 +225,7 @@ Then, a [router's TLS field](../routing/routers/index.md#tls) can refer to one o
     # dynamic configuration
     [http.routers]
       [http.routers.Router-1]
-        rule = "Host(`example.com`)"
+        rule = "Host(`bar.com`)"
         service = "service-id"
         # will terminate the TLS request
         [http.routers.Router-1.tls]
@@ -241,8 +241,8 @@ Then, a [router's TLS field](../routing/routers/index.md#tls) can refer to one o
         cipherSuites = [
           "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
           "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
-          "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256",
-          "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256",
+          "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305",
+          "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305",
           "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
           "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
         ]
@@ -252,7 +252,7 @@ Then, a [router's TLS field](../routing/routers/index.md#tls) can refer to one o
     http:
       routers:
         Router-1:
-          rule: "Host(`example.com`)"
+          rule: "Host(`bar.com`)"
           service: service-id
           # will terminate the TLS request
           tls:
@@ -267,15 +267,15 @@ Then, a [router's TLS field](../routing/routers/index.md#tls) can refer to one o
           minVersion: VersionTLS12
           cipherSuites:
 	        - TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
-	        - TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256
-	        - TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
+	        - TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
+	        - TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305
 	        - TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
 	        - TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
     ```
 
     ```yaml tab="K8s IngressRoute"
     # The definitions below require the definitions for the TLSOption and IngressRoute kinds.
-    # https://docs.traefik.io/v2.2/reference/dynamic-configuration/kubernetes-crd/#definitions
+    # https://docs.traefik.io/v2.1/reference/dynamic-configuration/kubernetes-crd/#definitions
     apiVersion: traefik.containo.us/v1alpha1
     kind: TLSOption
     metadata:
@@ -286,8 +286,8 @@ Then, a [router's TLS field](../routing/routers/index.md#tls) can refer to one o
       minVersion: VersionTLS12
       cipherSuites:
 	    - TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
-	    - TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256
-	    - TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
+	    - TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
+	    - TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305
 	    - TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
 	    - TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
     
@@ -301,7 +301,7 @@ Then, a [router's TLS field](../routing/routers/index.md#tls) can refer to one o
       entryPoints:
         - web
       routes:
-        - match: Host(`example.com`)
+        - match: Host(`bar.com`)
           kind: Rule
           services:
             - name: whoami
@@ -322,12 +322,9 @@ Then, a [router's TLS field](../routing/routers/index.md#tls) can refer to one o
 ## HTTP to HTTPS Redirection is Now Configured on Routers
 
 Previously on Traefik v1, the redirection was applied on an entry point or on a frontend.
-With Traefik v2 it is applied on an entry point or a [Router](../routing/routers/index.md). 
+With Traefik v2 it is applied on a [Router](../routing/routers/index.md). 
 
-To apply a redirection:
-
-- on an entry point, the [HTTP redirection](../routing/entrypoints.md#redirection) has to be configured.
-- on a router, one of the redirect middlewares, [RedirectRegex](../middlewares/redirectregex.md) or [RedirectScheme](../middlewares/redirectscheme.md), has to be configured and added to the router middlewares list.
+To apply a redirection, one of the redirect middlewares, [RedirectRegex](../middlewares/redirectregex.md) or [RedirectScheme](../middlewares/redirectscheme.md), has to be configured and added to the router middlewares list.
 
 !!! example "Global HTTP to HTTPS redirection"
 
@@ -355,28 +352,97 @@ To apply a redirection:
 
     !!! info "v2"
     
-    ```bash tab="CLI"
-    ## static configuration
+    ```yaml tab="Docker"
+    # ...
+      traefik:
+        image: traefik:v2.1
+        command:
+          - --entrypoints.web.address=:80
+          - --entrypoints.websecure.address=:443
+          - --providers.docker=true
+        ports:
+          - 80:80
+          - 443:443
+        labels:
+          traefik.http.routers.http_catchall.rule: HostRegexp(`{any:.+}`)
+          traefik.http.routers.http_catchall.entrypoints: web
+          traefik.http.routers.http_catchall.middlewares: https_redirect
+          traefik.http.middlewares.https_redirect.redirectscheme.scheme: https
+          traefik.http.middlewares.https_redirect.redirectscheme.permanent: true
+        volumes:
+          - /var/run/docker.sock:/var/run/docker.sock
+    ```
     
-    --entrypoints.web.address=:80
-    --entrypoints.web.http.redirections.entrypoint.to=websecure
-    --entrypoints.web.http.redirections.entrypoint.scheme=https
-    --entrypoints.websecure.address=:443
-    --providers.docker=true
+    ```yaml tab="K8s IngressRoute"
+    # The entry points web (port 80) and websecure (port 443) must be defined the static configuration.
+    apiVersion: traefik.containo.us/v1alpha1
+    kind: IngressRoute
+    metadata:
+      name: http_catchall
+      namespace: traefik
+    spec:
+      entryPoints:
+        - web
+      routes:
+        - match: HostRegexp(`{any:.+}`)
+          kind: Rule
+          services:
+            # any service in the namespace
+            # the service will be never called
+            - name: noop
+              port: 80
+          middlewares:
+            - name: https_redirect
+              # if the Middleware has distinct namespace
+              namespace: traefik
+    
+    ---
+    apiVersion: traefik.containo.us/v1alpha1
+    kind: Middleware 
+    metadata:
+      name: https_redirect
+      namespace: traefik
+    spec:
+      redirectScheme:
+        scheme: https
+        permanent: true
     ```
     
     ```toml tab="File (TOML)"
     # traefik.toml
     ## static configuration
     
-    [entryPoints.web]
-      address = ":80"
-      [entryPoints.web.http.redirections.entryPoint]
-        to = "websecure"
+    [entryPoints]
+      [entryPoints.web]
+        address = 80
+      [entryPoints.websecure]
+        address = 443
+    
+    [providers.file]
+      directory = "/dynamic/"
+    
+    ##--------------------##
+    
+    # /dynamic/redirect.toml
+    ## dynamic configuration
+    
+    [http.routers]
+      [http.routers.http_catchall]
+        entryPoints = ["web"]
+        middlewares = ["https_redirect"]
+        rule = "HostRegexp(`{any:.+}`)"
+        service = "noop"
+    
+    [http.services]
+      # noop service, the URL will be never called
+      [http.services.noop.loadBalancer]
+        [[http.services.noop.loadBalancer.servers]]
+          url = "http://192.168.0.1:1337"
+    
+    [http.middlewares]
+      [http.middlewares.https_redirect.redirectScheme]
         scheme = "https"
-   
-    [entryPoints.websecure]
-      address = ":443"
+        permanent = true
     ```
     
     ```yaml tab="File (YAML)"
@@ -386,14 +452,40 @@ To apply a redirection:
     entryPoints:
       web:
         address: 80
-        http:
-          redirections:
-            entrypoint:
-              to: websecure
-              scheme: https
-    
       websecure:
         address: 443
+    
+    providers:
+      file:
+        directory: /dynamic/
+    
+    ##--------------------##
+    
+    # /dynamic/redirect.yml
+    ## dynamic configuration
+    
+    http:
+      routers:
+        http_catchall:
+          entryPoints:
+            - web
+          middlewares:
+            - https_redirect
+          rule: "HostRegexp(`{any:.+}`)"
+          service: noop
+    
+      services:
+        # noop service, the URL will be never called
+        noop:
+          loadBalancer:
+            servers:
+              - url: http://192.168.0.1:1337
+    
+      middlewares:
+        https_redirect:
+          redirectScheme:
+            scheme: https
+            permanent: true
     ```
 
 !!! example "HTTP to HTTPS redirection per domain"
@@ -401,35 +493,37 @@ To apply a redirection:
     !!! info "v1"
     
     ```toml tab="File (TOML)"
+    # static configuration
+    defaultEntryPoints = ["web", "websecure"]
+    
     [entryPoints]
       [entryPoints.web]
         address = ":80"
+        [entryPoints.web.redirect]
+          entryPoint = "websecure"
 
       [entryPoints.websecure]
         address = ":443"
         [entryPoints.websecure.tls]
-    
-    [file]
-    
-    [frontends]
-      [frontends.frontend1]
-        entryPoints = ["web", "websecure"]
-        [frontends.frontend1.routes]
-          [frontends.frontend1.routes.route0]
-            rule = "Host:example.net"
-        [frontends.frontend1.redirect]
-          entryPoint = "websecure"
+          [[entryPoints.websecure.tls.certificates]]
+            certFile = "examples/traefik.crt"
+            keyFile = "examples/traefik.key"
+    ```
+
+    ```bash tab="CLI"
+    --entrypoints=Name:web Address::80 Redirect.EntryPoint:websecure
+    --entryPoints='Name:websecure Address::443 TLS:path/to/my.cert,path/to/my.key'
     ```
 
     !!! info "v2"
 
     ```yaml tab="Docker"
     labels:
-      traefik.http.routers.app.rule: Host(`example.net`)
+      traefik.http.routers.app.rule: Host(`foo.com`)
       traefik.http.routers.app.entrypoints: web
       traefik.http.routers.app.middlewares: https_redirect
     
-      traefik.http.routers.appsecured.rule: Host(`example.net`)
+      traefik.http.routers.appsecured.rule: Host(`foo.com`)
       traefik.http.routers.appsecured.entrypoints: websecure
       traefik.http.routers.appsecured.tls: true
     
@@ -447,7 +541,7 @@ To apply a redirection:
       entryPoints:
         - web
       routes:
-        - match: Host(`example.net`)
+        - match: Host(`foo.com`)
           kind: Rule
           services:
             - name: whoami
@@ -484,36 +578,69 @@ To apply a redirection:
     ```
 
     ```toml tab="File (TOML)"
+    ## static configuration
+    # traefik.toml
+    
+    [entryPoints.web]
+      address = ":80"
+    
+    [entryPoints.websecure]
+      address = ":443"
+    
+    ##---------------------##
+    
     ## dynamic configuration
     # dynamic-conf.toml
     
     [http.routers]
       [http.routers.router0]
-        rule = "Host(`example.net`)"
+        rule = "Host(`foo.com`)"
         service = "my-service"
         entrypoints = ["web"]
         middlewares = ["https_redirect"]
     
     [http.routers.router1]
-        rule = "Host(`example.net`)"
+        rule = "Host(`foo.com`)"
         service = "my-service"
         entrypoints = ["websecure"]
         [http.routers.router1.tls]
+        
+    [http.services]
+      [[http.services.my-service.loadBalancer.servers]]
+        url = "http://10.10.10.1:80"
+      [[http.services.my-service.loadBalancer.servers]]
+        url = "http://10.10.10.2:80"
     
     [http.middlewares]
       [http.middlewares.https_redirect.redirectScheme]
         scheme = "https"
         permanent = true
+    
+    [[tls.certificates]]
+      certFile = "/path/to/domain.cert"
+      keyFile = "/path/to/domain.key"
     ```
 
     ```yaml tab="File (YAML)"
+    ## static configuration
+    # traefik.yml
+    
+    entryPoints:
+      web:
+        address: ":80"
+    
+      websecure:
+        address: ":443"
+    
+    ##---------------------##
+    
     ## dynamic configuration
     # dynamic-conf.yml
     
     http:
       routers:
         router0:
-          rule: "Host(`example.net`)"
+          rule: "Host(`foo.com`)"
           entryPoints:
             - web
           middlewares:
@@ -521,17 +648,29 @@ To apply a redirection:
           service: my-service
     
         router1:
-          rule: "Host(`example.net`)"
+          rule: "Host(`foo.com`)"
           entryPoints:
             - websecure
           service: my-service
           tls: {}
     
+      services:
+        my-service:
+          loadBalancer:
+            servers:
+              - url: http://10.10.10.1:80
+              - url: http://10.10.10.2:80
+    
       middlewares:
         https_redirect:
           redirectScheme:
             scheme: https
             permanent: true
+    
+    tls:
+      certificates:
+        - certFile: /app/certs/server/server.pem
+          keyFile: /app/certs/server/server.pem
     ```
 
 ## Strip and Rewrite Path Prefixes
@@ -541,11 +680,11 @@ With the new core notions of v2 (introduced earlier in the section
 transforming the URL path prefix of incoming requests is configured with [middlewares](../middlewares/overview.md),
 after the routing step with [router rule `PathPrefix`](../routing/routers/index.md#rule).
 
-Use Case: Incoming requests to `http://example.org/admin` are forwarded to the webapplication "admin",
+Use Case: Incoming requests to `http://company.org/admin` are forwarded to the webapplication "admin",
 with the path `/admin` stripped, e.g. to `http://<IP>:<port>/`. In this case, you must:
 
-- First, configure a router named `admin` with a rule matching at least the path prefix with the `PathPrefix` keyword,
-- Then, define a middleware of type [`stripprefix`](../middlewares/stripprefix.md), which removes the prefix `/admin`, associated to the router `admin`.
+* First, configure a router named `admin` with a rule matching at least the path prefix with the `PathPrefix` keyword,
+* Then, define a middleware of type [`stripprefix`](../middlewares/stripprefix.md), which removes the prefix `/admin`, associated to the router `admin`.
 
 !!! example "Strip Path Prefix When Forwarding to Backend"
 
@@ -553,7 +692,7 @@ with the path `/admin` stripped, e.g. to `http://<IP>:<port>/`. In this case, yo
 
     ```yaml tab="Docker"
     labels:
-      - "traefik.frontend.rule=Host:example.org;PathPrefixStrip:/admin"
+      - "traefik.frontend.rule=Host:company.org;PathPrefixStrip:/admin"
     ```
 
     ```yaml tab="Kubernetes Ingress"
@@ -566,7 +705,7 @@ with the path `/admin` stripped, e.g. to `http://<IP>:<port>/`. In this case, yo
         traefik.ingress.kubernetes.io/rule-type: PathPrefixStrip
     spec:
       rules:
-      - host: example.org
+      - host: company.org
         http:
           paths:
           - path: /admin
@@ -578,14 +717,14 @@ with the path `/admin` stripped, e.g. to `http://<IP>:<port>/`. In this case, yo
     ```toml tab="File (TOML)"
     [frontends.admin]
       [frontends.admin.routes.admin_1]
-      rule = "Host:example.org;PathPrefixStrip:/admin"
+      rule = "Host:company.org;PathPrefixStrip:/admin"
     ```
 
     !!! info "v2"
 
     ```yaml tab="Docker"
     labels:
-      - "traefik.http.routers.admin.rule=Host(`example.org`) && PathPrefix(`/admin`)"
+      - "traefik.http.routers.admin.rule=Host(`company.org`) && PathPrefix(`/admin`)"
       - "traefik.http.routers.admin.middlewares=admin-stripprefix"
       - "traefik.http.middlewares.admin-stripprefix.stripprefix.prefixes=/admin"
     ```
@@ -601,7 +740,7 @@ with the path `/admin` stripped, e.g. to `http://<IP>:<port>/`. In this case, yo
       entryPoints:
         - web
       routes:
-        - match: Host(`example.org`) && PathPrefix(`/admin`)
+        - match: Host(`company.org`) && PathPrefix(`/admin`)
           kind: Rule
           services:
             - name: admin-svc
@@ -624,7 +763,7 @@ with the path `/admin` stripped, e.g. to `http://<IP>:<port>/`. In this case, yo
     # dynamic-conf.toml
 
     [http.routers.router1]
-        rule = "Host(`example.org`) && PathPrefix(`/admin`)"
+        rule = "Host(`company.org`) && PathPrefix(`/admin`)"
         service = "admin-svc"
         entrypoints = ["web"]
         middlewares = ["admin-stripprefix"]
@@ -647,7 +786,7 @@ with the path `/admin` stripped, e.g. to `http://<IP>:<port>/`. In this case, yo
           service: admin-svc
           middlewares:
             - "admin-stripprefix"
-          rule: "Host(`example.org`) && PathPrefix(`/admin`)"
+          rule: "Host(`company.org`) && PathPrefix(`/admin`)"
 
       middlewares:
         admin-stripprefix:
@@ -662,10 +801,10 @@ with the path `/admin` stripped, e.g. to `http://<IP>:<port>/`. In this case, yo
 
     Instead of removing the path prefix with the [`stripprefix` middleware](../../middlewares/stripprefix/), you can also:
 
-    - Add a path prefix with the [`addprefix` middleware](../../middlewares/addprefix/)
-    - Replace the complete path of the request with the [`replacepath` middleware](../../middlewares/replacepath/)
-    - ReplaceRewrite path using Regexp with the [`replacepathregex` middleware](../../middlewares/replacepathregex/)
-    - And a lot more on the [`middlewares` page](../../middlewares/overview/)
+    * Add a path prefix with the [`addprefix` middleware](../../middlewares/addprefix/)
+    * Replace the complete path of the request with the [`replacepath` middleware](../../middlewares/replacepath/)
+    * ReplaceRewrite path using Regexp with the [`replacepathregex` middleware](../../middlewares/replacepathregex/)
+    * And a lot more on the [`middlewares` page](../../middlewares/overview/)
 
 ## ACME (LetsEncrypt)
 
@@ -688,22 +827,23 @@ with the path `/admin` stripped, e.g. to `http://<IP>:<port>/`. In this case, yo
       [entryPoints.websecure.tls]
     
     [acme]
-      email = "your-email-here@example.com"
+      email = "your-email-here@my-awesome-app.org"
       storage = "acme.json"
       entryPoint = "websecure"
       onHostRule = true
-      [acme.tlsChallenge]
+      [acme.httpChallenge]
+        entryPoint = "web"
     ```
 
     ```bash tab="CLI"
     --defaultentrypoints=websecure,web
     --entryPoints=Name:web Address::80 Redirect.EntryPoint:websecure
     --entryPoints=Name:websecure Address::443 TLS
-    --acme.email=your-email-here@example.com
+    --acme.email=your-email-here@my-awesome-app.org
     --acme.storage=acme.json
     --acme.entryPoint=websecure
     --acme.onHostRule=true
-    --acme.tlschallenge=true
+    --acme.httpchallenge.entrypoint=http
     ```
 
     !!! info "v2"
@@ -716,13 +856,13 @@ with the path `/admin` stripped, e.g. to `http://<IP>:<port>/`. In this case, yo
     
       [entryPoints.websecure]
         address = ":443"
-      [entryPoints.websecure.http.tls]
-        certResolver = "myresolver"
     
     [certificatesResolvers.myresolver.acme]
-      email = "your-email@example.com"
+      email = "your-email@your-domain.org"
       storage = "acme.json"
-      [certificatesResolvers.myresolver.acme.tlsChallenge]
+      [certificatesResolvers.myresolver.acme.httpChallenge]
+        # used during the challenge
+        entryPoint = "web"
     ```
 
     ```yaml tab="File (YAML)"
@@ -732,24 +872,23 @@ with the path `/admin` stripped, e.g. to `http://<IP>:<port>/`. In this case, yo
     
       websecure:
         address: ":443"
-        http:
-          tls:
-            certResolver: myresolver
     
     certificatesResolvers:
       myresolver:
         acme:
-          email: your-email@example.com
+          email: your-email@your-domain.org
           storage: acme.json
-          tlsChallenge: {}
+          httpChallenge:
+            # used during the challenge
+            entryPoint: web
     ```
 
     ```bash tab="CLI"
-    --entrypoints.web.address=:80
-    --entrypoints.websecure.address=:443
-    --certificatesresolvers.myresolver.acme.email=your-email@example.com
-    --certificatesresolvers.myresolver.acme.storage=acme.json
-    --certificatesresolvers.myresolver.acme.tlschallenge=true
+    --entryPoints.web.address=:80
+    --entryPoints.websecure.address=:443
+    --certificatesResolvers.myresolver.acme.email=your-email@your-domain.org
+    --certificatesResolvers.myresolver.acme.storage=acme.json
+    --certificatesResolvers.myresolver.acme.httpChallenge.entryPoint=web
     ```
 
 ## Traefik Logs
@@ -800,13 +939,6 @@ There is no more log configuration at the root level.
     --log.format=json
     ```
 
-## Access Logs
-
-Access Logs are configured in the same way as before.
-
-But all request headers are now filtered out by default in Traefik v2.
-So during migration, you might want to consider enabling some needed fields (see [access log configuration](../observability/access-logs.md)).
-
 ## Tracing
 
 Traefik v2 retains OpenTracing support. The `backend` root option from the v1 is gone, you just have to set your [tracing configuration](../observability/tracing/overview.md).
@@ -1005,11 +1137,14 @@ Each root item has been moved to a related section or removed.
 ## Dashboard
 
 You need to activate the API to access the [dashboard](../operations/dashboard.md).
+As the dashboard access is now secured by default you can either:
 
-To activate the dashboard, you can either:
+* define a  [specific router](../operations/api.md#configuration) with the `api@internal` service and one authentication middleware like the following example
+* or use the [insecure](../operations/api.md#insecure) option of the API
 
-- use the [secure mode](../operations/dashboard.md#secure-mode) with the `api@internal` service like in the following examples
-- or use the [insecure mode](../operations/api.md#insecure)
+!!! info "Dashboard with k8s and dedicated router"
+
+    As `api@internal` is not a Kubernetes service, you have to use the file provider or the `insecure` API option.
 
 !!! example "Activate and access the dashboard"
 
@@ -1043,7 +1178,7 @@ To activate the dashboard, you can either:
     # dynamic configuration
     labels:
       - "traefik.http.routers.api.rule=Host(`traefik.docker.localhost`)"
-      - "traefik.http.routers.api.entrypoints=websecure"
+      - "traefik.http.routers.api.entrypoints=websecured"
       - "traefik.http.routers.api.service=api@internal"
       - "traefik.http.routers.api.middlewares=myAuth"
       - "traefik.http.routers.api.tls"
@@ -1121,28 +1256,28 @@ To activate the dashboard, you can either:
 
 Supported [providers](../providers/overview.md), for now:
 
-- [ ] Azure Service Fabric
-- [x] Consul
-- [x] Consul Catalog
-- [x] Docker
-- [ ] DynamoDB
-- [ ] ECS
-- [x] Etcd
-- [ ] Eureka
-- [x] File
-- [x] Kubernetes Ingress
-- [x] Kubernetes IngressRoute
-- [x] Marathon
-- [ ] Mesos
-- [x] Rancher
-- [x] Redis
-- [x] Rest
-- [x] Zookeeper
+* [ ] Azure Service Fabric
+* [ ] BoltDB
+* [ ] Consul
+* [x] Consul Catalog
+* [x] Docker
+* [ ] DynamoDB
+* [ ] ECS
+* [ ] Etcd
+* [ ] Eureka
+* [x] File
+* [x] Kubernetes Ingress (without annotations)
+* [x] Kubernetes IngressRoute
+* [x] Marathon
+* [ ] Mesos
+* [x] Rancher
+* [x] Rest
+* [ ] Zookeeper
 
 ## Some Tips You Should Know
 
-- Different sources of static configuration (file, CLI flags, ...) cannot be [mixed](../getting-started/configuration-overview.md#the-static-configuration).
-- Now, configuration elements can be referenced between different providers by using the provider namespace notation: `@<provider>`.
+* Different sources of static configuration (file, CLI flags, ...) cannot be [mixed](../getting-started/configuration-overview.md#the-static-configuration).
+* Now, configuration elements can be referenced between different providers by using the provider namespace notation: `@<provider>`.
   For instance, a router named `myrouter` in a File Provider can refer to a service named `myservice` defined in Docker Provider with the following notation: `myservice@docker`.
-- Middlewares are applied in the same order as their declaration in router.
-- If you have any questions feel free to join our [community forum](https://community.containo.us).
+* Middlewares are applied in the same order as their declaration in router.
+* If you have any questions feel free to join our [community forum](https://community.containo.us).

docs/content/migration/v2.md

@@ -1,17 +1,5 @@
 # Migration: Steps needed between the versions
 
-## v2.2.2 to v2.2.5
-
-### InsecureSNI removal
-
-In `v2.2.2` we introduced a new flag (`insecureSNI`) which was available as a global option to disable domain fronting.
-Since `v2.2.5` this global option has been removed, and you should not use it anymore.
-
-### HostSNI rule matcher removal
-
-In `v2.2.2` we introduced a new rule matcher (`HostSNI`) which was allowing to match the Server Name Indication at the router level.
-Since `v2.2.5` this rule has been removed, and you should not use it anymore.
-
 ## v2.0 to v2.1
 
 ### Kubernetes CRD
@@ -73,244 +61,42 @@ rules:
       - traefik.containo.us
     resources:
       - middlewares
-      - ingressroutes
-      - traefikservices
-      - ingressroutetcps
-      - tlsoptions
     verbs:
       - get
       - list
       - watch
-```
-
-After having both resources applied, Traefik will work properly.
-
-## v2.1 to v2.2
-
-### Headers middleware: accessControlAllowOrigin
-
-`accessControlAllowOrigin` is deprecated.
-This field will be removed in future 2.x releases.
-Please configure your allowed origins in `accessControlAllowOriginList` instead.
-
-### Kubernetes CRD
-
-In v2.2, new Kubernetes CRDs called `TLSStore` and `IngressRouteUDP` were added.
-While updating an installation to v2.2,
-one should apply that CRDs, and update the existing `ClusterRole` definition to allow Traefik to use that CRDs.
-
-To add that CRDs and enhance the permissions, following definitions need to be applied to the cluster.
-
-```yaml tab="TLSStore"
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  name: tlsstores.traefik.containo.us
-
-spec:
-  group: traefik.containo.us
-  version: v1alpha1
-  names:
-    kind: TLSStore
-    plural: tlsstores
-    singular: tlsstore
-  scope: Namespaced
-
-```
-
-```yaml tab="IngressRouteUDP"
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  name: ingressrouteudps.traefik.containo.us
-
-spec:
-  group: traefik.containo.us
-  version: v1alpha1
-  names:
-    kind: IngressRouteUDP
-    plural: ingressrouteudps
-    singular: ingressrouteudp
-  scope: Namespaced
-
-```
-
-```yaml tab="ClusterRole"
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1beta1
-metadata:
-  name: traefik-ingress-controller
-
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - services
-      - endpoints
-      - secrets
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - extensions
-    resources:
-      - ingresses
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - extensions
-    resources:
-      - ingresses/status
-    verbs:
-      - update
   - apiGroups:
       - traefik.containo.us
     resources:
-      - middlewares
       - ingressroutes
-      - traefikservices
-      - ingressroutetcps
-      - ingressrouteudps
-      - tlsoptions
-      - tlsstores
     verbs:
       - get
       - list
       - watch
-
+  - apiGroups:
+      - traefik.containo.us
+    resources:
+      - ingressroutetcps
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - traefik.containo.us
+    resources:
+      - tlsoptions
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - traefik.containo.us
+    resources:
+      - traefikservices
+    verbs:
+      - get
+      - list
+      - watch
 ```
 
 After having both resources applied, Traefik will work properly.
-
-### Kubernetes Ingress
-
-To enable HTTPS, it is not sufficient anymore to only rely on a TLS section in the Ingress.
-
-#### Expose an Ingress on 80 and 443
-
-Define the default TLS configuration on the HTTPS entry point. 
-
-```yaml tab="Ingress"
-kind: Ingress
-apiVersion: networking.k8s.io/v1beta1
-metadata:
-  name: example
-
-spec:
-  tls:
-  - secretName: myTlsSecret
-
-  rules:
-  - host: example.com
-    http:
-      paths:
-      - path: "/foo"
-        backend:
-          serviceName: example-com
-          servicePort: 80
-```
-
-Entry points definition and enable Ingress provider:
-
-```yaml tab="File (YAML)"
-# Static configuration
-
-entryPoints:
-  web:
-    address: :80
-  websecure:
-    address: :443
-    http:
-      tls: {}
-
-providers:
-  kubernetesIngress: {}
-```
-
-```toml tab="File (TOML)"
-# Static configuration
-
-[entryPoints.web]
-  address = ":80"
-
-[entryPoints.websecure]
-  address = ":443"
-  [entryPoints.websecure.http]
-    [entryPoints.websecure.http.tls]
-
-[providers.kubernetesIngress]
-```
-
-```bash tab="CLI"
-# Static configuration
-
---entryPoints.web.address=:80
---entryPoints.websecure.address=:443
---entryPoints.websecure.http.tls=true
---providers.kubernetesIngress=true
-```
-
-#### Use TLS only on one Ingress
-
-Define the TLS restriction with annotations.
-
-```yaml tab="Ingress"
-kind: Ingress
-apiVersion: networking.k8s.io/v1beta1
-metadata:
-  name: example-tls
-  annotations:
-    traefik.ingress.kubernetes.io/router.entrypoints: websecure
-    traefik.ingress.kubernetes.io/router.tls: "true"
-
-spec:
-  tls:
-  - secretName: myTlsSecret
-
-  rules:
-  - host: example.com
-    http:
-      paths:
-      - path: ""
-        backend:
-          serviceName: example-com
-          servicePort: 80
-```
-
-Entry points definition and enable Ingress provider:
-
-```yaml tab="File (YAML)"
-# Static configuration
-
-entryPoints:
-  web:
-    address: :80
-  websecure:
-    address: :443
-
-providers:
-  kubernetesIngress: {}
-```
-
-```toml tab="File (TOML)"
-# Static configuration
-
-[entryPoints.web]
-  address = ":80"
-
-[entryPoints.websecure]
-  address = ":443"
-
-[providers.kubernetesIngress]
-```
-
-```bash tab="CLI"
-# Static configuration
-
---entryPoints.web.address=:80
---entryPoints.websecure.address=:443
---providers.kubernetesIngress=true
-```

docs/content/observability/access-logs.md

@@ -111,9 +111,9 @@ accessLog:
 --accesslog.filters.minduration=10ms
 ```
 
-### Limiting the Fields/Including Headers
+### Limiting the Fields
 
-You can decide to limit the logged fields/headers to a given list with the `fields.names` and `fields.headers` options.
+You can decide to limit the logged fields/headers to a given list with the `fields.names` and `fields.header` options
 
 Each field can be set to:
 
@@ -121,7 +121,7 @@ Each field can be set to:
 - `drop` to drop the value
 - `redact` to replace the value with "redacted"
 
-The `defaultMode` for `fields.headers` is `drop`.
+The `defaultMode` for `fields.header` is `drop`.
 
 ```toml tab="File (TOML)"
 # Limiting the Logs to Specific Fields
@@ -181,10 +181,10 @@ accessLog:
     | `StartUTC`              | The time at which request processing started.                                                                                                                       |
     | `StartLocal`            | The local time at which request processing started.                                                                                                                 |
     | `Duration`              | The total time taken (in nanoseconds) by processing the response, including the origin server's time but not the log writing time.                                  |
-    | `RouterName`            | The name of the Traefik  router.                                                                                                                                    |
-    | `ServiceName`           | The name of the Traefik backend.                                                                                                                                    |
-    | `ServiceURL`            | The URL of the Traefik backend.                                                                                                                                     |
-    | `ServiceAddr`           | The IP:port of the Traefik backend (extracted from `ServiceURL`)                                                                                                    |
+    | `FrontendName`          | The name of the Traefik frontend.                                                                                                                                   |
+    | `BackendName`           | The name of the Traefik backend.                                                                                                                                    |
+    | `BackendURL`            | The URL of the Traefik backend.                                                                                                                                     |
+    | `BackendAddr`           | The IP:port of the Traefik backend (extracted from `BackendURL`)                                                                                                    |
     | `ClientAddr`            | The remote address in its original form (usually IP:port).                                                                                                          |
     | `ClientHost`            | The remote IP address from which the client request was received.                                                                                                   |
     | `ClientPort`            | The remote TCP port from which the client request was received.                                                                                                     |

docs/content/observability/tracing/elastic.md

@@ -1,88 +0,0 @@
-# Elastic
-
-To enable the Elastic:
-
-```toml tab="File (TOML)"
-[tracing]
-  [tracing.elastic]
-```
-
-```yaml tab="File (YAML)"
-tracing:
-  elastic: {}
-```
-
-```bash tab="CLI"
---tracing.elastic=true
-```
-
-#### `serverURL`
-
-_Optional, Default="http://localhost:8200"_
-
-APM ServerURL is the URL of the Elastic APM server.
-
-```toml tab="File (TOML)"
-[tracing]
-  [tracing.elastic]
-    serverURL = "http://apm:8200"
-```
-
-```yaml tab="File (YAML)"
-tracing:
-  elastic:
-    serverURL: "http://apm:8200"
-```
-
-```bash tab="CLI"
---tracing.elastic.serverurl="http://apm:8200"
-```
-
-#### `secretToken`
-
-_Optional, Default=""_
-
-APM Secret Token is the token used to connect to Elastic APM Server.
-
-```toml tab="File (TOML)"
-[tracing]
-  [tracing.elastic]
-    secretToken = "mytoken"
-```
-
-```yaml tab="File (YAML)"
-tracing:
-  elastic:
-    secretToken: "mytoken"
-```
-
-```bash tab="CLI"
---tracing.elastic.secrettoken="mytoken"
-```
-
-#### `serviceEnvironment`
-
-_Optional, Default=""_
-
-APM Service Environment is the name of the environment Traefik is deployed in, e.g. `production` or `staging`.
-
-```toml tab="File (TOML)"
-[tracing]
-  [tracing.elastic]
-    serviceEnvironment = "production"
-```
-
-```yaml tab="File (YAML)"
-tracing:
-  elastic:
-    serviceEnvironment: "production"
-```
-
-```bash tab="CLI"
---tracing.elastic.serviceenvironment="production"
-```
-
-### Further
-
-Additional configuration of Elastic APM Go agent can be done using environment variables.
-See [APM Go agent reference](https://www.elastic.co/guide/en/apm/agent/go/current/configuration.html).

docs/content/observability/tracing/overview.md

@@ -7,14 +7,13 @@ The tracing system allows developers to visualize call flows in their infrastruc
 
 Traefik uses OpenTracing, an open standard designed for distributed tracing.
 
-Traefik supports six tracing backends:
+Traefik supports five tracing backends:
 
 - [Jaeger](./jaeger.md)
 - [Zipkin](./zipkin.md)
 - [Datadog](./datadog.md)
 - [Instana](./instana.md)
 - [Haystack](./haystack.md)
-- [Elastic](./elastic.md)
 
 ## Configuration
 

docs/content/operations/api.md

@@ -50,21 +50,21 @@ And then define a routing configuration on Traefik itself with the
     However, you can also use "path prefix" rule or any combination or rules.
 
     ```bash tab="Host Rule"
-    # Matches http://traefik.example.com, http://traefik.example.com/api
-    # or http://traefik.example.com/hello
-    rule = "Host(`traefik.example.com`)"
+    # Matches http://traefik.domain.com, http://traefik.domain.com/api
+    # or http://traefik.domain.com/hello
+    rule = "Host(`traefik.domain.com`)"
     ```
 
     ```bash tab="Path Prefix Rule"
-    # Matches http://api.traefik.example.com/api or http://example.com/api
-    # but does not match http://api.traefik.example.com/hello
+    # Matches http://api.traefik.domain.com/api or http://domain.com/api
+    # but does not match http://api.traefik.domain.com/hello
     rule = "PathPrefix(`/api`)"
     ```
 
     ```bash tab="Combination of Rules"
-    # Matches http://traefik.example.com/api or http://traefik.example.com/dashboard
-    # but does not match http://traefik.example.com/hello
-    rule = "Host(`traefik.example.com`) && (PathPrefix(`/api`) || PathPrefix(`/dashboard`))"
+    # Matches http://traefik.domain.com/api or http://traefik.domain.com/dashboard
+    # but does not match http://traefik.domain.com/hello
+    rule = "Host(`traefik.domain.com`) && (PathPrefix(`/api`) || PathPrefix(`/dashboard`))"
     ```
 
 ### `insecure`

docs/content/operations/dashboard.md

@@ -72,33 +72,33 @@ to allow defining:
 - A [router rule](#dashboard-router-rule) for accessing the dashboard,
   through Traefik itself (sometimes referred as "Traefik-ception").
 
+??? example "Dashboard Dynamic Configuration Examples"
+    --8<-- "content/operations/include-api-examples.md"
+
 ### Dashboard Router Rule
 
 As underlined in the [documentation for the `api.dashboard` option](./api.md#dashboard),
 the [router rule](../routing/routers/index.md#rule) defined for Traefik must match
 the path prefixes `/api` and `/dashboard`.
 
-We recommend to use a "Host Based rule" as ```Host(`traefik.example.com`)``` to match everything on the host domain,
+We recommend to use a "Host Based rule" as ```Host(`traefik.domain.com`)``` to match everything on the host domain,
 or to make sure that the defined rule captures both prefixes:
 
 ```bash tab="Host Rule"
-# The dashboard can be accessed on http://traefik.example.com/dashboard/
-rule = "Host(`traefik.example.com`)"
+# The dashboard can be accessed on http://traefik.domain.com/dashboard/
+rule = "Host(`traefik.domain.com`)"
 ```
 
 ```bash tab="Path Prefix Rule"
-# The dashboard can be accessed on http://example.com/dashboard/ or http://traefik.example.com/dashboard/
+# The dashboard can be accessed on http://domain.com/dashboard/ or http://traefik.domain.com/dashboard/
 rule = "PathPrefix(`/api`) || PathPrefix(`/dashboard`)"
 ```
 
 ```bash tab="Combination of Rules"
-# The dashboard can be accessed on http://traefik.example.com/dashboard/
-rule = "Host(`traefik.example.com`) && (PathPrefix(`/api`) || PathPrefix(`/dashboard`))"
+# The dashboard can be accessed on http://traefik.domain.com/dashboard/
+rule = "Host(`traefik.domain.com`) && (PathPrefix(`/api`) || PathPrefix(`/dashboard`))"
 ```
 
-??? example "Dashboard Dynamic Configuration Examples"
-    --8<-- "content/operations/include-dashboard-examples.md"
-
 ## Insecure Mode
 
 This mode is not recommended because it does not allow the use of security features.

docs/content/operations/include-api-examples.md

@@ -1,7 +1,7 @@
 ```yaml tab="Docker"
 # Dynamic Configuration
 labels:
-  - "traefik.http.routers.api.rule=Host(`traefik.example.com`)"
+  - "traefik.http.routers.api.rule=Host(`traefik.domain.com`)"
   - "traefik.http.routers.api.service=api@internal"
   - "traefik.http.routers.api.middlewares=auth"
   - "traefik.http.middlewares.auth.basicauth.users=test:$$apr1$$H6uskkkW$$IgXLP6ewTrSuBkTrqE8wj/,test2:$$apr1$$d9hr9HBB$$4HxwgUir3HP4EsggP/QNo0"
@@ -11,7 +11,7 @@ labels:
 # Dynamic Configuration
 deploy:
   labels:
-    - "traefik.http.routers.api.rule=Host(`traefik.example.com`)"
+    - "traefik.http.routers.api.rule=Host(`traefik.domain.com`)"
     - "traefik.http.routers.api.service=api@internal"
     - "traefik.http.routers.api.middlewares=auth"
     - "traefik.http.middlewares.auth.basicauth.users=test:$$apr1$$H6uskkkW$$IgXLP6ewTrSuBkTrqE8wj/,test2:$$apr1$$d9hr9HBB$$4HxwgUir3HP4EsggP/QNo0"
@@ -26,7 +26,7 @@ metadata:
   name: traefik-dashboard
 spec:
   routes:
-  - match: Host(`traefik.example.com`)
+  - match: Host(`traefik.domain.com`)
     kind: Rule
     services:
     - name: api@internal
@@ -45,7 +45,7 @@ spec:
 
 ```yaml tab="Consul Catalog"
 # Dynamic Configuration
-- "traefik.http.routers.api.rule=Host(`traefik.example.com`)"
+- "traefik.http.routers.api.rule=Host(`traefik.domain.com`)"
 - "traefik.http.routers.api.service=api@internal"
 - "traefik.http.routers.api.middlewares=auth"
 - "traefik.http.middlewares.auth.basicauth.users=test:$$apr1$$H6uskkkW$$IgXLP6ewTrSuBkTrqE8wj/,test2:$$apr1$$d9hr9HBB$$4HxwgUir3HP4EsggP/QNo0"
@@ -53,7 +53,7 @@ spec:
 
 ```json tab="Marathon"
 "labels": {
-  "traefik.http.routers.api.rule": "Host(`traefik.example.com`)",
+  "traefik.http.routers.api.rule": "Host(`traefik.domain.com`)",
   "traefik.http.routers.api.service": "api@internal",
   "traefik.http.routers.api.middlewares": "auth",
   "traefik.http.middlewares.auth.basicauth.users": "test:$$apr1$$H6uskkkW$$IgXLP6ewTrSuBkTrqE8wj/,test2:$$apr1$$d9hr9HBB$$4HxwgUir3HP4EsggP/QNo0"
@@ -63,7 +63,7 @@ spec:
 ```yaml tab="Rancher"
 # Dynamic Configuration
 labels:
-  - "traefik.http.routers.api.rule=Host(`traefik.example.com`)"
+  - "traefik.http.routers.api.rule=Host(`traefik.domain.com`)"
   - "traefik.http.routers.api.service=api@internal"
   - "traefik.http.routers.api.middlewares=auth"
   - "traefik.http.middlewares.auth.basicauth.users=test:$$apr1$$H6uskkkW$$IgXLP6ewTrSuBkTrqE8wj/,test2:$$apr1$$d9hr9HBB$$4HxwgUir3HP4EsggP/QNo0"
@@ -72,7 +72,7 @@ labels:
 ```toml tab="File (TOML)"
 # Dynamic Configuration
 [http.routers.my-api]
-  rule = "Host(`traefik.example.com`)"
+  rule = "Host(`traefik.domain.com`)"
   service = "api@internal"
   middlewares = ["auth"]
 
@@ -88,7 +88,7 @@ labels:
 http:
   routers:
     api:
-      rule: Host(`traefik.example.com`)
+      rule: Host(`traefik.domain.com`)
       service: api@internal
       middlewares:
         - auth

docs/content/operations/include-dashboard-examples.md

@@ -1,101 +0,0 @@
-```yaml tab="Docker"
-# Dynamic Configuration
-labels:
-  - "traefik.http.routers.dashboard.rule=Host(`traefik.example.com`) && (PathPrefix(`/api`) || PathPrefix(`/dashboard`))"
-  - "traefik.http.routers.dashboard.service=api@internal"
-  - "traefik.http.routers.dashboard.middlewares=auth"
-  - "traefik.http.middlewares.auth.basicauth.users=test:$$apr1$$H6uskkkW$$IgXLP6ewTrSuBkTrqE8wj/,test2:$$apr1$$d9hr9HBB$$4HxwgUir3HP4EsggP/QNo0"
-```
-
-```yaml tab="Docker (Swarm)"
-# Dynamic Configuration
-deploy:
-  labels:
-    - "traefik.http.routers.dashboard.rule=Host(`traefik.example.com`) && (PathPrefix(`/api`) || PathPrefix(`/dashboard`))"
-    - "traefik.http.routers.dashboard.service=api@internal"
-    - "traefik.http.routers.dashboard.middlewares=auth"
-    - "traefik.http.middlewares.auth.basicauth.users=test:$$apr1$$H6uskkkW$$IgXLP6ewTrSuBkTrqE8wj/,test2:$$apr1$$d9hr9HBB$$4HxwgUir3HP4EsggP/QNo0"
-    # Dummy service for Swarm port detection. The port can be any valid integer value.
-    - "traefik.http.services.dummy-svc.loadbalancer.server.port=9999"
-```
-
-```yaml tab="Kubernetes CRD"
-apiVersion: traefik.containo.us/v1alpha1
-kind: IngressRoute
-metadata:
-  name: traefik-dashboard
-spec:
-  routes:
-  - match: Host(`traefik.example.com`) && (PathPrefix(`/api`) || PathPrefix(`/dashboard`))
-    kind: Rule
-    services:
-    - name: api@internal
-      kind: TraefikService
-    middlewares:
-      - name: auth
----
-apiVersion: traefik.containo.us/v1alpha1
-kind: Middleware
-metadata:
-  name: auth
-spec:
-  basicAuth:
-    secret: secretName # Kubernetes secret named "secretName"
-```
-
-```yaml tab="Consul Catalog"
-# Dynamic Configuration
-- "traefik.http.routers.dashboard.rule=Host(`traefik.example.com`) && (PathPrefix(`/api`) || PathPrefix(`/dashboard`))"
-- "traefik.http.routers.dashboard.service=api@internal"
-- "traefik.http.routers.dashboard.middlewares=auth"
-- "traefik.http.middlewares.auth.basicauth.users=test:$$apr1$$H6uskkkW$$IgXLP6ewTrSuBkTrqE8wj/,test2:$$apr1$$d9hr9HBB$$4HxwgUir3HP4EsggP/QNo0"
-```
-
-```json tab="Marathon"
-"labels": {
-  "traefik.http.routers.dashboard.rule": "Host(`traefik.example.com`) && (PathPrefix(`/api`) || PathPrefix(`/dashboard`))",
-  "traefik.http.routers.dashboard.service": "api@internal",
-  "traefik.http.routers.dashboard.middlewares": "auth",
-  "traefik.http.middlewares.auth.basicauth.users": "test:$$apr1$$H6uskkkW$$IgXLP6ewTrSuBkTrqE8wj/,test2:$$apr1$$d9hr9HBB$$4HxwgUir3HP4EsggP/QNo0"
-}
-```
-
-```yaml tab="Rancher"
-# Dynamic Configuration
-labels:
-  - "traefik.http.routers.dashboard.rule=Host(`traefik.example.com`) && (PathPrefix(`/api`) || PathPrefix(`/dashboard`))"
-  - "traefik.http.routers.dashboard.service=api@internal"
-  - "traefik.http.routers.dashboard.middlewares=auth"
-  - "traefik.http.middlewares.auth.basicauth.users=test:$$apr1$$H6uskkkW$$IgXLP6ewTrSuBkTrqE8wj/,test2:$$apr1$$d9hr9HBB$$4HxwgUir3HP4EsggP/QNo0"
-```
-
-```toml tab="File (TOML)"
-# Dynamic Configuration
-[http.routers.my-api]
-  rule = "Host(`traefik.example.com`) && (PathPrefix(`/api`) || PathPrefix(`/dashboard`))"
-  service = "api@internal"
-  middlewares = ["auth"]
-
-[http.middlewares.auth.basicAuth]
-  users = [
-    "test:$apr1$H6uskkkW$IgXLP6ewTrSuBkTrqE8wj/",
-    "test2:$apr1$d9hr9HBB$4HxwgUir3HP4EsggP/QNo0",
-  ]
-```
-
-```yaml tab="File (YAML)"
-# Dynamic Configuration
-http:
-  routers:
-    dashboard:
-      rule: Host(`traefik.example.com`) && (PathPrefix(`/api`) || PathPrefix(`/dashboard`))
-      service: api@internal
-      middlewares:
-        - auth
-  middlewares:
-    auth:
-      basicAuth:
-        users:
-          - "test:$apr1$H6uskkkW$IgXLP6ewTrSuBkTrqE8wj/"
-          - "test2:$apr1$d9hr9HBB$4HxwgUir3HP4EsggP/QNo0"
-```

docs/content/operations/ping.md

@@ -23,8 +23,7 @@ ping: {}
 
 The `/ping` health-check URL is enabled with the command-line `--ping` or config file option `[ping]`.
 
-The `entryPoint` where the `/ping` is active can be customized with the `entryPoint` option,
-whose default value is `traefik` (port `8080`).
+You can customize the `entryPoint` where the `/ping` is active with the `entryPoint` option (default value: `traefik`)
 
 | Path    | Method        | Description                                                                                         |
 |---------|---------------|-----------------------------------------------------------------------------------------------------|
@@ -35,8 +34,6 @@ whose default value is `traefik` (port `8080`).
 
 ### `entryPoint`
 
-_Optional, Default="traefik"_
-
 Enabling /ping on a dedicated EntryPoint.
 
 ```toml tab="File (TOML)"

docs/content/providers/consul-catalog.md

@@ -29,7 +29,7 @@ Attach tags to your services and let Traefik do the rest!
     Attaching tags to services
 
     ```yaml
-    - traefik.http.services.my-service.rule=Host(`example.com`)
+    - traefik.http.services.my-service.rule=Host(`mydomain.com`)
     ```
 
 ## Routing Configuration

docs/content/providers/consul.md

@@ -1,216 +0,0 @@
-# Traefik & Consul
-
-A Story of KV store & Containers
-{: .subtitle }
-
-Store your configuration in Consul and let Traefik do the rest!
-
-## Routing Configuration
-
-See the dedicated section in [routing](../routing/providers/kv.md).
-
-## Provider Configuration
-
-### `endpoints`
-
-_Required, Default="127.0.0.1:8500"_
-
-Defines how to access to Consul.
-
-```toml tab="File (TOML)"
-[providers.consul]
-  endpoints = ["127.0.0.1:8500"]
-```
-
-```yaml tab="File (YAML)"
-providers:
-  consul:
-    endpoints:
-      - "127.0.0.1:8500"
-```
-
-```bash tab="CLI"
---providers.consul.endpoints=127.0.0.1:8500
-```
-
-### `rootKey`
-
-Defines the root key of the configuration.
-
-_Required, Default="traefik"_
-
-```toml tab="File (TOML)"
-[providers.consul]
-  rootKey = "traefik"
-```
-
-```yaml tab="File (YAML)"
-providers:
-  consul:
-    rootKey: "traefik"
-```
-
-```bash tab="CLI"
---providers.consul.rootkey=traefik
-```
-
-### `username`
-
-Defines a username to connect with Consul.
-
-_Optional, Default=""_
-
-```toml tab="File (TOML)"
-[providers.consul]
-  # ...
-  username = "foo"
-```
-
-```yaml tab="File (YAML)"
-providers:
-  consul:
-    # ...
-    usename: "foo"
-```
-
-```bash tab="CLI"
---providers.consul.username=foo
-```
-
-### `password`
-
-_Optional, Default=""_
-
-Defines a password to connect with Consul.
-
-```toml tab="File (TOML)"
-[providers.consul]
-  # ...
-  password = "bar"
-```
-
-```yaml tab="File (YAML)"
-providers:
-  consul:
-    # ...
-    password: "bar"
-```
-
-```bash tab="CLI"
---providers.consul.password=foo
-```
-
-### `tls`
-
-_Optional_
-
-#### `tls.ca`
-
-Certificate Authority used for the secured connection to Consul.
-
-```toml tab="File (TOML)"
-[providers.consul.tls]
-  ca = "path/to/ca.crt"
-```
-
-```yaml tab="File (YAML)"
-providers:
-  consul:
-    tls:
-      ca: path/to/ca.crt
-```
-
-```bash tab="CLI"
---providers.consul.tls.ca=path/to/ca.crt
-```
-
-#### `tls.caOptional`
-
-Policy followed for the secured connection with TLS Client Authentication to Consul.
-Requires `tls.ca` to be defined.
-
-- `true`: VerifyClientCertIfGiven
-- `false`: RequireAndVerifyClientCert
-- if `tls.ca` is undefined NoClientCert
-
-```toml tab="File (TOML)"
-[providers.consul.tls]
-  caOptional = true
-```
-
-```yaml tab="File (YAML)"
-providers:
-  consul:
-    tls:
-      caOptional: true
-```
-
-```bash tab="CLI"
---providers.consul.tls.caOptional=true
-```
-
-#### `tls.cert`
-
-Public certificate used for the secured connection to Consul.
-
-```toml tab="File (TOML)"
-[providers.consul.tls]
-  cert = "path/to/foo.cert"
-  key = "path/to/foo.key"
-```
-
-```yaml tab="File (YAML)"
-providers:
-  consul:
-    tls:
-      cert: path/to/foo.cert
-      key: path/to/foo.key
-```
-
-```bash tab="CLI"
---providers.consul.tls.cert=path/to/foo.cert
---providers.consul.tls.key=path/to/foo.key
-```
-
-#### `tls.key`
-
-Private certificate used for the secured connection to Consul.
-
-```toml tab="File (TOML)"
-[providers.consul.tls]
-  cert = "path/to/foo.cert"
-  key = "path/to/foo.key"
-```
-
-```yaml tab="File (YAML)"
-providers:
-  consul:
-    tls:
-      cert: path/to/foo.cert
-      key: path/to/foo.key
-```
-
-```bash tab="CLI"
---providers.consul.tls.cert=path/to/foo.cert
---providers.consul.tls.key=path/to/foo.key
-```
-
-#### `tls.insecureSkipVerify`
-
-If `insecureSkipVerify` is `true`, TLS for the connection to Consul accepts any certificate presented by the server and any host name in that certificate.
-
-```toml tab="File (TOML)"
-[providers.consul.tls]
-  insecureSkipVerify = true
-```
-
-```yaml tab="File (YAML)"
-providers:
-  consul:
-    tls:
-      insecureSkipVerify: true
-```
-
-```bash tab="CLI"
---providers.consul.tls.insecureSkipVerify=true
-```

docs/content/providers/docker.md

@@ -40,7 +40,7 @@ and [Docker Swarm Mode](https://docs.docker.com/engine/swarm/).
       my-container:
         # ...
         labels:
-          - traefik.http.routers.my-container.rule=Host(`example.com`)
+          - traefik.http.routers.my-container.rule=Host(`mydomain.com`)
     ```
 
 ??? example "Configuring Docker Swarm & Deploying / Exposing Services"
@@ -79,13 +79,13 @@ and [Docker Swarm Mode](https://docs.docker.com/engine/swarm/).
       my-container:
         deploy:
           labels:
-            - traefik.http.routers.my-container.rule=Host(`example.com`)
+            - traefik.http.routers.my-container.rule=Host(`mydomain.com`)
             - traefik.http.services.my-container-service.loadbalancer.server.port=8080
     ```
 
 ## Routing Configuration
 
-When using Docker as a [provider](./overview.md),
+When using Docker as a [provider](https://docs.traefik.io/providers/overview/),
 Traefik uses [container labels](https://docs.docker.com/engine/reference/commandline/run/#set-metadata-on-container--l---label---label-file) to retrieve its routing configuration.
 
 See the list of labels in the dedicated [routing](../routing/providers/docker.md) section.
@@ -116,20 +116,6 @@ Ports detection works as follows:
   by using the label `traefik.http.services.<service_name>.loadbalancer.server.port`
   (Read more on this label in the dedicated section in [routing](../routing/providers/docker.md#port)).
 
-### Host networking
-
-When exposing containers that are configured with [host networking](https://docs.docker.com/network/host/),
-the IP address of the host is resolved as follows:
-
-<!-- TODO: verify and document the swarm mode case with container.Node.IPAddress coming from the API -->
-- try a lookup of `host.docker.internal`
-- otherwise fall back to `127.0.0.1`
-
-On Linux, (and until [github.com/moby/moby/pull/40007](https://github.com/moby/moby/pull/40007) is included in a release),
-for `host.docker.internal` to be defined, it should be provided as an `extra_host` to the Traefik container,
-using the `--add-host` flag. For example, to set it to the IP address of the bridge interface (docker0 by default):
-`--add-host=host.docker.internal:172.17.0.1`
-
 ### Docker API Access
 
 Traefik requires access to the docker socket to get its dynamic configuration.
@@ -149,17 +135,16 @@ You can specify which Docker API Endpoint to use with the directive [`endpoint`]
 
     ??? success "Solutions"
 
-        Expose the Docker socket over TCP or SSH, instead of the default Unix socket file.
+        Expose the Docker socket over TCP, instead of the default Unix socket file.
         It allows different implementation levels of the [AAA (Authentication, Authorization, Accounting) concepts](https://en.wikipedia.org/wiki/AAA_(computer_security)), depending on your security assessment:
 
         - Authentication with Client Certificates as described in ["Protect the Docker daemon socket."](https://docs.docker.com/engine/security/https/)
         - Authorize and filter requests to restrict possible actions with [the TecnativaDocker Socket Proxy](https://github.com/Tecnativa/docker-socket-proxy).
-        - Authorization with the [Docker Authorization Plugin Mechanism](https://web.archive.org/web/20190920092526/https://docs.docker.com/engine/extend/plugins_authorization/)
+        - Authorization with the [Docker Authorization Plugin Mechanism](https://docs.docker.com/engine/extend/plugins_authorization/)
         - Accounting at networking level, by exposing the socket only inside a Docker private network, only available for Traefik.
         - Accounting at container level, by exposing the socket on a another container than Traefik's.
           With Swarm mode, it allows scheduling of Traefik on worker nodes, with only the "socket exposer" container on the manager nodes.
         - Accounting at kernel level, by enforcing kernel calls with mechanisms like [SELinux](https://en.wikipedia.org/wiki/Security-Enhanced_Linux), to only allows an identified set of actions for Traefik's process (or the "socket exposer" process).
-        - SSH public key authentication (SSH is supported with Docker > 18.09)
 
     ??? info "More Resources and Examples"
         - ["Paranoid about mounting /var/run/docker.sock?"](https://medium.com/@containeroo/traefik-2-0-paranoid-about-mounting-var-run-docker-sock-22da9cb3e78c)
@@ -261,7 +246,7 @@ See the sections [Docker API Access](#docker-api-access) and [Docker Swarm API A
 
     services:
       traefik:
-         image: traefik:v2.2 # The official v2 Traefik docker image
+         image: traefik:v2.1 # The official v2 Traefik docker image
          ports:
            - "80:80"
          volumes:
@@ -288,30 +273,6 @@ See the sections [Docker API Access](#docker-api-access) and [Docker Swarm API A
     # ...
     ```
 
-??? example "Using SSH"
-
-    Using Docker 18.09+ you can connect Traefik to daemon using SSH
-    We specify the SSH host and user in Traefik's configuration file.
-    Note that is server requires public keys for authentication you must have those accessible for user who runs Traefik.
-
-    ```toml tab="File (TOML)"
-    [providers.docker]
-      endpoint = "ssh://traefik@192.168.2.5:2022"
-      # ...
-    ```
-    
-    ```yaml tab="File (YAML)"
-    providers:
-      docker:
-        endpoint: "ssh://traefik@192.168.2.5:2022"
-         # ...
-    ```
-    
-    ```bash tab="CLI"
-    --providers.docker.endpoint=ssh://traefik@192.168.2.5:2022
-    # ...
-    ```
-
 ### `useBindPortIP`
 
 _Optional, Default=false_
@@ -473,19 +434,19 @@ _Optional, Default=15_
 
 ```toml tab="File (TOML)"
 [providers.docker]
-  swarmModeRefreshSeconds = 30
+  swarmModeRefreshSeconds = "30s"
   # ...
 ```
 
 ```yaml tab="File (YAML)"
 providers:
   docker:
-    swarmModeRefreshSeconds: 30
+    swarmModeRefreshSeconds: "30s"
     # ...
 ```
 
 ```bash tab="CLI"
---providers.docker.swarmModeRefreshSeconds=30
+--providers.docker.swarmModeRefreshSeconds=30s
 # ...
 ```
 

docs/content/providers/etcd.md

@@ -1,216 +0,0 @@
-# Traefik & Etcd
-
-A Story of KV store & Containers
-{: .subtitle }
-
-Store your configuration in Etcd and let Traefik do the rest!
-
-## Routing Configuration
-
-See the dedicated section in [routing](../routing/providers/kv.md).
-
-## Provider Configuration
-
-### `endpoints`
-
-_Required, Default="127.0.0.1:2379"_
-
-Defines how to access to Etcd.
-
-```toml tab="File (TOML)"
-[providers.etcd]
-  endpoints = ["127.0.0.1:2379"]
-```
-
-```yaml tab="File (YAML)"
-providers:
-  etcd:
-    endpoints:
-      - "127.0.0.1:2379"
-```
-
-```bash tab="CLI"
---providers.etcd.endpoints=127.0.0.1:2379
-```
-
-### `rootKey`
-
-Defines the root key of the configuration.
-
-_Required, Default="traefik"_
-
-```toml tab="File (TOML)"
-[providers.etcd]
-  rootKey = "traefik"
-```
-
-```yaml tab="File (YAML)"
-providers:
-  etcd:
-    rootKey: "traefik"
-```
-
-```bash tab="CLI"
---providers.etcd.rootkey=traefik
-```
-
-### `username`
-
-Defines a username to connect with Etcd.
-
-_Optional, Default=""_
-
-```toml tab="File (TOML)"
-[providers.etcd]
-  # ...
-  username = "foo"
-```
-
-```yaml tab="File (YAML)"
-providers:
-  etcd:
-    # ...
-    usename: "foo"
-```
-
-```bash tab="CLI"
---providers.etcd.username=foo
-```
-
-### `password`
-
-_Optional, Default=""_
-
-Defines a password to connect with Etcd.
-
-```toml tab="File (TOML)"
-[providers.etcd]
-  # ...
-  password = "bar"
-```
-
-```yaml tab="File (YAML)"
-providers:
-  etcd:
-    # ...
-    password: "bar"
-```
-
-```bash tab="CLI"
---providers.etcd.password=foo
-```
-
-### `tls`
-
-_Optional_
-
-#### `tls.ca`
-
-Certificate Authority used for the secured connection to Etcd.
-
-```toml tab="File (TOML)"
-[providers.etcd.tls]
-  ca = "path/to/ca.crt"
-```
-
-```yaml tab="File (YAML)"
-providers:
-  etcd:
-    tls:
-      ca: path/to/ca.crt
-```
-
-```bash tab="CLI"
---providers.etcd.tls.ca=path/to/ca.crt
-```
-
-#### `tls.caOptional`
-
-Policy followed for the secured connection with TLS Client Authentication to Etcd.
-Requires `tls.ca` to be defined.
-
-- `true`: VerifyClientCertIfGiven
-- `false`: RequireAndVerifyClientCert
-- if `tls.ca` is undefined NoClientCert
-
-```toml tab="File (TOML)"
-[providers.etcd.tls]
-  caOptional = true
-```
-
-```yaml tab="File (YAML)"
-providers:
-  etcd:
-    tls:
-      caOptional: true
-```
-
-```bash tab="CLI"
---providers.etcd.tls.caOptional=true
-```
-
-#### `tls.cert`
-
-Public certificate used for the secured connection to Etcd.
-
-```toml tab="File (TOML)"
-[providers.etcd.tls]
-  cert = "path/to/foo.cert"
-  key = "path/to/foo.key"
-```
-
-```yaml tab="File (YAML)"
-providers:
-  etcd:
-    tls:
-      cert: path/to/foo.cert
-      key: path/to/foo.key
-```
-
-```bash tab="CLI"
---providers.etcd.tls.cert=path/to/foo.cert
---providers.etcd.tls.key=path/to/foo.key
-```
-
-#### `tls.key`
-
-Private certificate used for the secured connection to Etcd.
-
-```toml tab="File (TOML)"
-[providers.etcd.tls]
-  cert = "path/to/foo.cert"
-  key = "path/to/foo.key"
-```
-
-```yaml tab="File (YAML)"
-providers:
-  etcd:
-    tls:
-      cert: path/to/foo.cert
-      key: path/to/foo.key
-```
-
-```bash tab="CLI"
---providers.etcd.tls.cert=path/to/foo.cert
---providers.etcd.tls.key=path/to/foo.key
-```
-
-#### `tls.insecureSkipVerify`
-
-If `insecureSkipVerify` is `true`, TLS for the connection to Etcd accepts any certificate presented by the server and any host name in that certificate.
-
-```toml tab="File (TOML)"
-[providers.etcd.tls]
-  insecureSkipVerify = true
-```
-
-```yaml tab="File (YAML)"
-providers:
-  etcd:
-    tls:
-      insecureSkipVerify: true
-```
-
-```bash tab="CLI"
---providers.etcd.tls.insecureSkipVerify=true
-```

docs/content/providers/file.md

@@ -47,22 +47,22 @@ You can write one of these mutually exclusive configuration elements:
           middlewares = ["my-basic-auth"]
           service = "service-foo"
           rule = "Path(`/foo`)"
-      
-      # Add the middleware
-      [http.middlewares]    
-        [http.middlewares.my-basic-auth.basicAuth]
-          users = ["test:$apr1$H6uskkkW$IgXLP6ewTrSuBkTrqE8wj/", 
-                    "test2:$apr1$d9hr9HBB$4HxwgUir3HP4EsggP/QNo0"]
-          usersFile = "etc/traefik/.htpasswd"
-      
-      # Add the service
-      [http.services]
-        [http.services.service-foo]
-          [http.services.service-foo.loadBalancer]
-            [[http.services.service-foo.loadBalancer.servers]]
-              url = "http://foo/"
-            [[http.services.service-foo.loadBalancer.servers]]
-              url = "http://bar/"
+    
+        # Add the middleware
+        [http.middlewares]    
+          [http.middlewares.my-basic-auth.basicAuth]
+            users = ["test:$apr1$H6uskkkW$IgXLP6ewTrSuBkTrqE8wj/", 
+                      "test2:$apr1$d9hr9HBB$4HxwgUir3HP4EsggP/QNo0"]
+            usersFile = "etc/traefik/.htpasswd"
+        
+        # Add the service
+        [http.services]
+          [http.services.service-foo]
+            [http.services.service-foo.loadBalancer]
+              [[http.services.service-foo.loadBalancer.servers]]
+                url = "http://foo/"
+              [[http.services.service-foo.loadBalancer.servers]]
+                url = "http://bar/"
     ```
     
     ```yaml tab="YAML"
@@ -191,14 +191,14 @@ providers:
 ### Go Templating
 
 !!! warning
-    Go Templating only works with dedicated dynamic configuration files.
+    Go Templating only works along with dedicated dynamic configuration files.
     Templating does not work in the Traefik main static configuration file.
 
-Traefik supports using Go templating to automatically generate repetitive portions of configuration files.
-These sections must be valid [Go templates](https://golang.org/pkg/text/template/),
-augmented with the [Sprig template functions](http://masterminds.github.io/sprig/).
+Traefik allows using Go templating,
+it must be a valid [Go template](https://golang.org/pkg/text/template/),
+augmented with the [sprig template functions](http://masterminds.github.io/sprig/).
 
-To illustrate, it's possible to easily define multiple routers, services, and TLS certificates as described in the following examples:
+Thus, it's possible to define easily lot of routers, services and TLS certificates as described in the following examples:
 
 ??? example "Configuring Using Templating"
     

docs/content/providers/kubernetes-crd.md

@@ -173,7 +173,7 @@ Array of namespaces to watch.
 
 ### `labelselector`
 
-_Optional,Default: empty (process all resources)_
+_Optional,Default: empty (process all Ingresses)_
 
 ```toml tab="File (TOML)"
 [providers.kubernetesCRD]
@@ -192,8 +192,8 @@ providers:
 --providers.kubernetescrd.labelselector="A and not B"
 ```
 
-By default, Traefik processes all resource objects in the configured namespaces.
-A label selector can be defined to filter on specific resource objects only.
+By default, Traefik processes all Ingress objects in the configured namespaces.
+A label selector can be defined to filter on specific Ingress objects only.
 
 See [label-selectors](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors) for details.
 
@@ -218,10 +218,10 @@ providers:
 --providers.kubernetescrd.ingressclass=traefik-internal
 ```
 
-Value of `kubernetes.io/ingress.class` annotation that identifies resource objects to be processed.
+Value of `kubernetes.io/ingress.class` annotation that identifies Ingress objects to be processed.
 
-If the parameter is non-empty, only resources containing an annotation with the same value are processed.
-Otherwise, resources missing the annotation, having an empty value, or the value `traefik` are processed.
+If the parameter is non-empty, only Ingresses containing an annotation with the same value are processed.
+Otherwise, Ingresses missing the annotation, having an empty value, or the value `traefik` are processed.
 
 ### `throttleDuration`
 

docs/content/providers/kubernetes-ingress.md

@@ -6,11 +6,7 @@ The Kubernetes Ingress Controller.
 The Traefik Kubernetes Ingress provider is a Kubernetes Ingress controller; that is to say,
 it manages access to a cluster services by supporting the [Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/) specification.
 
-## Routing Configuration
-
-See the dedicated section in [routing](../routing/providers/kubernetes-ingress.md).
-
-## Enabling and Using the Provider
+## Enabling and using the provider
 
 As usual, the provider is enabled through the static configuration:
 
@@ -40,7 +36,7 @@ metadata:
 
 spec:
   rules:
-    - host: example.net
+    - host: foo.com
       http:
         paths:
           - path: /bar
@@ -266,7 +262,7 @@ _Optional, Default: empty_
 
 ```toml tab="File (TOML)"
 [providers.kubernetesIngress.ingressEndpoint]
-  hostname = "example.net"
+  hostname = "foo.com"
   # ...
 ```
 
@@ -274,12 +270,12 @@ _Optional, Default: empty_
 providers:
   kubernetesIngress:
     ingressEndpoint:
-      hostname: "example.net"
+      hostname: "foo.com"
     # ...
 ```
 
 ```bash tab="CLI"
---providers.kubernetesingress.ingressendpoint.hostname=example.net
+--providers.kubernetesingress.ingressendpoint.hostname=foo.com
 ```
 
 Hostname used for Kubernetes Ingress endpoints.
@@ -354,7 +350,7 @@ providers:
 --providers.kubernetesingress.throttleDuration=10s
 ```
 
-### Further
+## Further
 
 If one wants to know more about the various aspects of the Ingress spec that Traefik supports,
-many examples of Ingresses definitions are located in the tests [data](https://github.com/containous/traefik/tree/v2.2/pkg/provider/kubernetes/ingress/fixtures) of the Traefik repository.
+many examples of Ingresses definitions are located in the tests [data](https://github.com/containous/traefik/tree/v2.1/pkg/provider/kubernetes/ingress/fixtures) of the Traefik repository.

docs/content/providers/overview.md

@@ -26,18 +26,14 @@ Even if each provider is different, we can categorize them in four groups:
 
 Below is the list of the currently supported providers in Traefik. 
 
-| Provider                              | Type         | Configuration Type         |
-|---------------------------------------|--------------|----------------------------|
-| [Docker](./docker.md)                 | Orchestrator | Label                      |
-| [Kubernetes](./kubernetes-crd.md)     | Orchestrator | Custom Resource or Ingress |
-| [Consul Catalog](./consul-catalog.md) | Orchestrator | Label                      |
-| [Marathon](./marathon.md)             | Orchestrator | Label                      |
-| [Rancher](./rancher.md)               | Orchestrator | Label                      |
-| [File](./file.md)                     | Manual       | TOML/YAML format           |
-| [Consul](./consul.md)                 | KV           | KV                         |
-| [etcd](./etcd.md)                     | KV           | KV                         |
-| [Redis](./redis.md)                   | KV           | KV                         |
-| [ZooKeeper](./zookeeper.md)           | KV           | KV                         |
+| Provider                              | Type         | Configuration Type |
+|---------------------------------------|--------------|--------------------|
+| [Docker](./docker.md)                 | Orchestrator | Label              |
+| [Kubernetes](./kubernetes-crd.md)     | Orchestrator | Custom Resource    |
+| [Consul Catalog](./consul-catalog.md) | Orchestrator | Label              |
+| [Marathon](./marathon.md)             | Orchestrator | Label              |
+| [Rancher](./rancher.md)               | Orchestrator | Label              |
+| [File](./file.md)                     | Manual       | TOML/YAML format   |
 
 !!! info "More Providers"
 

docs/content/providers/rancher.md

@@ -35,7 +35,7 @@ Attach labels to your services and let Traefik do the rest!
 
     ```yaml
     labels:
-      - traefik.http.services.my-service.rule=Host(`example.com`)
+      - traefik.http.services.my-service.rule=Host(`mydomain.com`)
     ```
 
 ## Routing Configuration

docs/content/providers/redis.md

@@ -1,216 +0,0 @@
-# Traefik & Redis
-
-A Story of KV store & Containers
-{: .subtitle }
-
-Store your configuration in Redis and let Traefik do the rest!
-
-## Routing Configuration
-
-See the dedicated section in [routing](../routing/providers/kv.md).
-
-## Provider Configuration
-
-### `endpoints`
-
-_Required, Default="127.0.0.1:6379"_
-
-Defines how to access to Redis.
-
-```toml tab="File (TOML)"
-[providers.redis]
-  endpoints = ["127.0.0.1:6379"]
-```
-
-```yaml tab="File (YAML)"
-providers:
-  redis:
-    endpoints:
-      - "127.0.0.1:6379"
-```
-
-```bash tab="CLI"
---providers.redis.endpoints=127.0.0.1:6379
-```
-
-### `rootKey`
-
-Defines the root key of the configuration.
-
-_Required, Default="traefik"_
-
-```toml tab="File (TOML)"
-[providers.redis]
-  rootKey = "traefik"
-```
-
-```yaml tab="File (YAML)"
-providers:
-  redis:
-    rootKey: "traefik"
-```
-
-```bash tab="CLI"
---providers.redis.rootkey=traefik
-```
-
-### `username`
-
-Defines a username to connect with Redis.
-
-_Optional, Default=""_
-
-```toml tab="File (TOML)"
-[providers.redis]
-  # ...
-  username = "foo"
-```
-
-```yaml tab="File (YAML)"
-providers:
-  redis:
-    # ...
-    usename: "foo"
-```
-
-```bash tab="CLI"
---providers.redis.username=foo
-```
-
-### `password`
-
-_Optional, Default=""_
-
-Defines a password to connect with Redis.
-
-```toml tab="File (TOML)"
-[providers.redis]
-  # ...
-  password = "bar"
-```
-
-```yaml tab="File (YAML)"
-providers:
-  redis:
-    # ...
-    password: "bar"
-```
-
-```bash tab="CLI"
---providers.redis.password=foo
-```
-
-### `tls`
-
-_Optional_
-
-#### `tls.ca`
-
-Certificate Authority used for the secured connection to Redis.
-
-```toml tab="File (TOML)"
-[providers.redis.tls]
-  ca = "path/to/ca.crt"
-```
-
-```yaml tab="File (YAML)"
-providers:
-  redis:
-    tls:
-      ca: path/to/ca.crt
-```
-
-```bash tab="CLI"
---providers.redis.tls.ca=path/to/ca.crt
-```
-
-#### `tls.caOptional`
-
-Policy followed for the secured connection with TLS Client Authentication to Redis.
-Requires `tls.ca` to be defined.
-
-- `true`: VerifyClientCertIfGiven
-- `false`: RequireAndVerifyClientCert
-- if `tls.ca` is undefined NoClientCert
-
-```toml tab="File (TOML)"
-[providers.redis.tls]
-  caOptional = true
-```
-
-```yaml tab="File (YAML)"
-providers:
-  redis:
-    tls:
-      caOptional: true
-```
-
-```bash tab="CLI"
---providers.redis.tls.caOptional=true
-```
-
-#### `tls.cert`
-
-Public certificate used for the secured connection to Redis.
-
-```toml tab="File (TOML)"
-[providers.redis.tls]
-  cert = "path/to/foo.cert"
-  key = "path/to/foo.key"
-```
-
-```yaml tab="File (YAML)"
-providers:
-  redis:
-    tls:
-      cert: path/to/foo.cert
-      key: path/to/foo.key
-```
-
-```bash tab="CLI"
---providers.redis.tls.cert=path/to/foo.cert
---providers.redis.tls.key=path/to/foo.key
-```
-
-#### `tls.key`
-
-Private certificate used for the secured connection to Redis.
-
-```toml tab="File (TOML)"
-[providers.redis.tls]
-  cert = "path/to/foo.cert"
-  key = "path/to/foo.key"
-```
-
-```yaml tab="File (YAML)"
-providers:
-  redis:
-    tls:
-      cert: path/to/foo.cert
-      key: path/to/foo.key
-```
-
-```bash tab="CLI"
---providers.redis.tls.cert=path/to/foo.cert
---providers.redis.tls.key=path/to/foo.key
-```
-
-#### `tls.insecureSkipVerify`
-
-If `insecureSkipVerify` is `true`, TLS for the connection to Redis accepts any certificate presented by the server and any host name in that certificate.
-
-```toml tab="File (TOML)"
-[providers.redis.tls]
-  insecureSkipVerify = true
-```
-
-```yaml tab="File (YAML)"
-providers:
-  redis:
-    tls:
-      insecureSkipVerify: true
-```
-
-```bash tab="CLI"
---providers.redis.tls.insecureSkipVerify=true
-```

docs/content/providers/zookeeper.md

@@ -1,216 +0,0 @@
-# Traefik & ZooKeeper
-
-A Story of KV store & Containers
-{: .subtitle }
-
-Store your configuration in ZooKeeper and let Traefik do the rest!
-
-## Routing Configuration
-
-See the dedicated section in [routing](../routing/providers/kv.md).
-
-## Provider Configuration
-
-### `endpoints`
-
-_Required, Default="127.0.0.1:2181"_
-
-Defines how to access to ZooKeeper.
-
-```toml tab="File (TOML)"
-[providers.zooKeeper]
-  endpoints = ["127.0.0.1:2181"]
-```
-
-```yaml tab="File (YAML)"
-providers:
-  zooKeeper:
-    endpoints:
-      - "127.0.0.1:2181"
-```
-
-```bash tab="CLI"
---providers.zookeeper.endpoints=127.0.0.1:2181
-```
-
-### `rootKey`
-
-Defines the root key of the configuration.
-
-_Required, Default="traefik"_
-
-```toml tab="File (TOML)"
-[providers.zooKeeper]
-  rootKey = "traefik"
-```
-
-```yaml tab="File (YAML)"
-providers:
-  zooKeeper:
-    rootKey: "traefik"
-```
-
-```bash tab="CLI"
---providers.zookeeper.rootkey=traefik
-```
-
-### `username`
-
-Defines a username to connect with ZooKeeper.
-
-_Optional, Default=""_
-
-```toml tab="File (TOML)"
-[providers.zooKeeper]
-  # ...
-  username = "foo"
-```
-
-```yaml tab="File (YAML)"
-providers:
-  zooKeeper:
-    # ...
-    usename: "foo"
-```
-
-```bash tab="CLI"
---providers.zookeeper.username=foo
-```
-
-### `password`
-
-_Optional, Default=""_
-
-Defines a password to connect with ZooKeeper.
-
-```toml tab="File (TOML)"
-[providers.zooKeeper]
-  # ...
-  password = "bar"
-```
-
-```yaml tab="File (YAML)"
-providers:
-  zooKeeper:
-    # ...
-    password: "bar"
-```
-
-```bash tab="CLI"
---providers.zookeeper.password=foo
-```
-
-### `tls`
-
-_Optional_
-
-#### `tls.ca`
-
-Certificate Authority used for the secured connection to ZooKeeper.
-
-```toml tab="File (TOML)"
-[providers.zooKeeper.tls]
-  ca = "path/to/ca.crt"
-```
-
-```yaml tab="File (YAML)"
-providers:
-  zooKeeper:
-    tls:
-      ca: path/to/ca.crt
-```
-
-```bash tab="CLI"
---providers.zookeeper.tls.ca=path/to/ca.crt
-```
-
-#### `tls.caOptional`
-
-Policy followed for the secured connection with TLS Client Authentication to ZooKeeper.
-Requires `tls.ca` to be defined.
-
-- `true`: VerifyClientCertIfGiven
-- `false`: RequireAndVerifyClientCert
-- if `tls.ca` is undefined NoClientCert
-
-```toml tab="File (TOML)"
-[providers.zooKeeper.tls]
-  caOptional = true
-```
-
-```yaml tab="File (YAML)"
-providers:
-  zooKeeper:
-    tls:
-      caOptional: true
-```
-
-```bash tab="CLI"
---providers.zookeeper.tls.caOptional=true
-```
-
-#### `tls.cert`
-
-Public certificate used for the secured connection to ZooKeeper.
-
-```toml tab="File (TOML)"
-[providers.zooKeeper.tls]
-  cert = "path/to/foo.cert"
-  key = "path/to/foo.key"
-```
-
-```yaml tab="File (YAML)"
-providers:
-  zooKeeper:
-    tls:
-      cert: path/to/foo.cert
-      key: path/to/foo.key
-```
-
-```bash tab="CLI"
---providers.zookeeper.tls.cert=path/to/foo.cert
---providers.zookeeper.tls.key=path/to/foo.key
-```
-
-#### `tls.key`
-
-Private certificate used for the secured connection to ZooKeeper.
-
-```toml tab="File (TOML)"
-[providers.zooKeeper.tls]
-  cert = "path/to/foo.cert"
-  key = "path/to/foo.key"
-```
-
-```yaml tab="File (YAML)"
-providers:
-  zooKeeper:
-    tls:
-      cert: path/to/foo.cert
-      key: path/to/foo.key
-```
-
-```bash tab="CLI"
---providers.zookeeper.tls.cert=path/to/foo.cert
---providers.zookeeper.tls.key=path/to/foo.key
-```
-
-#### `tls.insecureSkipVerify`
-
-If `insecureSkipVerify` is `true`, TLS for the connection to ZooKeeper accepts any certificate presented by the server and any host name in that certificate.
-
-```toml tab="File (TOML)"
-[providers.zooKeeper.tls]
-  insecureSkipVerify = true
-```
-
-```yaml tab="File (YAML)"
-providers:
-  zooKeeper:
-    tls:
-      insecureSkipVerify: true
-```
-
-```bash tab="CLI"
---providers.zookeeper.tls.insecureSkipVerify=true
-```

docs/content/reference/dynamic-configuration/docker-labels.yml

@@ -34,7 +34,6 @@
 - "traefik.http.middlewares.middleware10.headers.accesscontrolallowheaders=foobar, foobar"
 - "traefik.http.middlewares.middleware10.headers.accesscontrolallowmethods=foobar, foobar"
 - "traefik.http.middlewares.middleware10.headers.accesscontrolalloworigin=foobar"
-- "traefik.http.middlewares.middleware10.headers.accesscontrolalloworiginlist=foobar, foobar"
 - "traefik.http.middlewares.middleware10.headers.accesscontrolexposeheaders=foobar, foobar"
 - "traefik.http.middlewares.middleware10.headers.accesscontrolmaxage=42"
 - "traefik.http.middlewares.middleware10.headers.addvaryheader=true"
@@ -82,7 +81,6 @@
 - "traefik.http.middlewares.middleware13.passtlsclientcert.info.notafter=true"
 - "traefik.http.middlewares.middleware13.passtlsclientcert.info.notbefore=true"
 - "traefik.http.middlewares.middleware13.passtlsclientcert.info.sans=true"
-- "traefik.http.middlewares.middleware13.passtlsclientcert.info.serialnumber=true"
 - "traefik.http.middlewares.middleware13.passtlsclientcert.info.subject.commonname=true"
 - "traefik.http.middlewares.middleware13.passtlsclientcert.info.subject.country=true"
 - "traefik.http.middlewares.middleware13.passtlsclientcert.info.subject.domaincomponent=true"
@@ -93,7 +91,6 @@
 - "traefik.http.middlewares.middleware13.passtlsclientcert.pem=true"
 - "traefik.http.middlewares.middleware14.ratelimit.average=42"
 - "traefik.http.middlewares.middleware14.ratelimit.burst=42"
-- "traefik.http.middlewares.middleware14.ratelimit.period=42"
 - "traefik.http.middlewares.middleware14.ratelimit.sourcecriterion.ipstrategy.depth=42"
 - "traefik.http.middlewares.middleware14.ratelimit.sourcecriterion.ipstrategy.excludedips=foobar, foobar"
 - "traefik.http.middlewares.middleware14.ratelimit.sourcecriterion.requestheadername=foobar"
@@ -135,7 +132,6 @@
 - "traefik.http.routers.router1.tls.domains[1].main=foobar"
 - "traefik.http.routers.router1.tls.domains[1].sans=foobar, foobar"
 - "traefik.http.routers.router1.tls.options=foobar"
-- "traefik.http.services.service01.loadbalancer.healthcheck.followredirects=true"
 - "traefik.http.services.service01.loadbalancer.healthcheck.headers.name0=foobar"
 - "traefik.http.services.service01.loadbalancer.healthcheck.headers.name1=foobar"
 - "traefik.http.services.service01.loadbalancer.healthcheck.hostname=foobar"
@@ -144,10 +140,9 @@
 - "traefik.http.services.service01.loadbalancer.healthcheck.port=42"
 - "traefik.http.services.service01.loadbalancer.healthcheck.scheme=foobar"
 - "traefik.http.services.service01.loadbalancer.healthcheck.timeout=foobar"
-- "traefik.http.services.service01.loadbalancer.healthcheck.followredirects=true"
 - "traefik.http.services.service01.loadbalancer.passhostheader=true"
 - "traefik.http.services.service01.loadbalancer.responseforwarding.flushinterval=foobar"
-- "traefik.http.services.service01.loadbalancer.sticky.cookie=true"
+- "traefik.http.services.service01.loadbalancer.sticky=true"
 - "traefik.http.services.service01.loadbalancer.sticky.cookie.httponly=true"
 - "traefik.http.services.service01.loadbalancer.sticky.cookie.name=foobar"
 - "traefik.http.services.service01.loadbalancer.sticky.cookie.secure=true"
@@ -178,8 +173,3 @@
 - "traefik.tcp.routers.tcprouter1.tls.passthrough=true"
 - "traefik.tcp.services.tcpservice01.loadbalancer.terminationdelay=42"
 - "traefik.tcp.services.tcpservice01.loadbalancer.server.port=foobar"
-- "traefik.udp.routers.udprouter0.entrypoints=foobar, foobar"
-- "traefik.udp.routers.udprouter0.service=foobar"
-- "traefik.udp.routers.udprouter1.entrypoints=foobar, foobar"
-- "traefik.udp.routers.udprouter1.service=foobar"
-- "traefik.udp.services.udpservice01.loadbalancer.server.port=foobar"

docs/content/reference/dynamic-configuration/file.toml

@@ -57,7 +57,6 @@
           interval = "foobar"
           timeout = "foobar"
           hostname = "foobar"
-          followRedirects = true
           [http.services.Service01.loadBalancer.healthCheck.headers]
             name0 = "foobar"
             name1 = "foobar"
@@ -66,7 +65,6 @@
     [http.services.Service02]
       [http.services.Service02.mirroring]
         service = "foobar"
-        maxBodySize = 42
 
         [[http.services.Service02.mirroring.mirrors]]
           name = "foobar"
@@ -150,7 +148,6 @@
         accessControlAllowHeaders = ["foobar", "foobar"]
         accessControlAllowMethods = ["foobar", "foobar"]
         accessControlAllowOrigin = "foobar"
-        accessControlAllowOriginList = ["foobar", "foobar"]
         accessControlExposeHeaders = ["foobar", "foobar"]
         accessControlMaxAge = 42
         addVaryHeader = true
@@ -205,7 +202,6 @@
           notAfter = true
           notBefore = true
           sans = true
-          serialNumber = true
           [http.middlewares.Middleware13.passTLSClientCert.info.subject]
             country = true
             province = true
@@ -225,7 +221,6 @@
     [http.middlewares.Middleware14]
       [http.middlewares.Middleware14.rateLimit]
         average = 42
-        period = 42
         burst = 42
         [http.middlewares.Middleware14.rateLimit.sourceCriterion]
           requestHeaderName = "foobar"
@@ -316,34 +311,6 @@
           name = "foobar"
           weight = 42
 
-[udp]
-  [udp.routers]
-    [udp.routers.UDPRouter0]
-      entryPoints = ["foobar", "foobar"]
-      service = "foobar"
-    [udp.routers.UDPRouter1]
-      entryPoints = ["foobar", "foobar"]
-      service = "foobar"
-  [udp.services]
-    [udp.services.UDPService01]
-      [udp.services.UDPService01.loadBalancer]
-
-        [[udp.services.UDPService01.loadBalancer.servers]]
-          address = "foobar"
-
-        [[udp.services.UDPService01.loadBalancer.servers]]
-          address = "foobar"
-    [udp.services.UDPService02]
-      [udp.services.UDPService02.weighted]
-
-        [[udp.services.UDPService02.weighted.services]]
-          name = "foobar"
-          weight = 42
-
-        [[udp.services.UDPService02.weighted.services]]
-          name = "foobar"
-          weight = 42
-
 [tls]
 
   [[tls.certificates]]
@@ -362,7 +329,6 @@
       cipherSuites = ["foobar", "foobar"]
       curvePreferences = ["foobar", "foobar"]
       sniStrict = true
-      preferServerCipherSuites = true
       [tls.options.Options0.clientAuth]
         caFiles = ["foobar", "foobar"]
         clientAuthType = "foobar"
@@ -372,7 +338,6 @@
       cipherSuites = ["foobar", "foobar"]
       curvePreferences = ["foobar", "foobar"]
       sniStrict = true
-      preferServerCipherSuites = true
       [tls.options.Options1.clientAuth]
         caFiles = ["foobar", "foobar"]
         clientAuthType = "foobar"

docs/content/reference/dynamic-configuration/file.yaml

@@ -63,7 +63,6 @@ http:
           interval: foobar
           timeout: foobar
           hostname: foobar
-          followRedirects: true
           headers:
             name0: foobar
             name1: foobar
@@ -73,7 +72,6 @@ http:
     Service02:
       mirroring:
         service: foobar
-        maxBodySize: 42
         mirrors:
         - name: foobar
           percent: 42
@@ -173,9 +171,6 @@ http:
         - foobar
         - foobar
         accessControlAllowOrigin: foobar
-        accessControlAllowOriginList:
-        - foobar
-        - foobar
         accessControlExposeHeaders:
         - foobar
         - foobar
@@ -252,11 +247,9 @@ http:
             commonName: true
             serialNumber: true
             domainComponent: true
-          serialNumber: true
     Middleware14:
       rateLimit:
         average: 42
-        period: 42
         burst: 42
         sourceCriterion:
           ipstrategy:
@@ -351,31 +344,6 @@ tcp:
           weight: 42
         - name: foobar
           weight: 42
-udp:
-  routers:
-    UDPRouter0:
-      entryPoints:
-      - foobar
-      - foobar
-      service: foobar
-    UDPRouter1:
-      entryPoints:
-      - foobar
-      - foobar
-      service: foobar
-  services:
-    UDPService01:
-      loadBalancer:
-        servers:
-        - address: foobar
-        - address: foobar
-    UDPService02:
-      weighted:
-        services:
-        - name: foobar
-          weight: 42
-        - name: foobar
-          weight: 42
 tls:
   certificates:
   - certFile: foobar
@@ -404,7 +372,6 @@ tls:
         - foobar
         clientAuthType: foobar
       sniStrict: true
-      preferServerCipherSuites: true
     Options1:
       minVersion: foobar
       maxVersion: foobar
@@ -420,7 +387,6 @@ tls:
         - foobar
         clientAuthType: foobar
       sniStrict: true
-      preferServerCipherSuites: true
   stores:
     Store0:
       defaultCertificate:

docs/content/reference/dynamic-configuration/kubernetes-crd-definition.yml

@@ -42,21 +42,6 @@ spec:
     singular: ingressroutetcp
   scope: Namespaced
 
----
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  name: ingressrouteudps.traefik.containo.us
-
-spec:
-  group: traefik.containo.us
-  version: v1alpha1
-  names:
-    kind: IngressRouteUDP
-    plural: ingressrouteudps
-    singular: ingressrouteudp
-  scope: Namespaced
-
 ---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
@@ -72,21 +57,6 @@ spec:
     singular: tlsoption
   scope: Namespaced
 
----
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  name: tlsstores.traefik.containo.us
-
-spec:
-  group: traefik.containo.us
-  version: v1alpha1
-  names:
-    kind: TLSStore
-    plural: tlsstores
-    singular: tlsstore
-  scope: Namespaced
-
 ---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition

docs/content/reference/dynamic-configuration/kubernetes-crd-ingressroutetcp-definition.yml

@@ -0,0 +1,13 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: ingressroutetcps.traefik.containo.us
+
+spec:
+  group: traefik.containo.us
+  version: v1alpha1
+  names:
+    kind: IngressRouteTCP
+    plural: ingressroutetcps
+    singular: ingressroutetcp
+  scope: Namespaced

docs/content/reference/dynamic-configuration/kubernetes-crd-rbac.yml

@@ -35,9 +35,7 @@ rules:
       - ingressroutes
       - traefikservices
       - ingressroutetcps
-      - ingressrouteudps
       - tlsoptions
-      - tlsstores
     verbs:
       - get
       - list

docs/content/reference/dynamic-configuration/kubernetes-crd-resource.yml

@@ -65,8 +65,6 @@ spec:
     kind: TraefikService
     mirrors:
       - name: s2
-        # Optional
-        maxBodySize: 2000000000
         # Optional, as it is the default value
         kind: Service
         percent: 20
@@ -82,7 +80,7 @@ spec:
     - web
     - websecure
   routes:
-    - match: Host(`example.net`) && PathPrefix(`/bar`)
+    - match: Host(`foo.com`) && PathPrefix(`/bar`)
       kind: Rule
       priority: 12
       # defining several services is possible and allowed, but for now the servers of
@@ -91,11 +89,21 @@ spec:
       services:
         - name: s1
           port: 80
+          healthCheck:
+            path: /health
+            host: baz.com
+            intervalSeconds: 7
+            timeoutSeconds: 60
           # strategy defines the load balancing strategy between the servers. It defaults
           # to Round Robin, and for now only Round Robin is supported anyway.
           strategy: RoundRobin
         - name: s2
           port: 433
+          healthCheck:
+            path: /health
+            host: baz.com
+            intervalSeconds: 7
+            timeoutSeconds: 60
     - match: PathPrefix(`/misc`)
       services:
         - name: s3
@@ -123,7 +131,7 @@ spec:
   tls:
     secretName: supersecret
     options:
-      name: my-tls-option
+      name: myTLSOption
       namespace: default
 
 ---
@@ -137,7 +145,7 @@ spec:
   entryPoints:
     - footcp
   routes:
-    - match: HostSNI(`example.com`)
+    - match: HostSNI(`bar.com`)
       services:
         - name: whoamitcp
           port: 8080
@@ -145,44 +153,5 @@ spec:
     secretName: foosecret
     passthrough: false
     options:
-      name: my-tls-option
+      name: myTLSOption
       namespace: default
-
----
-apiVersion: traefik.containo.us/v1alpha1
-kind: IngressRouteUDP
-metadata:
-  name: ingressrouteudp.crd
-  namespace: default
-
-spec:
-  entryPoints:
-    - footcp
-  routes:
-    - services:
-        - name: whoamiudp
-          port: 8080
-
----
-apiVersion: traefik.containo.us/v1alpha1
-kind: TLSOption
-metadata:
-  name: tlsoption
-  namespace: default
-
-spec:
-  minVersion: foobar
-  maxVersion: foobar
-  cipherSuites:
-    - foobar
-    - foobar
-  curvePreferences:
-    - foobar
-    - foobar
-  clientAuth:
-    caFiles:
-      - foobar
-      - foobar
-    clientAuthType: foobar
-  sniStrict: true
-  preferServerCipherSuites: true

docs/content/reference/dynamic-configuration/kubernetes-crd.yml

@@ -0,0 +1,231 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: ingressroutes.traefik.containo.us
+
+spec:
+  group: traefik.containo.us
+  version: v1alpha1
+  names:
+    kind: IngressRoute
+    plural: ingressroutes
+    singular: ingressroute
+  scope: Namespaced
+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: middlewares.traefik.containo.us
+spec:
+  group: traefik.containo.us
+  version: v1alpha1
+  names:
+    kind: Middleware
+    plural: middlewares
+    singular: middleware
+  scope: Namespaced
+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: tlsoptions.traefik.containo.us
+
+spec:
+  group: traefik.containo.us
+  version: v1alpha1
+  names:
+    kind: TLSOption
+    plural: tlsoptions
+    singular: tlsoption
+  scope: Namespaced
+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: ingressroutetcps.traefik.containo.us
+
+spec:
+  group: traefik.containo.us
+  version: v1alpha1
+  names:
+    kind: IngressRouteTCP
+    plural: ingressroutetcps
+    singular: ingressroutetcp
+  scope: Namespaced
+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: traefikservices.traefik.containo.us
+
+spec:
+  group: traefik.containo.us
+  version: v1alpha1
+  names:
+    kind: TraefikService
+    plural: traefikservices
+    singular: traefikservice
+  scope: Namespaced
+
+---
+apiVersion: traefik.containo.us/v1alpha1
+kind: TraefikService
+metadata:
+  name: wrr2
+  namespace: default
+
+spec:
+  weighted:
+    services:
+      - name: s1
+        weight: 1
+        port: 80
+        # Optional, as it is the default value
+        kind: Service
+      - name: s3
+        weight: 1
+        port: 80
+
+---
+apiVersion: traefik.containo.us/v1alpha1
+kind: TraefikService
+metadata:
+  name: wrr1
+  namespace: default
+
+spec:
+  weighted:
+    services:
+      - name: wrr2
+        kind: TraefikService
+        weight: 1
+      - name: s3
+        weight: 1
+        port: 80
+
+---
+apiVersion: traefik.containo.us/v1alpha1
+kind: TraefikService
+metadata:
+  name: mirror1
+  namespace: default
+
+spec:
+  mirroring:
+    name: s1
+    port: 80
+    mirrors:
+      - name: s3
+        percent: 20
+        port: 80
+      - name: mirror2
+        kind: TraefikService
+        percent: 20
+
+---
+apiVersion: traefik.containo.us/v1alpha1
+kind: TraefikService
+metadata:
+  name: mirror2
+  namespace: default
+
+spec:
+  mirroring:
+    name: wrr2
+    kind: TraefikService
+    mirrors:
+      - name: s2
+        # Optional, as it is the default value
+        kind: Service
+        percent: 20
+        port: 80
+
+---
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
+metadata:
+  name: ingressroute
+spec:
+  entryPoints:
+    - web
+    - websecure
+  routes:
+    - match: Host(`foo.com`) && PathPrefix(`/bar`)
+      kind: Rule
+      priority: 12
+      # defining several services is possible and allowed, but for now the servers of
+      # all the services (for a given route) get merged altogether under the same
+      # load-balancing strategy.
+      services:
+        - name: s1
+          port: 80
+          healthCheck:
+            path: /health
+            host: baz.com
+            intervalSeconds: 7
+            timeoutSeconds: 60
+          # strategy defines the load balancing strategy between the servers. It defaults
+          # to Round Robin, and for now only Round Robin is supported anyway.
+          strategy: RoundRobin
+        - name: s2
+          port: 433
+          healthCheck:
+            path: /health
+            host: baz.com
+            intervalSeconds: 7
+            timeoutSeconds: 60
+    - match: PathPrefix(`/misc`)
+      services:
+        - name: s3
+          port: 80
+      middlewares:
+        - name: stripprefix
+        - name: addprefix
+    - match: PathPrefix(`/misc`)
+      services:
+        - name: s3
+          # Optional, as it is the default value
+          kind: Service
+          port: 8443
+          # scheme allow to override the scheme for the service. (ex: https or h2c)
+          scheme: https
+    - match: PathPrefix(`/lb`)
+      services:
+        - name: wrr1
+          kind: TraefikService
+    - match: PathPrefix(`/mirrored`)
+      services:
+        - name: mirror1
+          kind: TraefikService
+  # use an empty tls object for TLS with Let's Encrypt
+  tls:
+    secretName: supersecret
+    options:
+      name: myTLSOption
+      namespace: default
+
+---
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRouteTCP
+metadata:
+  name: ingressroutetcp.crd
+  namespace: default
+
+spec:
+  entryPoints:
+    - footcp
+  routes:
+    - match: HostSNI(`bar.com`)
+      services:
+        - name: whoamitcp
+          port: 8080
+  tls:
+    secretName: foosecret
+    passthrough: false
+    options:
+      name: myTLSOption
+      namespace: default

docs/content/reference/dynamic-configuration/kv-ref.md

@@ -1,270 +0,0 @@
-| `traefik/http/middlewares/Middleware00/addPrefix/prefix` | `foobar` |
-| `traefik/http/middlewares/Middleware01/basicAuth/headerField` | `foobar` |
-| `traefik/http/middlewares/Middleware01/basicAuth/realm` | `foobar` |
-| `traefik/http/middlewares/Middleware01/basicAuth/removeHeader` | `true` |
-| `traefik/http/middlewares/Middleware01/basicAuth/users/0` | `foobar` |
-| `traefik/http/middlewares/Middleware01/basicAuth/users/1` | `foobar` |
-| `traefik/http/middlewares/Middleware01/basicAuth/usersFile` | `foobar` |
-| `traefik/http/middlewares/Middleware02/buffering/maxRequestBodyBytes` | `42` |
-| `traefik/http/middlewares/Middleware02/buffering/maxResponseBodyBytes` | `42` |
-| `traefik/http/middlewares/Middleware02/buffering/memRequestBodyBytes` | `42` |
-| `traefik/http/middlewares/Middleware02/buffering/memResponseBodyBytes` | `42` |
-| `traefik/http/middlewares/Middleware02/buffering/retryExpression` | `foobar` |
-| `traefik/http/middlewares/Middleware03/chain/middlewares/0` | `foobar` |
-| `traefik/http/middlewares/Middleware03/chain/middlewares/1` | `foobar` |
-| `traefik/http/middlewares/Middleware04/circuitBreaker/expression` | `foobar` |
-| `traefik/http/middlewares/Middleware05/compress/excludedContentTypes/0` | `foobar` |
-| `traefik/http/middlewares/Middleware05/compress/excludedContentTypes/1` | `foobar` |
-| `traefik/http/middlewares/Middleware06/contentType/autoDetect` | `true` |
-| `traefik/http/middlewares/Middleware07/digestAuth/headerField` | `foobar` |
-| `traefik/http/middlewares/Middleware07/digestAuth/realm` | `foobar` |
-| `traefik/http/middlewares/Middleware07/digestAuth/removeHeader` | `true` |
-| `traefik/http/middlewares/Middleware07/digestAuth/users/0` | `foobar` |
-| `traefik/http/middlewares/Middleware07/digestAuth/users/1` | `foobar` |
-| `traefik/http/middlewares/Middleware07/digestAuth/usersFile` | `foobar` |
-| `traefik/http/middlewares/Middleware08/errors/query` | `foobar` |
-| `traefik/http/middlewares/Middleware08/errors/service` | `foobar` |
-| `traefik/http/middlewares/Middleware08/errors/status/0` | `foobar` |
-| `traefik/http/middlewares/Middleware08/errors/status/1` | `foobar` |
-| `traefik/http/middlewares/Middleware09/forwardAuth/address` | `foobar` |
-| `traefik/http/middlewares/Middleware09/forwardAuth/authResponseHeaders/0` | `foobar` |
-| `traefik/http/middlewares/Middleware09/forwardAuth/authResponseHeaders/1` | `foobar` |
-| `traefik/http/middlewares/Middleware09/forwardAuth/tls/ca` | `foobar` |
-| `traefik/http/middlewares/Middleware09/forwardAuth/tls/caOptional` | `true` |
-| `traefik/http/middlewares/Middleware09/forwardAuth/tls/cert` | `foobar` |
-| `traefik/http/middlewares/Middleware09/forwardAuth/tls/insecureSkipVerify` | `true` |
-| `traefik/http/middlewares/Middleware09/forwardAuth/tls/key` | `foobar` |
-| `traefik/http/middlewares/Middleware09/forwardAuth/trustForwardHeader` | `true` |
-| `traefik/http/middlewares/Middleware10/headers/accessControlAllowCredentials` | `true` |
-| `traefik/http/middlewares/Middleware10/headers/accessControlAllowHeaders/0` | `foobar` |
-| `traefik/http/middlewares/Middleware10/headers/accessControlAllowHeaders/1` | `foobar` |
-| `traefik/http/middlewares/Middleware10/headers/accessControlAllowMethods/0` | `foobar` |
-| `traefik/http/middlewares/Middleware10/headers/accessControlAllowMethods/1` | `foobar` |
-| `traefik/http/middlewares/Middleware10/headers/accessControlAllowOrigin` | `foobar` |
-| `traefik/http/middlewares/Middleware10/headers/accessControlAllowOriginList/0` | `foobar` |
-| `traefik/http/middlewares/Middleware10/headers/accessControlAllowOriginList/1` | `foobar` |
-| `traefik/http/middlewares/Middleware10/headers/accessControlExposeHeaders/0` | `foobar` |
-| `traefik/http/middlewares/Middleware10/headers/accessControlExposeHeaders/1` | `foobar` |
-| `traefik/http/middlewares/Middleware10/headers/accessControlMaxAge` | `42` |
-| `traefik/http/middlewares/Middleware10/headers/addVaryHeader` | `true` |
-| `traefik/http/middlewares/Middleware10/headers/allowedHosts/0` | `foobar` |
-| `traefik/http/middlewares/Middleware10/headers/allowedHosts/1` | `foobar` |
-| `traefik/http/middlewares/Middleware10/headers/browserXssFilter` | `true` |
-| `traefik/http/middlewares/Middleware10/headers/contentSecurityPolicy` | `foobar` |
-| `traefik/http/middlewares/Middleware10/headers/contentTypeNosniff` | `true` |
-| `traefik/http/middlewares/Middleware10/headers/customBrowserXSSValue` | `foobar` |
-| `traefik/http/middlewares/Middleware10/headers/customFrameOptionsValue` | `foobar` |
-| `traefik/http/middlewares/Middleware10/headers/customRequestHeaders/name0` | `foobar` |
-| `traefik/http/middlewares/Middleware10/headers/customRequestHeaders/name1` | `foobar` |
-| `traefik/http/middlewares/Middleware10/headers/customResponseHeaders/name0` | `foobar` |
-| `traefik/http/middlewares/Middleware10/headers/customResponseHeaders/name1` | `foobar` |
-| `traefik/http/middlewares/Middleware10/headers/featurePolicy` | `foobar` |
-| `traefik/http/middlewares/Middleware10/headers/forceSTSHeader` | `true` |
-| `traefik/http/middlewares/Middleware10/headers/frameDeny` | `true` |
-| `traefik/http/middlewares/Middleware10/headers/hostsProxyHeaders/0` | `foobar` |
-| `traefik/http/middlewares/Middleware10/headers/hostsProxyHeaders/1` | `foobar` |
-| `traefik/http/middlewares/Middleware10/headers/isDevelopment` | `true` |
-| `traefik/http/middlewares/Middleware10/headers/publicKey` | `foobar` |
-| `traefik/http/middlewares/Middleware10/headers/referrerPolicy` | `foobar` |
-| `traefik/http/middlewares/Middleware10/headers/sslForceHost` | `true` |
-| `traefik/http/middlewares/Middleware10/headers/sslHost` | `foobar` |
-| `traefik/http/middlewares/Middleware10/headers/sslProxyHeaders/name0` | `foobar` |
-| `traefik/http/middlewares/Middleware10/headers/sslProxyHeaders/name1` | `foobar` |
-| `traefik/http/middlewares/Middleware10/headers/sslRedirect` | `true` |
-| `traefik/http/middlewares/Middleware10/headers/sslTemporaryRedirect` | `true` |
-| `traefik/http/middlewares/Middleware10/headers/stsIncludeSubdomains` | `true` |
-| `traefik/http/middlewares/Middleware10/headers/stsPreload` | `true` |
-| `traefik/http/middlewares/Middleware10/headers/stsSeconds` | `42` |
-| `traefik/http/middlewares/Middleware11/ipWhiteList/ipStrategy/depth` | `42` |
-| `traefik/http/middlewares/Middleware11/ipWhiteList/ipStrategy/excludedIPs/0` | `foobar` |
-| `traefik/http/middlewares/Middleware11/ipWhiteList/ipStrategy/excludedIPs/1` | `foobar` |
-| `traefik/http/middlewares/Middleware11/ipWhiteList/sourceRange/0` | `foobar` |
-| `traefik/http/middlewares/Middleware11/ipWhiteList/sourceRange/1` | `foobar` |
-| `traefik/http/middlewares/Middleware12/inFlightReq/amount` | `42` |
-| `traefik/http/middlewares/Middleware12/inFlightReq/sourceCriterion/ipStrategy/depth` | `42` |
-| `traefik/http/middlewares/Middleware12/inFlightReq/sourceCriterion/ipStrategy/excludedIPs/0` | `foobar` |
-| `traefik/http/middlewares/Middleware12/inFlightReq/sourceCriterion/ipStrategy/excludedIPs/1` | `foobar` |
-| `traefik/http/middlewares/Middleware12/inFlightReq/sourceCriterion/requestHeaderName` | `foobar` |
-| `traefik/http/middlewares/Middleware12/inFlightReq/sourceCriterion/requestHost` | `true` |
-| `traefik/http/middlewares/Middleware13/passTLSClientCert/info/issuer/commonName` | `true` |
-| `traefik/http/middlewares/Middleware13/passTLSClientCert/info/issuer/country` | `true` |
-| `traefik/http/middlewares/Middleware13/passTLSClientCert/info/issuer/domainComponent` | `true` |
-| `traefik/http/middlewares/Middleware13/passTLSClientCert/info/issuer/locality` | `true` |
-| `traefik/http/middlewares/Middleware13/passTLSClientCert/info/issuer/organization` | `true` |
-| `traefik/http/middlewares/Middleware13/passTLSClientCert/info/issuer/province` | `true` |
-| `traefik/http/middlewares/Middleware13/passTLSClientCert/info/issuer/serialNumber` | `true` |
-| `traefik/http/middlewares/Middleware13/passTLSClientCert/info/notAfter` | `true` |
-| `traefik/http/middlewares/Middleware13/passTLSClientCert/info/notBefore` | `true` |
-| `traefik/http/middlewares/Middleware13/passTLSClientCert/info/sans` | `true` |
-| `traefik/http/middlewares/Middleware13/passTLSClientCert/info/serialNumber` | `true` |
-| `traefik/http/middlewares/Middleware13/passTLSClientCert/info/subject/commonName` | `true` |
-| `traefik/http/middlewares/Middleware13/passTLSClientCert/info/subject/country` | `true` |
-| `traefik/http/middlewares/Middleware13/passTLSClientCert/info/subject/domainComponent` | `true` |
-| `traefik/http/middlewares/Middleware13/passTLSClientCert/info/subject/locality` | `true` |
-| `traefik/http/middlewares/Middleware13/passTLSClientCert/info/subject/organization` | `true` |
-| `traefik/http/middlewares/Middleware13/passTLSClientCert/info/subject/province` | `true` |
-| `traefik/http/middlewares/Middleware13/passTLSClientCert/info/subject/serialNumber` | `true` |
-| `traefik/http/middlewares/Middleware13/passTLSClientCert/pem` | `true` |
-| `traefik/http/middlewares/Middleware14/rateLimit/average` | `42` |
-| `traefik/http/middlewares/Middleware14/rateLimit/burst` | `42` |
-| `traefik/http/middlewares/Middleware14/rateLimit/period` | `42` |
-| `traefik/http/middlewares/Middleware14/rateLimit/sourceCriterion/ipStrategy/depth` | `42` |
-| `traefik/http/middlewares/Middleware14/rateLimit/sourceCriterion/ipStrategy/excludedIPs/0` | `foobar` |
-| `traefik/http/middlewares/Middleware14/rateLimit/sourceCriterion/ipStrategy/excludedIPs/1` | `foobar` |
-| `traefik/http/middlewares/Middleware14/rateLimit/sourceCriterion/requestHeaderName` | `foobar` |
-| `traefik/http/middlewares/Middleware14/rateLimit/sourceCriterion/requestHost` | `true` |
-| `traefik/http/middlewares/Middleware15/redirectRegex/permanent` | `true` |
-| `traefik/http/middlewares/Middleware15/redirectRegex/regex` | `foobar` |
-| `traefik/http/middlewares/Middleware15/redirectRegex/replacement` | `foobar` |
-| `traefik/http/middlewares/Middleware16/redirectScheme/permanent` | `true` |
-| `traefik/http/middlewares/Middleware16/redirectScheme/port` | `foobar` |
-| `traefik/http/middlewares/Middleware16/redirectScheme/scheme` | `foobar` |
-| `traefik/http/middlewares/Middleware17/replacePath/path` | `foobar` |
-| `traefik/http/middlewares/Middleware18/replacePathRegex/regex` | `foobar` |
-| `traefik/http/middlewares/Middleware18/replacePathRegex/replacement` | `foobar` |
-| `traefik/http/middlewares/Middleware19/retry/attempts` | `42` |
-| `traefik/http/middlewares/Middleware20/stripPrefix/forceSlash` | `true` |
-| `traefik/http/middlewares/Middleware20/stripPrefix/prefixes/0` | `foobar` |
-| `traefik/http/middlewares/Middleware20/stripPrefix/prefixes/1` | `foobar` |
-| `traefik/http/middlewares/Middleware21/stripPrefixRegex/regex/0` | `foobar` |
-| `traefik/http/middlewares/Middleware21/stripPrefixRegex/regex/1` | `foobar` |
-| `traefik/http/routers/Router0/entryPoints/0` | `foobar` |
-| `traefik/http/routers/Router0/entryPoints/1` | `foobar` |
-| `traefik/http/routers/Router0/middlewares/0` | `foobar` |
-| `traefik/http/routers/Router0/middlewares/1` | `foobar` |
-| `traefik/http/routers/Router0/priority` | `42` |
-| `traefik/http/routers/Router0/rule` | `foobar` |
-| `traefik/http/routers/Router0/service` | `foobar` |
-| `traefik/http/routers/Router0/tls/certResolver` | `foobar` |
-| `traefik/http/routers/Router0/tls/domains/0/main` | `foobar` |
-| `traefik/http/routers/Router0/tls/domains/0/sans/0` | `foobar` |
-| `traefik/http/routers/Router0/tls/domains/0/sans/1` | `foobar` |
-| `traefik/http/routers/Router0/tls/domains/1/main` | `foobar` |
-| `traefik/http/routers/Router0/tls/domains/1/sans/0` | `foobar` |
-| `traefik/http/routers/Router0/tls/domains/1/sans/1` | `foobar` |
-| `traefik/http/routers/Router0/tls/options` | `foobar` |
-| `traefik/http/routers/Router1/entryPoints/0` | `foobar` |
-| `traefik/http/routers/Router1/entryPoints/1` | `foobar` |
-| `traefik/http/routers/Router1/middlewares/0` | `foobar` |
-| `traefik/http/routers/Router1/middlewares/1` | `foobar` |
-| `traefik/http/routers/Router1/priority` | `42` |
-| `traefik/http/routers/Router1/rule` | `foobar` |
-| `traefik/http/routers/Router1/service` | `foobar` |
-| `traefik/http/routers/Router1/tls/certResolver` | `foobar` |
-| `traefik/http/routers/Router1/tls/domains/0/main` | `foobar` |
-| `traefik/http/routers/Router1/tls/domains/0/sans/0` | `foobar` |
-| `traefik/http/routers/Router1/tls/domains/0/sans/1` | `foobar` |
-| `traefik/http/routers/Router1/tls/domains/1/main` | `foobar` |
-| `traefik/http/routers/Router1/tls/domains/1/sans/0` | `foobar` |
-| `traefik/http/routers/Router1/tls/domains/1/sans/1` | `foobar` |
-| `traefik/http/routers/Router1/tls/options` | `foobar` |
-| `traefik/http/services/Service01/loadBalancer/healthCheck/followRedirects` | `true` |
-| `traefik/http/services/Service01/loadBalancer/healthCheck/headers/name0` | `foobar` |
-| `traefik/http/services/Service01/loadBalancer/healthCheck/headers/name1` | `foobar` |
-| `traefik/http/services/Service01/loadBalancer/healthCheck/hostname` | `foobar` |
-| `traefik/http/services/Service01/loadBalancer/healthCheck/interval` | `foobar` |
-| `traefik/http/services/Service01/loadBalancer/healthCheck/path` | `foobar` |
-| `traefik/http/services/Service01/loadBalancer/healthCheck/port` | `42` |
-| `traefik/http/services/Service01/loadBalancer/healthCheck/scheme` | `foobar` |
-| `traefik/http/services/Service01/loadBalancer/healthCheck/timeout` | `foobar` |
-| `traefik/http/services/Service01/loadBalancer/passHostHeader` | `true` |
-| `traefik/http/services/Service01/loadBalancer/responseForwarding/flushInterval` | `foobar` |
-| `traefik/http/services/Service01/loadBalancer/servers/0/url` | `foobar` |
-| `traefik/http/services/Service01/loadBalancer/servers/1/url` | `foobar` |
-| `traefik/http/services/Service01/loadBalancer/sticky/cookie/httpOnly` | `true` |
-| `traefik/http/services/Service01/loadBalancer/sticky/cookie/name` | `foobar` |
-| `traefik/http/services/Service01/loadBalancer/sticky/cookie/sameSite` | `foobar` |
-| `traefik/http/services/Service01/loadBalancer/sticky/cookie/secure` | `true` |
-| `traefik/http/services/Service02/mirroring/maxBodySize` | `42` |
-| `traefik/http/services/Service02/mirroring/mirrors/0/name` | `foobar` |
-| `traefik/http/services/Service02/mirroring/mirrors/0/percent` | `42` |
-| `traefik/http/services/Service02/mirroring/mirrors/1/name` | `foobar` |
-| `traefik/http/services/Service02/mirroring/mirrors/1/percent` | `42` |
-| `traefik/http/services/Service02/mirroring/service` | `foobar` |
-| `traefik/http/services/Service03/weighted/services/0/name` | `foobar` |
-| `traefik/http/services/Service03/weighted/services/0/weight` | `42` |
-| `traefik/http/services/Service03/weighted/services/1/name` | `foobar` |
-| `traefik/http/services/Service03/weighted/services/1/weight` | `42` |
-| `traefik/http/services/Service03/weighted/sticky/cookie/httpOnly` | `true` |
-| `traefik/http/services/Service03/weighted/sticky/cookie/name` | `foobar` |
-| `traefik/http/services/Service03/weighted/sticky/cookie/sameSite` | `foobar` |
-| `traefik/http/services/Service03/weighted/sticky/cookie/secure` | `true` |
-| `traefik/tcp/routers/TCPRouter0/entryPoints/0` | `foobar` |
-| `traefik/tcp/routers/TCPRouter0/entryPoints/1` | `foobar` |
-| `traefik/tcp/routers/TCPRouter0/rule` | `foobar` |
-| `traefik/tcp/routers/TCPRouter0/service` | `foobar` |
-| `traefik/tcp/routers/TCPRouter0/tls/certResolver` | `foobar` |
-| `traefik/tcp/routers/TCPRouter0/tls/domains/0/main` | `foobar` |
-| `traefik/tcp/routers/TCPRouter0/tls/domains/0/sans/0` | `foobar` |
-| `traefik/tcp/routers/TCPRouter0/tls/domains/0/sans/1` | `foobar` |
-| `traefik/tcp/routers/TCPRouter0/tls/domains/1/main` | `foobar` |
-| `traefik/tcp/routers/TCPRouter0/tls/domains/1/sans/0` | `foobar` |
-| `traefik/tcp/routers/TCPRouter0/tls/domains/1/sans/1` | `foobar` |
-| `traefik/tcp/routers/TCPRouter0/tls/options` | `foobar` |
-| `traefik/tcp/routers/TCPRouter0/tls/passthrough` | `true` |
-| `traefik/tcp/routers/TCPRouter1/entryPoints/0` | `foobar` |
-| `traefik/tcp/routers/TCPRouter1/entryPoints/1` | `foobar` |
-| `traefik/tcp/routers/TCPRouter1/rule` | `foobar` |
-| `traefik/tcp/routers/TCPRouter1/service` | `foobar` |
-| `traefik/tcp/routers/TCPRouter1/tls/certResolver` | `foobar` |
-| `traefik/tcp/routers/TCPRouter1/tls/domains/0/main` | `foobar` |
-| `traefik/tcp/routers/TCPRouter1/tls/domains/0/sans/0` | `foobar` |
-| `traefik/tcp/routers/TCPRouter1/tls/domains/0/sans/1` | `foobar` |
-| `traefik/tcp/routers/TCPRouter1/tls/domains/1/main` | `foobar` |
-| `traefik/tcp/routers/TCPRouter1/tls/domains/1/sans/0` | `foobar` |
-| `traefik/tcp/routers/TCPRouter1/tls/domains/1/sans/1` | `foobar` |
-| `traefik/tcp/routers/TCPRouter1/tls/options` | `foobar` |
-| `traefik/tcp/routers/TCPRouter1/tls/passthrough` | `true` |
-| `traefik/tcp/services/TCPService01/loadBalancer/servers/0/address` | `foobar` |
-| `traefik/tcp/services/TCPService01/loadBalancer/servers/1/address` | `foobar` |
-| `traefik/tcp/services/TCPService01/loadBalancer/terminationDelay` | `42` |
-| `traefik/tcp/services/TCPService02/weighted/services/0/name` | `foobar` |
-| `traefik/tcp/services/TCPService02/weighted/services/0/weight` | `42` |
-| `traefik/tcp/services/TCPService02/weighted/services/1/name` | `foobar` |
-| `traefik/tcp/services/TCPService02/weighted/services/1/weight` | `42` |
-| `traefik/tls/certificates/0/certFile` | `foobar` |
-| `traefik/tls/certificates/0/keyFile` | `foobar` |
-| `traefik/tls/certificates/0/stores/0` | `foobar` |
-| `traefik/tls/certificates/0/stores/1` | `foobar` |
-| `traefik/tls/certificates/1/certFile` | `foobar` |
-| `traefik/tls/certificates/1/keyFile` | `foobar` |
-| `traefik/tls/certificates/1/stores/0` | `foobar` |
-| `traefik/tls/certificates/1/stores/1` | `foobar` |
-| `traefik/tls/options/Options0/cipherSuites/0` | `foobar` |
-| `traefik/tls/options/Options0/cipherSuites/1` | `foobar` |
-| `traefik/tls/options/Options0/clientAuth/caFiles/0` | `foobar` |
-| `traefik/tls/options/Options0/clientAuth/caFiles/1` | `foobar` |
-| `traefik/tls/options/Options0/clientAuth/clientAuthType` | `foobar` |
-| `traefik/tls/options/Options0/curvePreferences/0` | `foobar` |
-| `traefik/tls/options/Options0/curvePreferences/1` | `foobar` |
-| `traefik/tls/options/Options0/maxVersion` | `foobar` |
-| `traefik/tls/options/Options0/minVersion` | `foobar` |
-| `traefik/tls/options/Options0/preferServerCipherSuites` | `true` |
-| `traefik/tls/options/Options0/sniStrict` | `true` |
-| `traefik/tls/options/Options1/cipherSuites/0` | `foobar` |
-| `traefik/tls/options/Options1/cipherSuites/1` | `foobar` |
-| `traefik/tls/options/Options1/clientAuth/caFiles/0` | `foobar` |
-| `traefik/tls/options/Options1/clientAuth/caFiles/1` | `foobar` |
-| `traefik/tls/options/Options1/clientAuth/clientAuthType` | `foobar` |
-| `traefik/tls/options/Options1/curvePreferences/0` | `foobar` |
-| `traefik/tls/options/Options1/curvePreferences/1` | `foobar` |
-| `traefik/tls/options/Options1/maxVersion` | `foobar` |
-| `traefik/tls/options/Options1/minVersion` | `foobar` |
-| `traefik/tls/options/Options1/preferServerCipherSuites` | `true` |
-| `traefik/tls/options/Options1/sniStrict` | `true` |
-| `traefik/tls/stores/Store0/defaultCertificate/certFile` | `foobar` |
-| `traefik/tls/stores/Store0/defaultCertificate/keyFile` | `foobar` |
-| `traefik/tls/stores/Store1/defaultCertificate/certFile` | `foobar` |
-| `traefik/tls/stores/Store1/defaultCertificate/keyFile` | `foobar` |
-| `traefik/udp/routers/UDPRouter0/entryPoints/0` | `foobar` |
-| `traefik/udp/routers/UDPRouter0/entryPoints/1` | `foobar` |
-| `traefik/udp/routers/UDPRouter0/service` | `foobar` |
-| `traefik/udp/routers/UDPRouter1/entryPoints/0` | `foobar` |
-| `traefik/udp/routers/UDPRouter1/entryPoints/1` | `foobar` |
-| `traefik/udp/routers/UDPRouter1/service` | `foobar` |
-| `traefik/udp/services/UDPService01/loadBalancer/servers/0/address` | `foobar` |
-| `traefik/udp/services/UDPService01/loadBalancer/servers/1/address` | `foobar` |
-| `traefik/udp/services/UDPService02/weighted/services/0/name` | `foobar` |
-| `traefik/udp/services/UDPService02/weighted/services/0/weight` | `42` |
-| `traefik/udp/services/UDPService02/weighted/services/1/name` | `foobar` |
-| `traefik/udp/services/UDPService02/weighted/services/1/weight` | `42` |

docs/content/reference/dynamic-configuration/kv.md

@@ -1,8 +0,0 @@
-# KV Configuration Reference
-
-Dynamic configuration with KV stores.
-{: .subtitle }
-
-| Key (Path)                                                                                   | Value       |
-|----------------------------------------------------------------------------------------------|-------------|
---8<-- "content/reference/dynamic-configuration/kv-ref.md"

docs/content/reference/dynamic-configuration/marathon-labels.json

@@ -34,7 +34,6 @@
 "traefik.http.middlewares.middleware10.headers.accesscontrolallowheaders": "foobar, foobar",
 "traefik.http.middlewares.middleware10.headers.accesscontrolallowmethods": "foobar, foobar",
 "traefik.http.middlewares.middleware10.headers.accesscontrolalloworigin": "foobar",
-"traefik.http.middlewares.middleware10.headers.accesscontrolalloworiginlist": "foobar, foobar",
 "traefik.http.middlewares.middleware10.headers.accesscontrolexposeheaders": "foobar, foobar",
 "traefik.http.middlewares.middleware10.headers.accesscontrolmaxage": "42",
 "traefik.http.middlewares.middleware10.headers.addvaryheader": "true",
@@ -82,7 +81,6 @@
 "traefik.http.middlewares.middleware13.passtlsclientcert.info.notafter": "true",
 "traefik.http.middlewares.middleware13.passtlsclientcert.info.notbefore": "true",
 "traefik.http.middlewares.middleware13.passtlsclientcert.info.sans": "true",
-"traefik.http.middlewares.middleware13.passtlsclientcert.info.serialnumber": "true",
 "traefik.http.middlewares.middleware13.passtlsclientcert.info.subject.commonname": "true",
 "traefik.http.middlewares.middleware13.passtlsclientcert.info.subject.country": "true",
 "traefik.http.middlewares.middleware13.passtlsclientcert.info.subject.domaincomponent": "true",
@@ -93,7 +91,6 @@
 "traefik.http.middlewares.middleware13.passtlsclientcert.pem": "true",
 "traefik.http.middlewares.middleware14.ratelimit.average": "42",
 "traefik.http.middlewares.middleware14.ratelimit.burst": "42",
-"traefik.http.middlewares.middleware14.ratelimit.period": "42",
 "traefik.http.middlewares.middleware14.ratelimit.sourcecriterion.ipstrategy.depth": "42",
 "traefik.http.middlewares.middleware14.ratelimit.sourcecriterion.ipstrategy.excludedips": "foobar, foobar",
 "traefik.http.middlewares.middleware14.ratelimit.sourcecriterion.requestheadername": "foobar",
@@ -133,7 +130,6 @@
 "traefik.http.routers.router1.tls.domains[1].main": "foobar",
 "traefik.http.routers.router1.tls.domains[1].sans": "foobar, foobar",
 "traefik.http.routers.router1.tls.options": "foobar",
-"traefik.http.services.service01.loadbalancer.healthcheck.followredirects": "true",
 "traefik.http.services.service01.loadbalancer.healthcheck.headers.name0": "foobar",
 "traefik.http.services.service01.loadbalancer.healthcheck.headers.name1": "foobar",
 "traefik.http.services.service01.loadbalancer.healthcheck.hostname": "foobar",
@@ -142,10 +138,8 @@
 "traefik.http.services.service01.loadbalancer.healthcheck.port": "42",
 "traefik.http.services.service01.loadbalancer.healthcheck.scheme": "foobar",
 "traefik.http.services.service01.loadbalancer.healthcheck.timeout": "foobar",
-"traefik.http.services.service01.loadbalancer.healthcheck.followredirects": "true",
 "traefik.http.services.service01.loadbalancer.passhostheader": "true",
 "traefik.http.services.service01.loadbalancer.responseforwarding.flushinterval": "foobar",
-"traefik.http.services.service01.loadbalancer.sticky.cookie": "true",
 "traefik.http.services.service01.loadbalancer.sticky.cookie.httponly": "true",
 "traefik.http.services.service01.loadbalancer.sticky.cookie.name": "foobar",
 "traefik.http.services.service01.loadbalancer.sticky.cookie.secure": "true",
@@ -174,8 +168,3 @@
 "traefik.tcp.routers.tcprouter1.tls.passthrough": "true",
 "traefik.tcp.services.tcpservice01.loadbalancer.terminationdelay": "42",
 "traefik.tcp.services.tcpservice01.loadbalancer.server.port": "foobar",
-"traefik.udp.routers.udprouter0.entrypoints": "foobar, foobar",
-"traefik.udp.routers.udprouter0.service": "foobar",
-"traefik.udp.routers.udprouter1.entrypoints": "foobar, foobar",
-"traefik.udp.routers.udprouter1.service": "foobar",
-"traefik.udp.services.udpservice01.loadbalancer.server.port": "foobar",

docs/content/reference/static-configuration/cli-ref.md

@@ -99,42 +99,6 @@ Trust all forwarded headers. (Default: ```false```)
 `--entrypoints.<name>.forwardedheaders.trustedips`:  
 Trust only forwarded headers from selected IPs.
 
-`--entrypoints.<name>.http`:  
-HTTP configuration.
-
-`--entrypoints.<name>.http.middlewares`:  
-Default middlewares for the routers linked to the entry point.
-
-`--entrypoints.<name>.http.redirections.entrypoint.permanent`:  
-Applies a permanent redirection. (Default: ```true```)
-
-`--entrypoints.<name>.http.redirections.entrypoint.priority`:  
-Priority of the generated router. (Default: ```2147483647```)
-
-`--entrypoints.<name>.http.redirections.entrypoint.scheme`:  
-Scheme used for the redirection. (Default: ```https```)
-
-`--entrypoints.<name>.http.redirections.entrypoint.to`:  
-Targeted entry point of the redirection.
-
-`--entrypoints.<name>.http.tls`:  
-Default TLS configuration for the routers linked to the entry point. (Default: ```false```)
-
-`--entrypoints.<name>.http.tls.certresolver`:  
-Default certificate resolver for the routers linked to the entry point.
-
-`--entrypoints.<name>.http.tls.domains`:  
-Default TLS domains for the routers linked to the entry point.
-
-`--entrypoints.<name>.http.tls.domains[n].main`:  
-Default subject name.
-
-`--entrypoints.<name>.http.tls.domains[n].sans`:  
-Subject alternative names.
-
-`--entrypoints.<name>.http.tls.options`:  
-Default TLS options for the routers linked to the entry point.
-
 `--entrypoints.<name>.proxyprotocol`:  
 Proxy-Protocol configuration. (Default: ```false```)
 
@@ -279,36 +243,6 @@ EntryPoint (Default: ```traefik```)
 `--ping.manualrouting`:  
 Manual routing (Default: ```false```)
 
-`--providers.consul`:  
-Enable Consul backend with default settings. (Default: ```false```)
-
-`--providers.consul.endpoints`:  
-KV store endpoints (Default: ```127.0.0.1:8500```)
-
-`--providers.consul.password`:  
-KV Password
-
-`--providers.consul.rootkey`:  
-Root key used for KV store (Default: ```traefik```)
-
-`--providers.consul.tls.ca`:  
-TLS CA
-
-`--providers.consul.tls.caoptional`:  
-TLS CA.Optional (Default: ```false```)
-
-`--providers.consul.tls.cert`:  
-TLS cert
-
-`--providers.consul.tls.insecureskipverify`:  
-TLS insecure skip verify (Default: ```false```)
-
-`--providers.consul.tls.key`:  
-TLS key
-
-`--providers.consul.username`:  
-KV Username
-
 `--providers.consulcatalog.cache`:  
 Use local agent caching for catalog reads. (Default: ```false```)
 
@@ -414,36 +348,6 @@ Use the ip address from the bound port, rather than from the inner network. (Def
 `--providers.docker.watch`:  
 Watch Docker Swarm events. (Default: ```true```)
 
-`--providers.etcd`:  
-Enable Etcd backend with default settings. (Default: ```false```)
-
-`--providers.etcd.endpoints`:  
-KV store endpoints (Default: ```127.0.0.1:2379```)
-
-`--providers.etcd.password`:  
-KV Password
-
-`--providers.etcd.rootkey`:  
-Root key used for KV store (Default: ```traefik```)
-
-`--providers.etcd.tls.ca`:  
-TLS CA
-
-`--providers.etcd.tls.caoptional`:  
-TLS CA.Optional (Default: ```false```)
-
-`--providers.etcd.tls.cert`:  
-TLS cert
-
-`--providers.etcd.tls.insecureskipverify`:  
-TLS insecure skip verify (Default: ```false```)
-
-`--providers.etcd.tls.key`:  
-TLS key
-
-`--providers.etcd.username`:  
-KV Username
-
 `--providers.file.debugloggeneratedtemplate`:  
 Enable debug logging of generated configuration template. (Default: ```false```)
 
@@ -612,72 +516,12 @@ Defines the polling interval in seconds. (Default: ```15```)
 `--providers.rancher.watch`:  
 Watch provider. (Default: ```true```)
 
-`--providers.redis`:  
-Enable Redis backend with default settings. (Default: ```false```)
-
-`--providers.redis.endpoints`:  
-KV store endpoints (Default: ```127.0.0.1:6379```)
-
-`--providers.redis.password`:  
-KV Password
-
-`--providers.redis.rootkey`:  
-Root key used for KV store (Default: ```traefik```)
-
-`--providers.redis.tls.ca`:  
-TLS CA
-
-`--providers.redis.tls.caoptional`:  
-TLS CA.Optional (Default: ```false```)
-
-`--providers.redis.tls.cert`:  
-TLS cert
-
-`--providers.redis.tls.insecureskipverify`:  
-TLS insecure skip verify (Default: ```false```)
-
-`--providers.redis.tls.key`:  
-TLS key
-
-`--providers.redis.username`:  
-KV Username
-
 `--providers.rest`:  
 Enable Rest backend with default settings. (Default: ```false```)
 
 `--providers.rest.insecure`:  
 Activate REST Provider directly on the entryPoint named traefik. (Default: ```false```)
 
-`--providers.zookeeper`:  
-Enable ZooKeeper backend with default settings. (Default: ```false```)
-
-`--providers.zookeeper.endpoints`:  
-KV store endpoints (Default: ```127.0.0.1:2181```)
-
-`--providers.zookeeper.password`:  
-KV Password
-
-`--providers.zookeeper.rootkey`:  
-Root key used for KV store (Default: ```traefik```)
-
-`--providers.zookeeper.tls.ca`:  
-TLS CA
-
-`--providers.zookeeper.tls.caoptional`:  
-TLS CA.Optional (Default: ```false```)
-
-`--providers.zookeeper.tls.cert`:  
-TLS cert
-
-`--providers.zookeeper.tls.insecureskipverify`:  
-TLS insecure skip verify (Default: ```false```)
-
-`--providers.zookeeper.tls.key`:  
-TLS key
-
-`--providers.zookeeper.username`:  
-KV Username
-
 `--serverstransport.forwardingtimeouts.dialtimeout`:  
 The amount of time to wait until a connection to a backend server can be established. If zero, no timeout exists. (Default: ```30```)
 
@@ -726,18 +570,6 @@ Specifies the header name that will be used to store the sampling priority.
 `--tracing.datadog.traceidheadername`:  
 Specifies the header name that will be used to store the trace ID.
 
-`--tracing.elastic`:  
-Settings for Elastic. (Default: ```false```)
-
-`--tracing.elastic.secrettoken`:  
-Set the token used to connect to Elastic APM Server.
-
-`--tracing.elastic.serverurl`:  
-Set the URL of the Elastic APM server.
-
-`--tracing.elastic.serviceenvironment`:  
-Set the name of the environment Traefik is deployed in, e.g. 'production' or 'staging'.
-
 `--tracing.haystack`:  
 Settings for Haystack. (Default: ```false```)
 

docs/content/reference/static-configuration/env-ref.md

@@ -99,42 +99,6 @@ Trust all forwarded headers. (Default: ```false```)
 `TRAEFIK_ENTRYPOINTS_<NAME>_FORWARDEDHEADERS_TRUSTEDIPS`:  
 Trust only forwarded headers from selected IPs.
 
-`TRAEFIK_ENTRYPOINTS_<NAME>_HTTP`:  
-HTTP configuration.
-
-`TRAEFIK_ENTRYPOINTS_<NAME>_HTTP_MIDDLEWARES`:  
-Default middlewares for the routers linked to the entry point.
-
-`TRAEFIK_ENTRYPOINTS_<NAME>_HTTP_REDIRECTIONS_ENTRYPOINT_PERMANENT`:  
-Applies a permanent redirection. (Default: ```true```)
-
-`TRAEFIK_ENTRYPOINTS_<NAME>_HTTP_REDIRECTIONS_ENTRYPOINT_PRIORITY`:  
-Priority of the generated router. (Default: ```2147483647```)
-
-`TRAEFIK_ENTRYPOINTS_<NAME>_HTTP_REDIRECTIONS_ENTRYPOINT_SCHEME`:  
-Scheme used for the redirection. (Default: ```https```)
-
-`TRAEFIK_ENTRYPOINTS_<NAME>_HTTP_REDIRECTIONS_ENTRYPOINT_TO`:  
-Targeted entry point of the redirection.
-
-`TRAEFIK_ENTRYPOINTS_<NAME>_HTTP_TLS`:  
-Default TLS configuration for the routers linked to the entry point. (Default: ```false```)
-
-`TRAEFIK_ENTRYPOINTS_<NAME>_HTTP_TLS_CERTRESOLVER`:  
-Default certificate resolver for the routers linked to the entry point.
-
-`TRAEFIK_ENTRYPOINTS_<NAME>_HTTP_TLS_DOMAINS`:  
-Default TLS domains for the routers linked to the entry point.
-
-`TRAEFIK_ENTRYPOINTS_<NAME>_HTTP_TLS_DOMAINS[n]_MAIN`:  
-Default subject name.
-
-`TRAEFIK_ENTRYPOINTS_<NAME>_HTTP_TLS_DOMAINS[n]_SANS`:  
-Subject alternative names.
-
-`TRAEFIK_ENTRYPOINTS_<NAME>_HTTP_TLS_OPTIONS`:  
-Default TLS options for the routers linked to the entry point.
-
 `TRAEFIK_ENTRYPOINTS_<NAME>_PROXYPROTOCOL`:  
 Proxy-Protocol configuration. (Default: ```false```)
 
@@ -279,9 +243,6 @@ EntryPoint (Default: ```traefik```)
 `TRAEFIK_PING_MANUALROUTING`:  
 Manual routing (Default: ```false```)
 
-`TRAEFIK_PROVIDERS_CONSUL`:  
-Enable Consul backend with default settings. (Default: ```false```)
-
 `TRAEFIK_PROVIDERS_CONSULCATALOG_CACHE`:  
 Use local agent caching for catalog reads. (Default: ```false```)
 
@@ -342,33 +303,6 @@ Forces the read to be fully consistent. (Default: ```false```)
 `TRAEFIK_PROVIDERS_CONSULCATALOG_STALE`:  
 Use stale consistency for catalog reads. (Default: ```false```)
 
-`TRAEFIK_PROVIDERS_CONSUL_ENDPOINTS`:  
-KV store endpoints (Default: ```127.0.0.1:8500```)
-
-`TRAEFIK_PROVIDERS_CONSUL_PASSWORD`:  
-KV Password
-
-`TRAEFIK_PROVIDERS_CONSUL_ROOTKEY`:  
-Root key used for KV store (Default: ```traefik```)
-
-`TRAEFIK_PROVIDERS_CONSUL_TLS_CA`:  
-TLS CA
-
-`TRAEFIK_PROVIDERS_CONSUL_TLS_CAOPTIONAL`:  
-TLS CA.Optional (Default: ```false```)
-
-`TRAEFIK_PROVIDERS_CONSUL_TLS_CERT`:  
-TLS cert
-
-`TRAEFIK_PROVIDERS_CONSUL_TLS_INSECURESKIPVERIFY`:  
-TLS insecure skip verify (Default: ```false```)
-
-`TRAEFIK_PROVIDERS_CONSUL_TLS_KEY`:  
-TLS key
-
-`TRAEFIK_PROVIDERS_CONSUL_USERNAME`:  
-KV Username
-
 `TRAEFIK_PROVIDERS_DOCKER`:  
 Enable Docker backend with default settings. (Default: ```false```)
 
@@ -414,36 +348,6 @@ Use the ip address from the bound port, rather than from the inner network. (Def
 `TRAEFIK_PROVIDERS_DOCKER_WATCH`:  
 Watch Docker Swarm events. (Default: ```true```)
 
-`TRAEFIK_PROVIDERS_ETCD`:  
-Enable Etcd backend with default settings. (Default: ```false```)
-
-`TRAEFIK_PROVIDERS_ETCD_ENDPOINTS`:  
-KV store endpoints (Default: ```127.0.0.1:2379```)
-
-`TRAEFIK_PROVIDERS_ETCD_PASSWORD`:  
-KV Password
-
-`TRAEFIK_PROVIDERS_ETCD_ROOTKEY`:  
-Root key used for KV store (Default: ```traefik```)
-
-`TRAEFIK_PROVIDERS_ETCD_TLS_CA`:  
-TLS CA
-
-`TRAEFIK_PROVIDERS_ETCD_TLS_CAOPTIONAL`:  
-TLS CA.Optional (Default: ```false```)
-
-`TRAEFIK_PROVIDERS_ETCD_TLS_CERT`:  
-TLS cert
-
-`TRAEFIK_PROVIDERS_ETCD_TLS_INSECURESKIPVERIFY`:  
-TLS insecure skip verify (Default: ```false```)
-
-`TRAEFIK_PROVIDERS_ETCD_TLS_KEY`:  
-TLS key
-
-`TRAEFIK_PROVIDERS_ETCD_USERNAME`:  
-KV Username
-
 `TRAEFIK_PROVIDERS_FILE_DEBUGLOGGENERATEDTEMPLATE`:  
 Enable debug logging of generated configuration template. (Default: ```false```)
 
@@ -612,72 +516,12 @@ Defines the polling interval in seconds. (Default: ```15```)
 `TRAEFIK_PROVIDERS_RANCHER_WATCH`:  
 Watch provider. (Default: ```true```)
 
-`TRAEFIK_PROVIDERS_REDIS`:  
-Enable Redis backend with default settings. (Default: ```false```)
-
-`TRAEFIK_PROVIDERS_REDIS_ENDPOINTS`:  
-KV store endpoints (Default: ```127.0.0.1:6379```)
-
-`TRAEFIK_PROVIDERS_REDIS_PASSWORD`:  
-KV Password
-
-`TRAEFIK_PROVIDERS_REDIS_ROOTKEY`:  
-Root key used for KV store (Default: ```traefik```)
-
-`TRAEFIK_PROVIDERS_REDIS_TLS_CA`:  
-TLS CA
-
-`TRAEFIK_PROVIDERS_REDIS_TLS_CAOPTIONAL`:  
-TLS CA.Optional (Default: ```false```)
-
-`TRAEFIK_PROVIDERS_REDIS_TLS_CERT`:  
-TLS cert
-
-`TRAEFIK_PROVIDERS_REDIS_TLS_INSECURESKIPVERIFY`:  
-TLS insecure skip verify (Default: ```false```)
-
-`TRAEFIK_PROVIDERS_REDIS_TLS_KEY`:  
-TLS key
-
-`TRAEFIK_PROVIDERS_REDIS_USERNAME`:  
-KV Username
-
 `TRAEFIK_PROVIDERS_REST`:  
 Enable Rest backend with default settings. (Default: ```false```)
 
 `TRAEFIK_PROVIDERS_REST_INSECURE`:  
 Activate REST Provider directly on the entryPoint named traefik. (Default: ```false```)
 
-`TRAEFIK_PROVIDERS_ZOOKEEPER`:  
-Enable ZooKeeper backend with default settings. (Default: ```false```)
-
-`TRAEFIK_PROVIDERS_ZOOKEEPER_ENDPOINTS`:  
-KV store endpoints (Default: ```127.0.0.1:2181```)
-
-`TRAEFIK_PROVIDERS_ZOOKEEPER_PASSWORD`:  
-KV Password
-
-`TRAEFIK_PROVIDERS_ZOOKEEPER_ROOTKEY`:  
-Root key used for KV store (Default: ```traefik```)
-
-`TRAEFIK_PROVIDERS_ZOOKEEPER_TLS_CA`:  
-TLS CA
-
-`TRAEFIK_PROVIDERS_ZOOKEEPER_TLS_CAOPTIONAL`:  
-TLS CA.Optional (Default: ```false```)
-
-`TRAEFIK_PROVIDERS_ZOOKEEPER_TLS_CERT`:  
-TLS cert
-
-`TRAEFIK_PROVIDERS_ZOOKEEPER_TLS_INSECURESKIPVERIFY`:  
-TLS insecure skip verify (Default: ```false```)
-
-`TRAEFIK_PROVIDERS_ZOOKEEPER_TLS_KEY`:  
-TLS key
-
-`TRAEFIK_PROVIDERS_ZOOKEEPER_USERNAME`:  
-KV Username
-
 `TRAEFIK_SERVERSTRANSPORT_FORWARDINGTIMEOUTS_DIALTIMEOUT`:  
 The amount of time to wait until a connection to a backend server can be established. If zero, no timeout exists. (Default: ```30```)
 
@@ -726,18 +570,6 @@ Specifies the header name that will be used to store the sampling priority.
 `TRAEFIK_TRACING_DATADOG_TRACEIDHEADERNAME`:  
 Specifies the header name that will be used to store the trace ID.
 
-`TRAEFIK_TRACING_ELASTIC`:  
-Settings for Elastic. (Default: ```false```)
-
-`TRAEFIK_TRACING_ELASTIC_SECRETTOKEN`:  
-Set the token used to connect to Elastic APM Server.
-
-`TRAEFIK_TRACING_ELASTIC_SERVERURL`:  
-Set the URL of the Elastic APM server.
-
-`TRAEFIK_TRACING_ELASTIC_SERVICEENVIRONMENT`:  
-Set the name of the environment Traefik is deployed in, e.g. 'production' or 'staging'.
-
 `TRAEFIK_TRACING_HAYSTACK`:  
 Settings for Haystack. (Default: ```false```)
 

docs/content/reference/static-configuration/file.toml

@@ -28,25 +28,6 @@
     [entryPoints.EntryPoint0.forwardedHeaders]
       insecure = true
       trustedIPs = ["foobar", "foobar"]
-    [entryPoints.EntryPoint0.http]
-      middlewares = ["foobar", "foobar"]
-      [entryPoints.EntryPoint0.http.redirections]
-        [entryPoints.EntryPoint0.http.redirections.entryPoint]
-          to = "foobar"
-          scheme = "foobar"
-          permanent = true
-          priority = 42
-      [entryPoints.EntryPoint0.http.tls]
-        options = "foobar"
-        certResolver = "foobar"
-
-        [[entryPoints.EntryPoint0.http.tls.domains]]
-          main = "foobar"
-          sans = ["foobar", "foobar"]
-
-        [[entryPoints.EntryPoint0.http.tls.domains]]
-          main = "foobar"
-          sans = ["foobar", "foobar"]
 
 [providers]
   providersThrottleDuration = 42
@@ -151,50 +132,6 @@
       [providers.consulCatalog.endpoint.httpAuth]
         username = "foobar"
         password = "foobar"
-  [providers.consul]
-    rootKey = "foobar"
-    endpoints = ["foobar", "foobar"]
-    username = "foobar"
-    password = "foobar"
-    [providers.consul.tls]
-      ca = "foobar"
-      caOptional = true
-      cert = "foobar"
-      key = "foobar"
-      insecureSkipVerify = true
-  [providers.etcd]
-    rootKey = "foobar"
-    endpoints = ["foobar", "foobar"]
-    username = "foobar"
-    password = "foobar"
-    [providers.etcd.tls]
-      ca = "foobar"
-      caOptional = true
-      cert = "foobar"
-      key = "foobar"
-      insecureSkipVerify = true
-  [providers.zooKeeper]
-    rootKey = "foobar"
-    endpoints = ["foobar", "foobar"]
-    username = "foobar"
-    password = "foobar"
-    [providers.zooKeeper.tls]
-      ca = "foobar"
-      caOptional = true
-      cert = "foobar"
-      key = "foobar"
-      insecureSkipVerify = true
-  [providers.redis]
-    rootKey = "foobar"
-    endpoints = ["foobar", "foobar"]
-    username = "foobar"
-    password = "foobar"
-    [providers.redis.tls]
-      ca = "foobar"
-      caOptional = true
-      cert = "foobar"
-      key = "foobar"
-      insecureSkipVerify = true
 
 [api]
   insecure = true
@@ -299,10 +236,6 @@
     parentIDHeaderName = "foobar"
     spanIDHeaderName = "foobar"
     baggagePrefixHeaderName = "foobar"
-  [tracing.elastic]
-    serverURL = "foobar"
-    secretToken = "foobar"
-    serviceEnvironment = "foobar"
 
 [hostResolver]
   cnameFlattening = true

docs/content/reference/static-configuration/file.yaml

@@ -32,28 +32,6 @@ entryPoints:
       trustedIPs:
       - foobar
       - foobar
-    http:
-      redirections:
-        entryPoint:
-          to: foobar
-          scheme: foobar
-          permanent: true
-          priority: 42
-      middlewares:
-      - foobar
-      - foobar
-      tls:
-        options: foobar
-        certResolver: foobar
-        domains:
-        - main: foobar
-          sans:
-          - foobar
-          - foobar
-        - main: foobar
-          sans:
-          - foobar
-          - foobar
 providers:
   providersThrottleDuration: 42
   docker:
@@ -110,7 +88,7 @@ providers:
     - foobar
     labelSelector: foobar
     ingressClass: foobar
-    throttleDuration: 42s
+      throttleDuration: 42s
     ingressEndpoint:
       ip: foobar
       hostname: foobar
@@ -125,7 +103,7 @@ providers:
     - foobar
     labelSelector: foobar
     ingressClass: foobar
-    throttleDuration: 42s
+    throttleDuration: 10s
   rest:
     insecure: true
   rancher:
@@ -161,58 +139,6 @@ providers:
       httpAuth:
         username: foobar
         password: foobar
-  consul:
-    rootKey: foobar
-    endpoints:
-    - foobar
-    - foobar
-    username: foobar
-    password: foobar
-    tls:
-      ca: foobar
-      caOptional: true
-      cert: foobar
-      key: foobar
-      insecureSkipVerify: true
-  etcd:
-    rootKey: foobar
-    endpoints:
-    - foobar
-    - foobar
-    username: foobar
-    password: foobar
-    tls:
-      ca: foobar
-      caOptional: true
-      cert: foobar
-      key: foobar
-      insecureSkipVerify: true
-  zooKeeper:
-    rootKey: foobar
-    endpoints:
-    - foobar
-    - foobar
-    username: foobar
-    password: foobar
-    tls:
-      ca: foobar
-      caOptional: true
-      cert: foobar
-      key: foobar
-      insecureSkipVerify: true
-  redis:
-    rootKey: foobar
-    endpoints:
-    - foobar
-    - foobar
-    username: foobar
-    password: foobar
-    tls:
-      ca: foobar
-      caOptional: true
-      cert: foobar
-      key: foobar
-      insecureSkipVerify: true
 api:
   insecure: true
   dashboard: true
@@ -315,10 +241,6 @@ tracing:
     parentIDHeaderName: foobar
     spanIDHeaderName: foobar
     baggagePrefixHeaderName: foobar
-  elastic:
-    serverURL: foobar
-    secretToken: foobar
-    serviceEnvironment: foobar
 hostResolver:
   cnameFlattening: true
   resolvConfig: foobar

docs/content/routing/entrypoints.md

@@ -6,8 +6,7 @@ Opening Connections for Incoming Requests
 ![entryPoints](../assets/img/entrypoints.png)
 
 EntryPoints are the network entry points into Traefik.
-They define the port which will receive the packets,
-and whether to listen for TCP or UDP.
+They define the port which will receive the requests (whether HTTP or TCP).
 
 ## Configuration Examples
 
@@ -65,33 +64,12 @@ and whether to listen for TCP or UDP.
     - Two entrypoints are defined: one called `web`, and the other called `websecure`.
     - `web` listens on port `80`, and `websecure` on port `443`. 
 
-??? example "UDP on port 1704"
-
-    ```toml tab="File (TOML)"
-    ## Static configuration
-    [entryPoints]
-      [entryPoints.streaming]
-        address = ":1704/udp"
-    ```
-
-    ```yaml tab="File (YAML)"
-    ## Static configuration
-    entryPoints:
-      streaming:
-        address: ":1704/udp"
-    ```
-
-    ```bash tab="CLI"
-    ## Static configuration
-    --entryPoints.streaming.address=:1704/udp
-    ```
-
 ## Configuration
 
 ### General
 
 EntryPoints are part of the [static configuration](../getting-started/configuration-overview.md#the-static-configuration).
-They can be defined by using a file (TOML or YAML) or CLI arguments.
+You can define them using a toml file, CLI arguments, or a key-value store.
 
 ??? info "See the complete reference for the list of available options"
     
@@ -99,7 +77,7 @@ They can be defined by using a file (TOML or YAML) or CLI arguments.
     ## Static configuration
     [entryPoints]
       [entryPoints.name]
-        address = ":8888" # same as ":8888/tcp"
+        address = ":8888"
         [entryPoints.name.transport]
           [entryPoints.name.transport.lifeCycle]
             requestAcceptGraceTimeout = 42
@@ -120,7 +98,7 @@ They can be defined by using a file (TOML or YAML) or CLI arguments.
     ## Static configuration
     entryPoints:
       name:
-        address: ":8888" # same as ":8888/tcp"
+        address: ":8888"
         transport:
           lifeCycle:
             requestAcceptGraceTimeout: 42
@@ -143,7 +121,7 @@ They can be defined by using a file (TOML or YAML) or CLI arguments.
     
     ```bash tab="CLI"
     ## Static configuration
-    --entryPoints.name.address=:8888 # same as :8888/tcp
+    --entryPoints.name.address=:8888
     --entryPoints.name.transport.lifeCycle.requestAcceptGraceTimeout=42
     --entryPoints.name.transport.lifeCycle.graceTimeOut=42
     --entryPoints.name.transport.respondingTimeouts.readTimeout=42
@@ -155,70 +133,7 @@ They can be defined by using a file (TOML or YAML) or CLI arguments.
     --entryPoints.name.forwardedHeaders.trustedIPs=127.0.0.1,192.168.0.1
     ```
 
-### Address
-
-The address defines the port, and optionally the hostname, on which to listen for incoming connections and packets.
-It also defines the protocol to use (TCP or UDP).
-If no protocol is specified, the default is TCP.
-The format is:
-
-```bash
-[host]:port[/tcp|/udp]
-```
-
-If both TCP and UDP are wanted for the same port, two entryPoints definitions are needed, such as in the example below.
-
-??? example "Both TCP and UDP on Port 3179"
-
-    ```toml tab="File (TOML)"
-    ## Static configuration
-    [entryPoints]
-      [entryPoints.tcpep]
-        address = ":3179"
-      [entryPoints.udpep]
-        address = ":3179/udp"
-    ```
-
-    ```yaml tab="File (YAML)"
-    ## Static configuration
-    entryPoints:
-      tcpep:
-       address: ":3179"
-      udpep:
-       address: ":3179/udp"
-    ```
-
-    ```bash tab="CLI"
-    ## Static configuration
-    --entryPoints.tcpep.address=:3179
-    --entryPoints.udpep.address=:3179/udp
-    ```
-
-??? example "Listen on Specific IP Addresses Only"
-
-    ```toml tab="File (TOML)"
-    [entryPoints.specificIPv4]
-      address = "192.168.2.7:8888"
-    [entryPoints.specificIPv6]
-      address = "[2001:db8::1]:8888"
-    ```
-    
-    ```yaml tab="File (yaml)"
-    entryPoints:
-      specificIPv4:
-        address: "192.168.2.7:8888"
-      specificIPv6:
-        address: "[2001:db8::1]:8888"
-    ```
-    
-    ```bash tab="CLI"
-    entrypoints.specificIPv4.address=192.168.2.7:8888
-    entrypoints.specificIPv6.address=[2001:db8::1]:8888
-    ```
-    
-    Full details for how to specify `address` can be found in [net.Listen](https://golang.org/pkg/net/#Listen) (and [net.Dial](https://golang.org/pkg/net/#Dial)) of the doc for go.
-
-### Forwarded Headers
+### Forwarded Header
 
 You can configure Traefik to trust the forwarded headers information (`X-Forwarded-*`).
 
@@ -287,7 +202,6 @@ You can configure Traefik to trust the forwarded headers information (`X-Forward
 #### `respondingTimeouts`
 
 `respondingTimeouts` are timeouts for incoming requests to the Traefik instance.
-Setting them has no effect for UDP entryPoints.
 
 ??? info "`transport.respondingTimeouts.readTimeout`"
     
@@ -553,274 +467,3 @@ If the Proxy Protocol header is passed, then the version is determined automatic
 
     When queuing Traefik behind another load-balancer, make sure to configure Proxy Protocol on both sides.
     Not doing so could introduce a security risk in your system (enabling request forgery).
-
-## HTTP Options
-
-This whole section is dedicated to options, keyed by entry point, that will apply only to HTTP routing.
-
-### Redirection
-
-??? example "HTTPS redirection (80 to 443)"
-    
-    ```toml tab="File (TOML)"
-    [entryPoints.web]
-      address = ":80"
-      
-      [entryPoints.web.http]
-        [entryPoints.web.http.redirections]
-          [entryPoints.web.http.redirections.entryPoint]
-            to = "websecure"
-            scheme = "https"
-    
-    [entryPoints.websecure]
-      address = ":443"
-    ```
-    
-    ```yaml tab="File (YAML)"
-    entryPoints:
-      web:
-        address: :80
-        http:
-          redirections:
-            entryPoint:
-              to: websecure
-              scheme: https
-    
-      websecure:
-        address: :443
-    ```
-    
-    ```bash tab="CLI"
-    --entrypoints.web.address=:80
-    --entrypoints.web.http.redirections.entryPoint.to=websecure
-    --entrypoints.web.http.redirections.entryPoint.scheme=https
-    --entrypoints.websecure.address=:443
-    ```
-
-#### `entryPoint`
-
-This section is a convenience to enable (permanent) redirecting of all incoming requests on an entry point (e.g. port `80`) to another entry point (e.g. port `443`) or an explicit port (`:443`).
-
-??? info "`entryPoint.to`"
-    
-    _Required_
-    
-    The target element, it can be:
-    
-      - an entry point name (ex: `websecure`)
-      - a port (`:443`)
-      
-    ```toml tab="File (TOML)"
-    [entryPoints.foo]
-      # ...
-      [entryPoints.foo.http.redirections]
-        [entryPoints.foo.http.redirections.entryPoint]
-          to = "websecure"
-    ```
-    
-    ```yaml tab="File (YAML)"
-    entryPoints:
-      foo:
-        # ...
-        http:
-          redirections:
-            entryPoint:
-              to: websecure
-    ```
-    
-    ```bash tab="CLI"
-    --entrypoints.foo.http.redirections.entryPoint.to=websecure
-    ```
-
-??? info "`entryPoint.scheme`"
-    
-    _Optional, Default="https"_
-    
-    The redirection target scheme.
-
-    ```toml tab="File (TOML)"
-    [entryPoints.foo]
-      # ...
-      [entryPoints.foo.http.redirections]
-        [entryPoints.foo.http.redirections.entryPoint]
-          # ...
-          scheme = "https"
-    ```
-    
-    ```yaml tab="File (YAML)"
-    entryPoints:
-      foo:
-        # ...
-        http:
-          redirections:
-            entryPoint:
-              # ...
-              scheme: https
-    ```
-    
-    ```bash tab="CLI"
-    --entrypoints.foo.http.redirections.entryPoint.scheme=https
-    ```
-
-??? info "`entryPoint.permanent`"
-   
-    _Optional, Default=true_
-    
-    To apply a permanent redirection.
-
-    ```toml tab="File (TOML)"
-    [entryPoints.foo]
-      # ...
-      [entryPoints.foo.http.redirections]
-        [entryPoints.foo.http.redirections.entryPoint]
-          # ...
-          permanent = true
-    ```
-    
-    ```yaml tab="File (YAML)"
-    entryPoints:
-      foo:
-        # ...
-        http:
-          redirections:
-            entryPoint:
-              # ...
-              permanent: true
-    ```
-    
-    ```bash tab="CLI"
-    --entrypoints.foo.http.redirections.entrypoint.permanent=true
-    ```
-
-??? info "`entryPoint.priority`"
-  
-    _Optional, Default=1_
-    
-    Priority of the generated router.
-
-    ```toml tab="File (TOML)"
-    [entryPoints.foo]
-      # ...
-      [entryPoints.foo.http.redirections]
-        [entryPoints.foo.http.redirections.entryPoint]
-          # ...
-          priority = 10
-    ```
-    
-    ```yaml tab="File (YAML)"
-    entryPoints:
-      foo:
-        # ...
-        http:
-          redirections:
-            entryPoint:
-              # ...
-              priority: 10
-    ```
-    
-    ```bash tab="CLI"
-    --entrypoints.foo.http.redirections.entrypoint.priority=10
-    ```
-
-### Middlewares
-
-The list of middlewares that are prepended by default to the list of middlewares of each router associated to the named entry point.
-
-```toml tab="File (TOML)"
-[entryPoints.websecure]
-  address = ":443"
-
-  [entryPoints.websecure.http]
-    middlewares = ["auth@file", "strip@file"]
-```
-
-```yaml tab="File (YAML)"
-entryPoints:
-  websecure:
-    address: ':443'
-    http:
-      middlewares:
-        - auth@file
-        - strip@file
-```
-
-```bash tab="CLI"
-entrypoints.websecure.address=:443
-entrypoints.websecure.http.middlewares=auth@file,strip@file
-```
-
-### TLS
-
-This section is about the default TLS configuration applied to all routers associated with the named entry point.
-
-If a TLS section (i.e. any of its fields) is user-defined, then the default configuration does not apply at all.
-
-The TLS section is the same as the [TLS section on HTTP routers](./routers/index.md#tls).
-
-```toml tab="File (TOML)"
-[entryPoints.websecure]
-  address = ":443"
-
-    [entryPoints.websecure.http.tls]
-      options = "foobar"
-      certResolver = "leresolver"
-      [[entryPoints.websecure.http.tls.domains]]
-        main = "example.com"
-        sans = ["foo.example.com", "bar.example.com"]
-      [[entryPoints.websecure.http.tls.domains]]
-        main = "test.com"
-        sans = ["foo.test.com", "bar.test.com"]
-```
-
-```yaml tab="File (YAML)"
-entryPoints:
-  websecure:
-    address: ':443'
-    http:
-      tls:
-        options: foobar
-        certResolver: leresolver
-        domains:
-          - main: example.com
-            sans:
-              - foo.example.com
-              - bar.example.com
-          - main: test.com
-            sans:
-              - foo.test.com
-              - bar.test.com
-```
-
-```bash tab="CLI"
-entrypoints.websecure.address=:443
-entrypoints.websecure.http.tls.options=foobar
-entrypoints.websecure.http.tls.certResolver=leresolver
-entrypoints.websecure.http.tls.domains[0].main=example.com
-entrypoints.websecure.http.tls.domains[0].sans=foo.example.com,bar.example.com
-entrypoints.websecure.http.tls.domains[1].main=test.com
-entrypoints.websecure.http.tls.domains[1].sans=foo.test.com,bar.test.com
-```
-
-??? example "Let's Encrypt"
-    
-    ```toml tab="File (TOML)"
-    [entryPoints.websecure]
-      address = ":443"
-    
-        [entryPoints.websecure.http.tls]
-          certResolver = "leresolver"
-    ```
-    
-    ```yaml tab="File (YAML)"
-    entryPoints:
-      websecure:
-        address: ':443'
-        http:
-          tls:
-            certResolver: leresolver
-    ```
-    
-    ```bash tab="CLI"
-    entrypoints.websecure.address=:443
-    entrypoints.websecure.http.tls.certResolver=leresolver
-    ```

docs/content/routing/overview.md

@@ -66,7 +66,7 @@ Dynamic configuration:
   [http.routers]
      # Define a connection between requests and services
      [http.routers.to-whoami]
-      rule = "Host(`example.com`) && PathPrefix(`/whoami/`)"
+      rule = "Host(`domain`) && PathPrefix(`/whoami/`)"
       # If the rule matches, applies the middleware
       middlewares = ["test-user"]
       # If the rule matches, forward to the whoami service (declared below)
@@ -90,7 +90,7 @@ http:
   routers:
     # Define a connection between requests and services
     to-whoami:
-      rule: "Host(`example.com`) && PathPrefix(`/whoami/`)"
+      rule: "Host(`domain`) && PathPrefix(`/whoami/`)"
        # If the rule matches, applies the middleware
       middlewares:
       - test-user
@@ -122,7 +122,7 @@ http:
     In this example, we've defined routing rules for http requests only.
     Traefik also supports TCP requests. To add [TCP routers](./routers/index.md) and [TCP services](./services/index.md), declare them in a TCP section like in the following.
 
-    ??? example "Adding a TCP route for TLS requests on whoami.example.com"
+    ??? example "Adding a TCP route for TLS requests on whoami.traefik.io"
 
         **Static Configuration**
         
@@ -165,7 +165,7 @@ http:
           [http.routers]
             # Define a connection between requests and services
             [http.routers.to-whoami]
-              rule = "Host(`example.com`) && PathPrefix(`/whoami/`)"
+              rule = "Host(`domain`) && PathPrefix(`/whoami/`)"
               # If the rule matches, applies the middleware
               middlewares = ["test-user"]
               # If the rule matches, forward to the whoami service (declared below)
@@ -185,7 +185,7 @@ http:
         [tcp]
           [tcp.routers]
             [tcp.routers.to-whoami-tcp]
-              rule = "HostSNI(`whoami-tcp.example.com`)"
+              rule = "HostSNI(`whoami-tcp.traefik.io`)"
               service = "whoami-tcp"
               [tcp.routers.to-whoami-tcp.tls]
 
@@ -202,7 +202,7 @@ http:
           routers:
             # Define a connection between requests and services
             to-whoami:
-              rule: Host(`example.com`) && PathPrefix(`/whoami/`)
+              rule: Host(`domain`) && PathPrefix(`/whoami/`)
               # If the rule matches, applies the middleware
               middlewares:
               - test-user
@@ -227,7 +227,7 @@ http:
           routers:
             to-whoami-tcp:
               service: whoami-tcp
-              rule: HostSNI(`whoami-tcp.example.com`)
+              rule: HostSNI(`whoami-tcp.traefik.io`)
 
           services:
             whoami-tcp:

docs/content/routing/providers/consul-catalog.md

@@ -24,14 +24,14 @@ The Service automatically gets a server per instance in this consul Catalog serv
 
 To update the configuration of the Router automatically attached to the service, add tags starting with `traefik.routers.{name-of-your-choice}.` and followed by the option you want to change.
 
-For example, to change the rule, you could add the tag ```traefik.http.routers.my-service.rule=Host(`example.com`)```.
+For example, to change the rule, you could add the tag ```traefik.http.routers.my-service.rule=Host(`mydomain.com`)```.
 
 ??? info "`traefik.http.routers.<router_name>.rule`"
     
     See [rule](../routers/index.md#rule) for more information.
     
     ```yaml
-    traefik.http.routers.myrouter.rule=Host(`example.com`)
+    traefik.http.routers.myrouter.rule=Host(`mydomain.com`)
     ```
 
 ??? info "`traefik.http.routers.<router_name>.entrypoints`"
@@ -79,7 +79,7 @@ For example, to change the rule, you could add the tag ```traefik.http.routers.m
     See [domains](../routers/index.md#domains) for more information.
     
     ```yaml
-    traefik.http.routers.myrouter.tls.domains[0].main=example.org
+    traefik.http.routers.myrouter.tls.domains[0].main=foobar.com
     ```
 
 ??? info "`traefik.http.routers.<router_name>.tls.domains[n].sans`"
@@ -87,7 +87,7 @@ For example, to change the rule, you could add the tag ```traefik.http.routers.m
     See [domains](../routers/index.md#domains) for more information.
     
     ```yaml
-    traefik.http.routers.myrouter.tls.domains[0].sans=test.example.org,dev.example.org
+    traefik.http.routers.myrouter.tls.domains[0].sans=test.foobar.com,dev.foobar.com
     ```
 
 ??? info "`traefik.http.routers.<router_name>.tls.options`"
@@ -150,7 +150,7 @@ you'd add the tag `traefik.http.services.{name-of-your-choice}.loadbalancer.pass
     See [health check](../services/index.md#health-check) for more information.
     
     ```yaml
-    traefik.http.services.myservice.loadbalancer.healthcheck.hostname=example.org
+    traefik.http.services.myservice.loadbalancer.healthcheck.hostname=foobar.com
     ```
 
 ??? info "`traefik.http.services.<service_name>.loadbalancer.healthcheck.interval`"
@@ -193,14 +193,6 @@ you'd add the tag `traefik.http.services.{name-of-your-choice}.loadbalancer.pass
     traefik.http.services.myservice.loadbalancer.healthcheck.timeout=10
     ```
 
-??? info "`traefik.http.services.<service_name>.loadbalancer.healthcheck.followredirects`"
-    
-    See [health check](../services/index.md#health-check) for more information.
-    
-    ```yaml
-    traefik.http.services.myservice.loadbalancer.healthcheck.followredirects=true
-    ```
-
 ??? info "`traefik.http.services.<service_name>.loadbalancer.sticky`"
     
     See [sticky sessions](../services/index.md#sticky-sessions) for more information.
@@ -279,7 +271,7 @@ You can declare TCP Routers and/or Services using tags.
 ??? example "Declaring TCP Routers and Services"
 
     ```yaml
-    traefik.tcp.routers.my-router.rule=HostSNI(`example.com`)
+    traefik.tcp.routers.my-router.rule=HostSNI(`my-host.com`)
     traefik.tcp.routers.my-router.tls=true
     traefik.tcp.services.my-service.loadbalancer.server.port=4123
     ```
@@ -304,7 +296,7 @@ You can declare TCP Routers and/or Services using tags.
     See [rule](../routers/index.md#rule_1) for more information.
     
     ```yaml
-    traefik.tcp.routers.mytcprouter.rule=HostSNI(`example.com`)
+    traefik.tcp.routers.mytcprouter.rule=HostSNI(`myhost.com`)
     ```
 
 ??? info "`traefik.tcp.routers.<router_name>.service`"
@@ -336,7 +328,7 @@ You can declare TCP Routers and/or Services using tags.
     See [domains](../routers/index.md#domains_1) for more information.
     
     ```yaml
-    traefik.tcp.routers.mytcprouter.tls.domains[0].main=example.org
+    traefik.tcp.routers.mytcprouter.tls.domains[0].main=foobar.com
     ```
 
 ??? info "`traefik.tcp.routers.<router_name>.tls.domains[n].sans`"
@@ -344,7 +336,7 @@ You can declare TCP Routers and/or Services using tags.
     See [domains](../routers/index.md#domains_1) for more information.
     
     ```yaml
-    traefik.tcp.routers.mytcprouter.tls.domains[0].sans=test.example.org,dev.example.org
+    traefik.tcp.routers.mytcprouter.tls.domains[0].sans=test.foobar.com,dev.foobar.com
     ```
 
 ??? info "`traefik.tcp.routers.<router_name>.tls.options`"
@@ -381,50 +373,6 @@ You can declare TCP Routers and/or Services using tags.
     traefik.tcp.services.mytcpservice.loadbalancer.terminationdelay=100
     ```
 
-### UDP
-
-You can declare UDP Routers and/or Services using tags.
-
-??? example "Declaring UDP Routers and Services"
-
-    ```yaml
-    traefik.udp.routers.my-router.entrypoints=udp
-    traefik.udp.services.my-service.loadbalancer.server.port=4123
-    ```
-
-!!! warning "UDP and HTTP"
-
-    If you declare a UDP Router/Service, it will prevent Traefik from automatically creating an HTTP Router/Service (like it does by default if no UDP Router/Service is defined).
-    You can declare both a UDP Router/Service and an HTTP Router/Service for the same consul service (but you have to do so manually).
-
-#### UDP Routers
-
-??? info "`traefik.udp.routers.<router_name>.entrypoints`"
-    
-    See [entry points](../routers/index.md#entrypoints_2) for more information.
-    
-    ```yaml
-    traefik.udp.routers.myudprouter.entrypoints=ep1,ep2
-    ```
-
-??? info "`traefik.udp.routers.<router_name>.service`"
-    
-    See [service](../routers/index.md#services_1) for more information.
-    
-    ```yaml
-    traefik.udp.routers.myudprouter.service=myservice
-    ```
-
-#### UDP Services
-
-??? info "`traefik.udp.services.<service_name>.loadbalancer.server.port`"
-    
-    Registers a port of the application.
-    
-    ```yaml
-    traefik.udp.services.myudpservice.loadbalancer.server.port=423
-    ```
-
 ### Specific Provider Options
 
 #### `traefik.enable`

docs/content/routing/providers/crd_ingress_route.yml

@@ -0,0 +1,28 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: ingressroutes.traefik.containo.us
+
+spec:
+  group: traefik.containo.us
+  version: v1alpha1
+  names:
+    kind: IngressRoute
+    plural: ingressroutes
+    singular: ingressroute
+  scope: Namespaced
+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: ingressroutetcps.traefik.containo.us
+
+spec:
+  group: traefik.containo.us
+  version: v1alpha1
+  names:
+    kind: IngressRouteTCP
+    plural: ingressroutetcps
+    singular: ingressroutetcp
+  scope: Namespaced

docs/content/routing/providers/crd_middlewares.yml

@@ -0,0 +1,13 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: middlewares.traefik.containo.us
+
+spec:
+  group: traefik.containo.us
+  version: v1alpha1
+  names:
+    kind: Middleware
+    plural: middlewares
+    singular: middleware
+  scope: Namespaced

docs/content/routing/providers/crd_tls_option.yml

@@ -0,0 +1,13 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: tlsoptions.traefik.containo.us
+
+spec:
+  group: traefik.containo.us
+  version: v1alpha1
+  names:
+    kind: TLSOption
+    plural: tlsoptions
+    singular: tlsoption
+  scope: Namespaced

docs/content/routing/providers/crd_traefikservice.yml

@@ -0,0 +1,13 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: traefikservices.traefik.containo.us
+
+spec:
+  group: traefik.containo.us
+  version: v1alpha1
+  names:
+    kind: TraefikService
+    plural: traefikservices
+    singular: traefikservice
+  scope: Namespaced

docs/content/routing/providers/docker.md

@@ -34,12 +34,12 @@ Attach labels to your containers and let Traefik do the rest!
       my-container:
         # ...
         labels:
-          - traefik.http.routers.my-container.rule=Host(`example.com`)
+          - traefik.http.routers.my-container.rule=Host(`mydomain.com`)
     ```
 
 ??? example "Specify a Custom Port for the Container"
 
-    Forward requests for `http://example.com` to `http://<private IP of container>:12345`:
+    Forward requests for `http://mydomain.com` to `http://<private IP of container>:12345`:
 
     ```yaml
     version: "3"
@@ -47,7 +47,7 @@ Attach labels to your containers and let Traefik do the rest!
       my-container:
         # ...
         labels:
-          - traefik.http.routers.my-container.rule=Host(`example.com`)
+          - traefik.http.routers.my-container.rule=Host(`mydomain.com`)
           # Tell Traefik to use the port 12345 to connect to `my-container`
           - traefik.http.services.my-service.loadbalancer.server.port=12345
     ```
@@ -94,7 +94,7 @@ Attach labels to your containers and let Traefik do the rest!
       my-container:
         deploy:
           labels:
-            - traefik.http.routers.my-container.rule=Host(`example.com`)
+            - traefik.http.routers.my-container.rule=Host(`mydomain.com`)
             - traefik.http.services.my-container-service.loadbalancer.server.port=8080
     ```
 
@@ -127,7 +127,7 @@ and the router automatically gets a rule defined by `defaultRule` (if no rule fo
 
     ```yaml
     labels:
-      - "traefik.http.routers.myproxy.rule=Host(`example.net`)"
+      - "traefik.http.routers.myproxy.rule=Host(`foo.com`)"
       # service myservice gets automatically assigned to router myproxy
       - "traefik.http.services.myservice.loadbalancer.server.port=80"
     ```
@@ -140,7 +140,7 @@ and the router automatically gets a rule defined by `defaultRule` (if no rule fo
     labels:
       # no service specified or defined and yet one gets automatically created
       # and assigned to router myproxy.
-      - "traefik.http.routers.myproxy.rule=Host(`example.net`)"
+      - "traefik.http.routers.myproxy.rule=Host(`foo.com`)"
     ```
 
 ### Routers
@@ -148,7 +148,7 @@ and the router automatically gets a rule defined by `defaultRule` (if no rule fo
 To update the configuration of the Router automatically attached to the container,
 add labels starting with `traefik.http.routers.<name-of-your-choice>.` and followed by the option you want to change.
 
-For example, to change the rule, you could add the label ```traefik.http.routers.my-container.rule=Host(`example.com`)```.
+For example, to change the rule, you could add the label ```traefik.http.routers.my-container.rule=Host(`mydomain.com`)```.
 
 !!! warning "The character `@` is not authorized in the router name `<router_name>`."
 
@@ -157,7 +157,7 @@ For example, to change the rule, you could add the label ```traefik.http.routers
     See [rule](../routers/index.md#rule) for more information.
 
     ```yaml
-    - "traefik.http.routers.myrouter.rule=Host(`example.com`)"
+    - "traefik.http.routers.myrouter.rule=Host(`mydomain.com`)"
     ```
 
 ??? info "`traefik.http.routers.<router_name>.entrypoints`"
@@ -205,7 +205,7 @@ For example, to change the rule, you could add the label ```traefik.http.routers
     See [domains](../routers/index.md#domains) for more information.
 
     ```yaml
-    - "traefik.http.routers.myrouter.tls.domains[0].main=example.org"
+    - "traefik.http.routers.myrouter.tls.domains[0].main=foobar.com"
     ```
 
 ??? info "`traefik.http.routers.<router_name>.tls.domains[n].sans`"
@@ -213,7 +213,7 @@ For example, to change the rule, you could add the label ```traefik.http.routers
     See [domains](../routers/index.md#domains) for more information.
 
     ```yaml
-    - "traefik.http.routers.myrouter.tls.domains[0].sans=test.example.org,dev.example.org"
+    - "traefik.http.routers.myrouter.tls.domains[0].sans=test.foobar.com,dev.foobar.com"
     ```
 
 ??? info "`traefik.http.routers.<router_name>.tls.options`"
@@ -283,7 +283,7 @@ you'd add the label `traefik.http.services.<name-of-your-choice>.loadbalancer.pa
     See [health check](../services/index.md#health-check) for more information.
 
     ```yaml
-    - "traefik.http.services.myservice.loadbalancer.healthcheck.hostname=example.org"
+    - "traefik.http.services.myservice.loadbalancer.healthcheck.hostname=foobar.com"
     ```
 
 ??? info "`traefik.http.services.<service_name>.loadbalancer.healthcheck.interval`"
@@ -291,7 +291,7 @@ you'd add the label `traefik.http.services.<name-of-your-choice>.loadbalancer.pa
     See [health check](../services/index.md#health-check) for more information.
 
     ```yaml
-    - "traefik.http.services.myservice.loadbalancer.healthcheck.interval=10s"
+    - "traefik.http.services.myservice.loadbalancer.healthcheck.interval=10"
     ```
 
 ??? info "`traefik.http.services.<service_name>.loadbalancer.healthcheck.path`"
@@ -326,20 +326,12 @@ you'd add the label `traefik.http.services.<name-of-your-choice>.loadbalancer.pa
     - "traefik.http.services.myservice.loadbalancer.healthcheck.timeout=10"
     ```
 
-??? info "`traefik.http.services.<service_name>.loadbalancer.healthcheck.followredirects`"
-
-    See [health check](../services/index.md#health-check) for more information.
-
-    ```yaml
-    - "traefik.http.services.myservice.loadbalancer.healthcheck.followredirects=true"
-    ```
-
-??? info "`traefik.http.services.<service_name>.loadbalancer.sticky.cookie`"
+??? info "`traefik.http.services.<service_name>.loadbalancer.sticky`"
 
     See [sticky sessions](../services/index.md#sticky-sessions) for more information.
 
     ```yaml
-    - "traefik.http.services.myservice.loadbalancer.sticky.cookie=true"
+    - "traefik.http.services.myservice.loadbalancer.sticky=true"
     ```
 
 ??? info "`traefik.http.services.<service_name>.loadbalancer.sticky.cookie.httponly`"
@@ -422,7 +414,7 @@ You can declare TCP Routers and/or Services using labels.
          my-container:
            # ...
            labels:
-             - "traefik.tcp.routers.my-router.rule=HostSNI(`example.com`)"
+             - "traefik.tcp.routers.my-router.rule=HostSNI(`my-host.com`)"
              - "traefik.tcp.routers.my-router.tls=true"
              - "traefik.tcp.services.my-service.loadbalancer.server.port=4123"
     ```
@@ -447,7 +439,7 @@ You can declare TCP Routers and/or Services using labels.
     See [rule](../routers/index.md#rule_1) for more information.
 
     ```yaml
-    - "traefik.tcp.routers.mytcprouter.rule=HostSNI(`example.com`)"
+    - "traefik.tcp.routers.mytcprouter.rule=HostSNI(`myhost.com`)"
     ```
 
 ??? info "`traefik.tcp.routers.<router_name>.service`"
@@ -479,7 +471,7 @@ You can declare TCP Routers and/or Services using labels.
     See [domains](../routers/index.md#domains_1) for more information.
 
     ```yaml
-    - "traefik.tcp.routers.mytcprouter.tls.domains[0].main=example.org"
+    - "traefik.tcp.routers.mytcprouter.tls.domains[0].main=foobar.com"
     ```
 
 ??? info "`traefik.tcp.routers.<router_name>.tls.domains[n].sans`"
@@ -487,7 +479,7 @@ You can declare TCP Routers and/or Services using labels.
     See [domains](../routers/index.md#domains_1) for more information.
 
     ```yaml
-    - "traefik.tcp.routers.mytcprouter.tls.domains[0].sans=test.example.org,dev.example.org"
+    - "traefik.tcp.routers.mytcprouter.tls.domains[0].sans=test.foobar.com,dev.foobar.com"
     ```
 
 ??? info "`traefik.tcp.routers.<router_name>.tls.options`"
@@ -524,54 +516,6 @@ You can declare TCP Routers and/or Services using labels.
     - "traefik.tcp.services.mytcpservice.loadbalancer.terminationdelay=100"
     ```
 
-### UDP
-
-You can declare UDP Routers and/or Services using labels.
-
-??? example "Declaring UDP Routers and Services"
-
-    ```yaml
-       services:
-         my-container:
-           # ...
-           labels:
-             - "traefik.udp.routers.my-router.entrypoint=udp"
-             - "traefik.udp.services.my-service.loadbalancer.server.port=4123"
-    ```
-
-!!! warning "UDP and HTTP"
-
-    If you declare a UDP Router/Service, it will prevent Traefik from automatically creating an HTTP Router/Service (like it does by default if no UDP Router/Service is defined).
-    You can declare both a UDP Router/Service and an HTTP Router/Service for the same container (but you have to do so manually).
-
-#### UDP Routers
-
-??? info "`traefik.udp.routers.<router_name>.entrypoints`"
-
-    See [entry points](../routers/index.md#entrypoints_2) for more information.
-
-    ```yaml
-    - "traefik.udp.routers.myudprouter.entrypoints=ep1,ep2"
-    ```
-
-??? info "`traefik.udp.routers.<router_name>.service`"
-
-    See [service](../routers/index.md#services_1) for more information.
-
-    ```yaml
-    - "traefik.udp.routers.myudprouter.service=myservice"
-    ```
-
-#### UDP Services
-
-??? info "`traefik.udp.services.<service_name>.loadbalancer.server.port`"
-
-    Registers a port of the application.
-
-    ```yaml
-    - "traefik.udp.services.myudpservice.loadbalancer.server.port=423"
-    ```
-
 ### Specific Provider Options
 
 #### `traefik.enable`

docs/content/routing/providers/kubernetes-crd.md

@@ -24,7 +24,7 @@ The Kubernetes Ingress Controller, The Custom Resource Way.
     
     ---
     kind: Deployment
-    apiVersion: apps/v1
+    apiVersion: extensions/v1beta1
     metadata:
       name: traefik
       labels:
@@ -43,24 +43,18 @@ The Kubernetes Ingress Controller, The Custom Resource Way.
           serviceAccountName: traefik-ingress-controller
           containers:
             - name: traefik
-              image: traefik:v2.2
+              image: traefik:v2.1
               args:
                 - --log.level=DEBUG
                 - --api
                 - --api.insecure
                 - --entrypoints.web.address=:80
-                - --entrypoints.tcpep.address=:8000
-                - --entrypoints.udpep.address=:9000/udp
                 - --providers.kubernetescrd
               ports:
                 - name: web
                   containerPort: 80
                 - name: admin
                   containerPort: 8080
-                - name: tcpep
-                  containerPort: 8000
-                - name: udpep
-                  containerPort: 9000
     
     ---
     apiVersion: v1
@@ -80,25 +74,6 @@ The Kubernetes Ingress Controller, The Custom Resource Way.
           port: 8080
           name: admin
           targetPort: 8080
-        - protocol: TCP
-          port: 8000
-          name: tcpep
-          targetPort: 8000
-     
-    ---
-    apiVersion: v1
-    kind: Service
-    metadata:
-      name: traefikudp
-    spec:
-      type: LoadBalancer
-      selector:
-        app: traefik
-      ports:
-        - protocol: UDP
-          port: 9000
-          name: udpep
-          targetPort: 9000
     ```
     
     ```yaml tab="IngressRoute"
@@ -108,54 +83,21 @@ The Kubernetes Ingress Controller, The Custom Resource Way.
       name: myingressroute
       namespace: default
     
-      spec:
-        entryPoints:
-          - web
+    spec:
+      entryPoints:
+        - web
     
-        routes:
-          - match: Host(`foo`) && PathPrefix(`/bar`)
-            kind: Rule
-            services:
-            - name: whoami
-              port: 80
-    
-    ---
-    apiVersion: traefik.containo.us/v1alpha1
-    kind: IngressRouteTCP
-    metadata:
-      name: ingressroute.tcp
-      namespace: default
-    
-      spec:
-        entryPoints:
-          - tcpep
-        routes:
-          - match: HostSNI(`bar`)
-            kind: Rule
-            services:
-              - name: whoamitcp
-                port: 8080
-    
-    ---
-    apiVersion: traefik.containo.us/v1alpha1
-    kind: IngressRouteUDP
-    metadata:
-      name: ingressroute.udp
-      namespace: default
-    
-      spec:
-        entryPoints:
-          - fooudp
-        routes:
-          - kind: Rule
-            services:
-              - name: whoamiudp
-                port: 8080
+      routes:
+      - match: Host(`foo`) && PathPrefix(`/bar`)
+        kind: Rule
+        services:
+        - name: whoami
+          port: 80
     ```
-    
+
     ```yaml tab="Whoami"
     kind: Deployment
-    apiVersion: apps/v1
+    apiVersion: extensions/v1beta1
     metadata:
       name: whoami
       namespace: default
@@ -195,91 +137,6 @@ The Kubernetes Ingress Controller, The Custom Resource Way.
       selector:
         app: containous
         task: whoami
-    
-    ---
-    kind: Deployment
-    apiVersion: apps/v1
-    metadata:
-      name: whoamitcp
-      namespace: default
-      labels:
-        app: containous
-        name: whoamitcp
-    
-    spec:
-      replicas: 2
-      selector:
-        matchLabels:
-          app: containous
-          task: whoamitcp
-      template:
-        metadata:
-          labels:
-            app: containous
-            task: whoamitcp
-        spec:
-          containers:
-            - name: containouswhoamitcp
-              image: containous/whoamitcp
-              ports:
-                - containerPort: 8080
-    
-    ---
-    apiVersion: v1
-    kind: Service
-    metadata:
-      name: whoamitcp
-      namespace: default
-    
-    spec:
-      ports:
-        - protocol: TCP
-          port: 8080
-      selector:
-        app: containous
-        task: whoamitcp
-    
-    ---
-    kind: Deployment
-    apiVersion: apps/v1
-    metadata:
-      name: whoamiudp
-      namespace: default
-      labels:
-        app: containous
-        name: whoamiudp
-    
-    spec:
-      replicas: 2
-      selector:
-        matchLabels:
-          app: containous
-          task: whoamiudp
-      template:
-        metadata:
-          labels:
-            app: containous
-            task: whoamiudp
-        spec:
-          containers:
-            - name: containouswhoamiudp
-              image: containous/whoamiudp:dev
-              ports:
-                - containerPort: 8080
-    
-    ---
-    apiVersion: v1
-    kind: Service
-    metadata:
-      name: whoamiudp
-      namespace: default
-    
-    spec:
-      ports:
-        - port: 8080
-      selector:
-        app: containous
-        task: whoamiudp
     ```
 
 ## Routing Configuration
@@ -298,15 +155,13 @@ You can find an excerpt of the available custom resources in the table below:
 | [Middleware](#kind-middleware)           | Tweaks the HTTP requests before they are sent to your service | [HTTP Middlewares](../../middlewares/overview.md)              |
 | [TraefikService](#kind-traefikservice)   | Abstraction for HTTP loadbalancing/mirroring                  | [HTTP service](../services/index.md#configuring-http-services) |
 | [IngressRouteTCP](#kind-ingressroutetcp) | TCP Routing                                                   | [TCP router](../routers/index.md#configuring-tcp-routers)      |
-| [IngressRouteUDP](#kind-ingressrouteudp) | UDP Routing                                                   | [UDP router](../routers/index.md#configuring-udp-routers)      |
 | [TLSOptions](#kind-tlsoption)            | Allows to configure some parameters of the TLS connection     | [TLSOptions](../../https/tls.md#tls-options)                   |
-| [TLSStores](#kind-tlsstore)              | Allows to configure the default TLS store                     | [TLSStores](../../https/tls.md#certificates-stores)            |
 
 ### Kind: `IngressRoute`
 
 `IngressRoute` is the CRD implementation of a [Traefik HTTP router](../routers/index.md#configuring-http-routers).
 
-Register the `IngressRoute` [kind](../../reference/dynamic-configuration/kubernetes-crd.md#definitions) in the Kubernetes cluster before creating `IngressRoute` objects.
+Register the `IngressRoute` kind in the Kubernetes cluster before creating `IngressRoute` objects.
 
 !!! info "IngressRoute Attributes"
 
@@ -321,7 +176,7 @@ Register the `IngressRoute` [kind](../../reference/dynamic-configuration/kuberne
         - foo
       routes:                           # [2]
       - kind: Rule
-        match: Host(`test.example.com`) # [3]
+        match: Host(`test.domain.com`)  # [3]
         priority: 10                    # [4]
         middlewares:                    # [5]
         - name: middleware1             # [6]
@@ -350,31 +205,31 @@ Register the `IngressRoute` [kind](../../reference/dynamic-configuration/kuberne
           namespace: default            # [13]
         certResolver: foo               # [14]
         domains:                        # [15]
-        - main: example.net             # [16]
+        - main: foo.com                 # [16]
           sans:                         # [17]
-          - a.example.net
-          - b.example.net
+          - a.foo.com
+          - b.foo.com
     ```
 
-| Ref  | Attribute                  | Purpose                                                                                                                                                                                                                  |
-|------|----------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| [1]  | `entryPoints`              | List of [entry points](../routers/index.md#entrypoints) names                                                                                                                                                            |
-| [2]  | `routes`                   | List of routes                                                                                                                                                                                                           |
-| [3]  | `routes[n].match`          | Defines the [rule](../routers/index.md#rule) corresponding to an underlying router.                                                                                                                                      |
-| [4]  | `routes[n].priority`       | [Disambiguate](../routers/index.md#priority) rules of the same length, for route matching                                                                                                                                |
-| [5]  | `routes[n].middlewares`    | List of reference to [Middleware](#kind-middleware)                                                                                                                                                                      |
-| [6]  | `middlewares[n].name`      | Defines the [Middleware](#kind-middleware) name                                                                                                                                                                          |
-| [7]  | `middlewares[n].namespace` | Defines the [Middleware](#kind-middleware) namespace                                                                                                                                                                     |
-| [8]  | `routes[n].services`       | List of any combination of [TraefikService](#kind-traefikservice) and reference to a [Kubernetes service](https://kubernetes.io/docs/concepts/services-networking/service/) (See below for `ExternalName Service` setup) |
-| [9]  | `tls`                      | Defines [TLS](../routers/index.md#tls) certificate configuration                                                                                                                                                         |
-| [10] | `tls.secretName`           | Defines the [secret](https://kubernetes.io/docs/concepts/configuration/secret/) name used to store the certificate (in the `IngressRoute` namespace)                                                                     |
-| [11] | `tls.options`              | Defines the reference to a [TLSOption](#kind-tlsoption)                                                                                                                                                                  |
-| [12] | `options.name`             | Defines the [TLSOption](#kind-tlsoption) name                                                                                                                                                                            |
-| [13] | `options.namespace`        | Defines the [TLSOption](#kind-tlsoption) namespace                                                                                                                                                                       |
-| [14] | `tls.certResolver`         | Defines the reference to a [CertResolver](../routers/index.md#certresolver)                                                                                                                                              |
-| [15] | `tls.domains`              | List of [domains](../routers/index.md#domains)                                                                                                                                                                           |
-| [16] | `domains[n].main`          | Defines the main domain name                                                                                                                                                                                             |
-| [17] | `domains[n].sans`          | List of SANs (alternative domains)                                                                                                                                                                                       |
+| Ref  | Attribute                  | Purpose                                                                                                                                                                     |
+|------|----------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| [1]  | `entryPoints`              | List of [entry points](../routers/index.md#entrypoints) name                                                                                                                |
+| [2]  | `routes`                   | List of route                                                                                                                                                               |
+| [3]  | `routes[n].match`          | Defines the [rule](../routers/index.md#rule) corresponding to an underlying router.                                                                                         |
+| [4]  | `routes[n].priority`       | [Disambiguate](../routers/index.md#priority) rules of the same length, for route matching                                                                                   |
+| [5]  | `routes[n].middlewares`    | List of reference to [Middleware](#kind-middleware)                                                                                                                         |
+| [6]  | `middlewares[n].name`      | Defines the [Middleware](#kind-middleware) name                                                                                                                             |
+| [7]  | `middlewares[n].namespace` | Defines the [Middleware](#kind-middleware) namespace                                                                                                                        |
+| [8]  | `routes[n].services`       | List of any combination of [TraefikService](#kind-traefikservice) and reference to a [Kubernetes service](https://kubernetes.io/docs/concepts/services-networking/service/) |
+| [9]  | `tls`                      | Defines [TLS](../routers/index.md#tls) certificate configuration                                                                                                            |
+| [10] | `tls.secretName`           | Defines the [secret](https://kubernetes.io/docs/concepts/configuration/secret/) name used to store the certificate (in the `IngressRoute` namespace)                        |
+| [11] | `tls.options`              | Defines the reference to a [TLSOption](#kind-tlsoption)                                                                                                                     |
+| [12] | `options.name`             | Defines the [TLSOption](#kind-tlsoption) name                                                                                                                               |
+| [13] | `options.namespace`        | Defines the [TLSOption](#kind-tlsoption) namespace                                                                                                                          |
+| [14] | `tls.certResolver`          | Defines the reference to a [CertResolver](../routers/index.md#certresolver)                                                                                                 |
+| [15] | `tls.domains`              | List of [domains](../routers/index.md#domains)                                                                                                                              |
+| [16] | `domains[n].main`          | Defines the main domain name                                                                                                                                                |
+| [17] | `domains[n].sans`          | List of SANs (alternative domains)                                                                                                                                          |
 
 ??? example "Declaring an IngressRoute"
 
@@ -390,7 +245,7 @@ Register the `IngressRoute` [kind](../../reference/dynamic-configuration/kuberne
         - web
       routes:
       - kind: Rule
-        match: Host(`test.example.com`)
+        match: Host(`test.domain.com`)
         middlewares:
         - name: middleware1
           namespace: default
@@ -414,10 +269,10 @@ Register the `IngressRoute` [kind](../../reference/dynamic-configuration/kuberne
       tls:
         certResolver: foo
         domains:
-        - main: example.net
+        - main: foo.com
           sans:
-          - a.example.net
-          - b.example.net
+          - a.foo.com
+          - b.foo.com
         options:
           name: opt
           namespace: default
@@ -468,118 +323,12 @@ Register the `IngressRoute` [kind](../../reference/dynamic-configuration/kuberne
     - Setting the kubernetes service port to use port 443 (https)
 
     If you do not configure the above, Traefik will assume an http connection.
-    
-
-!!! important "Using Kubernetes ExternalName Service"
-
-    Traefik backends creation needs a port to be set, however Kubernetes [ExternalName Service](https://kubernetes.io/fr/docs/concepts/services-networking/service/#externalname) could be defined without any port.
-    Accordingly, Traefik supports defining a port in two ways:
-    
-    - only on `IngressRoute` service
-    - on both sides, you'll be warned if the ports don't match, and the `IngressRoute` service port is used
-    
-    Thus, in case of two sides port definition, Traefik expects a match between ports.
-    
-    ??? example "Examples"
-        
-        ```yaml tab="IngressRoute"
-        ---
-        apiVersion: traefik.containo.us/v1alpha1
-        kind: IngressRoute
-        metadata:
-          name: test.route
-          namespace: default
-        
-        spec:
-          entryPoints:
-            - foo
-        
-          routes:
-          - match: Host(`example.net`)
-            kind: Rule
-            services:
-            - name: external-svc
-              port: 80
-        
-        ---
-        apiVersion: v1
-        kind: Service
-        metadata:
-          name: external-svc
-          namespace: default
-        spec:
-          externalName: external.domain
-          type: ExternalName
-        ```
-        
-        ```yaml tab="ExternalName Service"
-        ---
-        apiVersion: traefik.containo.us/v1alpha1
-        kind: IngressRoute
-        metadata:
-          name: test.route
-          namespace: default
-        
-        spec:
-          entryPoints:
-            - foo
-        
-          routes:
-          - match: Host(`example.net`)
-            kind: Rule
-            services:
-            - name: external-svc
-        
-        ---
-        apiVersion: v1
-        kind: Service
-        metadata:
-          name: external-svc
-          namespace: default
-        spec:
-          externalName: external.domain
-          type: ExternalName
-          ports:
-            - port: 80
-        ```
-        
-        ```yaml tab="Both sides"
-        ---
-        apiVersion: traefik.containo.us/v1alpha1
-        kind: IngressRoute
-        metadata:
-          name: test.route
-          namespace: default
-        
-        spec:
-          entryPoints:
-            - foo
-        
-          routes:
-          - match: Host(`example.net`)
-            kind: Rule
-            services:
-            - name: external-svc
-              port: 80
-        
-        ---
-        apiVersion: v1
-        kind: Service
-        metadata:
-          name: external-svc
-          namespace: default
-        spec:
-          externalName: external.domain
-          type: ExternalName
-          ports:
-            - port: 80
-        ```
 
 ### Kind: `Middleware`
 
 `Middleware` is the CRD implementation of a [Traefik middleware](../../middlewares/overview.md).
 
-Register the `Middleware` [kind](../../reference/dynamic-configuration/kubernetes-crd.md#definitions) in the Kubernetes cluster before creating `Middleware` objects or referencing middlewares in the [`IngressRoute`](#kind-ingressroute) objects.
+Register the `Middleware` kind in the Kubernetes cluster before creating `Middleware` objects or referencing middlewares in the [`IngressRoute`](#kind-ingressroute) objects.
 
 ??? "Declaring and Referencing a Middleware"
     
@@ -606,7 +355,7 @@ Register the `Middleware` [kind](../../reference/dynamic-configuration/kubernete
       entryPoints:
         - web
       routes:
-      - match: Host(`example.com`) && PathPrefix(`/stripit`)
+      - match: Host(`bar.com`) && PathPrefix(`/stripit`)
         kind: Rule
         services:
         - name: whoami
@@ -618,12 +367,10 @@ Register the `Middleware` [kind](../../reference/dynamic-configuration/kubernete
 
 !!! important "Cross-provider namespace"
 
-    As Kubernetes also has its own notion of namespace, one should not confuse the kubernetes namespace of a resource
-    (in the reference to the middleware) with the [provider namespace](../../middlewares/overview.md#provider-namespace),
-    when the definition of the middleware comes from another provider.
-    In this context, specifying a namespace when referring to the resource does not make any sense, and will be ignored.
-    Additionally, when you want to reference a Middleware from the CRD Provider,
-    you have to append the namespace of the resource in the resource-name as Traefik appends the namespace internally automatically.
+	As Kubernetes also has its own notion of namespace, one should not confuse the kubernetes namespace of a resource
+	(in the reference to the middleware) with the [provider namespace](../../middlewares/overview.md#provider-namespace),
+	when the definition of the middleware comes from another provider.
+	In this context, specifying a namespace when referring to the resource does not make any sense, and will be ignored.
 
 More information about available middlewares in the dedicated [middlewares section](../../middlewares/overview.md).
 
@@ -631,8 +378,8 @@ More information about available middlewares in the dedicated [middlewares secti
 
 `TraefikService` is the CRD implementation of a ["Traefik Service"](../services/index.md).
 
-Register the `TraefikService` [kind](../../reference/dynamic-configuration/kubernetes-crd.md#definitions) in the Kubernetes cluster before creating `TraefikService` objects,
-referencing services in the [`IngressRoute`](#kind-ingressroute) objects, or recursively in others `TraefikService` objects.
+Register the `TraefikService` kind in the Kubernetes cluster before creating `TraefikService` objects,
+referencing services in the [`IngressRoute`](#kind-ingressroute)/[`IngressRouteTCP`](#kind-ingressroutetcp) objects or recursively in others `TraefikService` objects.
 
 !!! info "Disambiguate Traefik and Kubernetes Services "
 
@@ -649,6 +396,7 @@ referencing services in the [`IngressRoute`](#kind-ingressroute) objects, or rec
 * services [Weighted Round Robin](#weighted-round-robin) load balancing.
 * services [mirroring](#mirroring).
 
+
 #### Server Load Balancing
 
 More information in the dedicated server [load balancing](../services/index.md#load-balancing) section.
@@ -666,7 +414,7 @@ More information in the dedicated server [load balancing](../services/index.md#l
       entryPoints:
         - web
       routes:
-      - match: Host(`example.com`) && PathPrefix(`/foo`)
+      - match: Host(`bar.com`) && PathPrefix(`/foo`)
         kind: Rule
         services:
         - name: svc1
@@ -722,7 +470,7 @@ More information in the dedicated [Weighted Round Robin](../services/index.md#we
       entryPoints:
         - web
       routes:
-      - match: Host(`example.com`) && PathPrefix(`/foo`)
+      - match: Host(`bar.com`) && PathPrefix(`/foo`)
         kind: Rule
         services:
         - name: wrr1
@@ -829,7 +577,7 @@ More information in the dedicated [mirroring](../services/index.md#mirroring-ser
       entryPoints:
         - web
       routes:
-      - match: Host(`example.com`) && PathPrefix(`/foo`)
+      - match: Host(`bar.com`) && PathPrefix(`/foo`)
         kind: Rule
         services:
         - name: mirror1
@@ -918,159 +666,11 @@ More information in the dedicated [mirroring](../services/index.md#mirroring-ser
     
     Specifying a namespace attribute in this case would not make any sense, and will be ignored (except if the provider is `kubernetescrd`).
 
-#### Stickiness and load-balancing
-
-As explained in the section about [Sticky sessions](../../services/#sticky-sessions), for stickiness to work all the way,
-it must be specified at each load-balancing level.
-
-For instance, in the example below, there is a first level of load-balancing because there is a (Weighted Round Robin) load-balancing of the two `whoami` services,
-and there is a second level because each whoami service is a `replicaset` and is thus handled as a load-balancer of servers.
-
-??? "Stickiness on two load-balancing levels"
-
-    ```yaml tab="IngressRoute"
-    apiVersion: traefik.containo.us/v1alpha1
-    kind: IngressRoute
-    metadata:
-      name: ingressroutebar
-      namespace: default
-
-    spec:
-      entryPoints:
-        - web
-      routes:
-      - match: Host(`example.com`) && PathPrefix(`/foo`)
-        kind: Rule
-        services:
-        - name: wrr1
-          namespace: default
-          kind: TraefikService
-    ```
-
-    ```yaml tab="Weighted Round Robin"
-    apiVersion: traefik.containo.us/v1alpha1
-    kind: TraefikService
-    metadata:
-      name: wrr1
-      namespace: default
-
-    spec:
-      weighted:
-        services:
-          - name: whoami1
-            kind: Service
-            port: 80
-            weight: 1
-            sticky:
-              cookie:
-                name: lvl2
-          - name: whoami2
-            kind: Service
-            weight: 1
-            port: 80
-            sticky:
-              cookie:
-                name: lvl2
-        sticky:
-          cookie:
-            name: lvl1
-    ```
-
-    ```yaml tab="K8s Service"
-    apiVersion: v1
-    kind: Service
-    metadata:
-      name: whoami1
-
-    spec:
-      ports:
-        - protocol: TCP
-          name: web
-          port: 80
-      selector:
-        app: whoami1
-
-    ---
-    apiVersion: v1
-    kind: Service
-    metadata:
-      name: whoami2
-
-    spec:
-      ports:
-        - protocol: TCP
-          name: web
-          port: 80
-      selector:
-        app: whoami2
-    ```
-
-    ```yaml tab="Deployment (to illustrate replicas)"
-    kind: Deployment
-    apiVersion: apps/v1
-    metadata:
-      namespace: default
-      name: whoami1
-      labels:
-        app: whoami1
-
-    spec:
-      replicas: 2
-      selector:
-        matchLabels:
-          app: whoami1
-      template:
-        metadata:
-          labels:
-            app: whoami1
-        spec:
-          containers:
-            - name: whoami1
-              image: containous/whoami
-              ports:
-                - name: web
-                  containerPort: 80
-
-    ---
-    kind: Deployment
-    apiVersion: apps/v1
-    metadata:
-      namespace: default
-      name: whoami2
-      labels:
-        app: whoami2
-
-    spec:
-      replicas: 2
-      selector:
-        matchLabels:
-          app: whoami2
-      template:
-        metadata:
-          labels:
-            app: whoami2
-        spec:
-          containers:
-            - name: whoami2
-              image: containous/whoami
-              ports:
-                - name: web
-                  containerPort: 80
-    ```
-
-    To keep a session open with the same server, the client would then need to specify the two levels within the cookie for each request, e.g. with curl:
-
-    ```bash
-    curl -H Host:example.com -b "lvl1=default-whoami1-80; lvl2=http://10.42.0.6:80" http://localhost:8000/foo
-    ```
-
-    assuming `10.42.0.6` is the IP address of one of the replicas (a pod then) of the `whoami1` service.
-
 ### Kind `IngressRouteTCP`
 
 `IngressRouteTCP` is the CRD implementation of a [Traefik TCP router](../routers/index.md#configuring-tcp-routers).
 
-Register the `IngressRouteTCP` [kind](../../reference/dynamic-configuration/kubernetes-crd.md#definitions) in the Kubernetes cluster before creating `IngressRouteTCP` objects.
+Register the `IngressRouteTCP` kind in the Kubernetes cluster before creating `IngressRouteTCP` objects.
 
 !!! info "IngressRouteTCP Attributes"
 
@@ -1089,7 +689,7 @@ Register the `IngressRouteTCP` [kind](../../reference/dynamic-configuration/kube
         - name: foo                 # [5]
           port: 8080                # [6]
           weight: 10                # [7]
-          terminationDelay: 400     # [8]
+          TerminationDelay: 400     # [8]
       tls:                          # [9]
         secretName: supersecret     # [10]
         options:                    # [11]
@@ -1097,29 +697,29 @@ Register the `IngressRouteTCP` [kind](../../reference/dynamic-configuration/kube
           namespace: default        # [13]
         certResolver: foo           # [14]
         domains:                    # [15]
-        - main: example.net         # [16]
+        - main: foo.com             # [16]
           sans:                     # [17]
-          - a.example.net
-          - b.example.net
+          - a.foo.com
+          - b.foo.com
         passthrough: false          # [18]
     ```
 
 | Ref  | Attribute                      | Purpose                                                                                                                                                                                                                                                                                                                                                                                  |
 |------|--------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| [1]  | `entryPoints`                  | List of [entrypoints](../routers/index.md#entrypoints_1) names                                                                                                                                                                                                                                                                                                                           |
-| [2]  | `routes`                       | List of routes                                                                                                                                                                                                                                                                                                                                                                           |
-| [3]  | `routes[n].match`              | Defines the [rule](../routers/index.md#rule_1) corresponding to an underlying router                                                                                                                                                                                                                                                                                                     |
-| [4]  | `routes[n].services`           | List of [Kubernetes service](https://kubernetes.io/docs/concepts/services-networking/service/) definitions  (See below for `ExternalName Service` setup)                                                                                                                                                                                                                                 |
+| [1]  | `entryPoints`                  | List of [entrypoints](../routers/index.md#entrypoints_1) name                                                                                                                                                                                                                                                                                                                            |
+| [2]  | `routes`                       | List of route                                                                                                                                                                                                                                                                                                                                                                            |
+| [3]  | `routes[n].match`              | Defines the [rule](../routers/index.md#rule_1) corresponding to an underlying router.                                                                                                                                                                                                                                                                                                    |
+| [4]  | `routes[n].services`           | List of any combination of [TraefikService](#kind-traefikservice) and reference to a [Kubernetes service](https://kubernetes.io/docs/concepts/services-networking/service/)                                                                                                                                                                                                              |
 | [5]  | `services[n].name`             | Defines the name of a [Kubernetes service](https://kubernetes.io/docs/concepts/services-networking/service/)                                                                                                                                                                                                                                                                             |
 | [6]  | `services[n].port`             | Defines the port of a [Kubernetes service](https://kubernetes.io/docs/concepts/services-networking/service/)                                                                                                                                                                                                                                                                             |
 | [7]  | `services[n].weight`           | Defines the weight to apply to the server load balancing                                                                                                                                                                                                                                                                                                                                 |
-| [8]  | `services[n].terminationDelay` | corresponds to the deadline that the proxy sets, after one of its connected peers indicates it has closed the writing capability of its connection, to close the reading capability as well, hence fully terminating the connection.<br/>It is a duration in milliseconds, defaulting to 100. A negative value means an infinite deadline (i.e. the reading capability is never closed). |
+| [8]  | `services[n].TerminationDelay` | corresponds to the deadline that the proxy sets, after one of its connected peers indicates it has closed the writing capability of its connection, to close the reading capability as well, hence fully terminating the connection.<br/>It is a duration in milliseconds, defaulting to 100. A negative value means an infinite deadline (i.e. the reading capability is never closed). |
 | [9]  | `tls`                          | Defines [TLS](../routers/index.md#tls_1) certificate configuration                                                                                                                                                                                                                                                                                                                       |
 | [10] | `tls.secretName`               | Defines the [secret](https://kubernetes.io/docs/concepts/configuration/secret/) name used to store the certificate (in the `IngressRoute` namespace)                                                                                                                                                                                                                                     |
 | [11] | `tls.options`                  | Defines the reference to a [TLSOption](#kind-tlsoption)                                                                                                                                                                                                                                                                                                                                  |
 | [12] | `options.name`                 | Defines the [TLSOption](#kind-tlsoption) name                                                                                                                                                                                                                                                                                                                                            |
 | [13] | `options.namespace`            | Defines the [TLSOption](#kind-tlsoption) namespace                                                                                                                                                                                                                                                                                                                                       |
-| [14] | `tls.certResolver`             | Defines the reference to a [CertResolver](../routers/index.md#certresolver_1)                                                                                                                                                                                                                                                                                                            |
+| [14] | `tls.certResolver`              | Defines the reference to a [CertResolver](../routers/index.md#certresolver_1)                                                                                                                                                                                                                                                                                                            |
 | [15] | `tls.domains`                  | List of [domains](../routers/index.md#domains_1)                                                                                                                                                                                                                                                                                                                                         |
 | [16] | `domains[n].main`              | Defines the main domain name                                                                                                                                                                                                                                                                                                                                                             |
 | [17] | `domains[n].sans`              | List of SANs (alternative domains)                                                                                                                                                                                                                                                                                                                                                       |
@@ -1142,19 +742,19 @@ Register the `IngressRouteTCP` [kind](../../reference/dynamic-configuration/kube
         services:
         - name: foo
           port: 8080
-          terminationDelay: 400
+          TerminationDelay: 400
           weight: 10
         - name: bar
           port: 8081
-          terminationDelay: 500
+          TerminationDelay: 500
           weight: 10
       tls:
         certResolver: foo
         domains:
-        - main: example.net
+        - main: foo.com
           sans:
-          - a.example.net
-          - b.example.net
+          - a.foo.com
+          - b.foo.com
         options:
           name: opt
           namespace: default
@@ -1184,170 +784,11 @@ Register the `IngressRouteTCP` [kind](../../reference/dynamic-configuration/kube
       tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCi0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0=
     ```
 
-!!! important "Using Kubernetes ExternalName Service"
-
-    Traefik backends creation needs a port to be set, however Kubernetes [ExternalName Service](https://kubernetes.io/fr/docs/concepts/services-networking/service/#externalname) could be defined without any port.
-    Accordingly, Traefik supports defining a port in two ways:
-    
-    - only on `IngressRouteTCP` service
-    - on both sides, you'll be warned if the ports don't match, and the `IngressRouteTCP` service port is used
-    
-    Thus, in case of two sides port definition, Traefik expects a match between ports.
-    
-    ??? example "Examples"
-        
-        ```yaml tab="IngressRouteTCP"
-        ---
-        apiVersion: traefik.containo.us/v1alpha1
-        kind: IngressRouteTCP
-        metadata:
-          name: test.route
-          namespace: default
-        
-        spec:
-          entryPoints:
-            - foo
-        
-          routes:
-          - match: HostSNI(`*`)
-            kind: Rule
-            services:
-            - name: external-svc
-              port: 80
-        
-        ---
-        apiVersion: v1
-        kind: Service
-        metadata:
-          name: external-svc
-          namespace: default
-        spec:
-          externalName: external.domain
-          type: ExternalName
-        ```
-        
-        ```yaml tab="ExternalName Service"
-        ---
-        apiVersion: traefik.containo.us/v1alpha1
-        kind: IngressRouteTCP
-        metadata:
-          name: test.route
-          namespace: default
-        
-        spec:
-          entryPoints:
-            - foo
-        
-          routes:
-          - match: HostSNI(`*`)
-            kind: Rule
-            services:
-            - name: external-svc
-        
-        ---
-        apiVersion: v1
-        kind: Service
-        metadata:
-          name: external-svc
-          namespace: default
-        spec:
-          externalName: external.domain
-          type: ExternalName
-          ports:
-            - port: 80
-        ```
-        
-        ```yaml tab="Both sides"
-        ---
-        apiVersion: traefik.containo.us/v1alpha1
-        kind: IngressRouteTCP
-        metadata:
-          name: test.route
-          namespace: default
-        
-        spec:
-          entryPoints:
-            - foo
-        
-          routes:
-          - match: HostSNI(`*`)
-            kind: Rule
-            services:
-            - name: external-svc
-              port: 80
-        
-        ---
-        apiVersion: v1
-        kind: Service
-        metadata:
-          name: external-svc
-          namespace: default
-        spec:
-          externalName: external.domain
-          type: ExternalName
-          ports:
-            - port: 80
-        ```
-
-### Kind `IngressRouteUDP`
-
-`IngressRouteUDP` is the CRD implementation of a [Traefik UDP router](../routers/index.md#configuring-udp-routers).
-
-Register the `IngressRouteUDP` [kind](../../reference/dynamic-configuration/kubernetes-crd.md#definitions) in the Kubernetes cluster before creating `IngressRouteUDP` objects.
-
-!!! info "IngressRouteUDP Attributes"
-
-    ```yaml
-    apiVersion: traefik.containo.us/v1alpha1
-    kind: IngressRouteUDP
-    metadata:
-      name: ingressrouteudpfoo
-    
-    spec:
-      entryPoints:                  # [1]
-        - fooudp
-      routes:                       # [2]
-      - services:                   # [3]
-        - name: foo                 # [4]
-          port: 8080                # [5]
-          weight: 10                # [6]
-    ```
-
-| Ref  | Attribute                      | Purpose                                                                                                                                                                                                                                                                                                                                                                                  |
-|------|--------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| [1]  | `entryPoints`                  | List of [entrypoints](../routers/index.md#entrypoints_1) names                                                                                                                                                                                                                                                                                                                           |
-| [2]  | `routes`                       | List of routes                                                                                                                                                                                                                                                                                                                                                                           |
-| [3]  | `routes[n].services`           | List of [Kubernetes service](https://kubernetes.io/docs/concepts/services-networking/service/) definitions                                                                                                                                                                                                                                                                               |
-| [4]  | `services[n].name`             | Defines the name of a [Kubernetes service](https://kubernetes.io/docs/concepts/services-networking/service/)                                                                                                                                                                                                                                                                             |
-| [6]  | `services[n].port`             | Defines the port of a [Kubernetes service](https://kubernetes.io/docs/concepts/services-networking/service/)                                                                                                                                                                                                                                                                             |
-| [7]  | `services[n].weight`           | Defines the weight to apply to the server load balancing                                                                                                                                                                                                                                                                                                                                 |
-
-??? example "Declaring an IngressRouteUDP"
-
-    ```yaml
-    apiVersion: traefik.containo.us/v1alpha1
-    kind: IngressRouteUDP
-    metadata:
-      name: ingressrouteudpfoo
-    
-    spec:
-      entryPoints:
-        - fooudp
-      routes:
-      - services:
-        - name: foo
-          port: 8080
-          weight: 10
-        - name: bar
-          port: 8081
-          weight: 10
-    ```
-
 ### Kind: `TLSOption`
 
 `TLSOption` is the CRD implementation of a [Traefik "TLS Option"](../../https/tls.md#tls-options).
 
-Register the `TLSOption` [kind](../../reference/dynamic-configuration/kubernetes-crd.md#definitions) in the Kubernetes cluster before creating `TLSOption` objects
+Register the `TLSOption` kind in the Kubernetes cluster before creating `TLSOption` objects
 or referencing TLS options in the [`IngressRoute`](#kind-ingressroute) / [`IngressRouteTCP`](#kind-ingressroutetcp) objects.
 
 !!! info "TLSOption Attributes"
@@ -1419,7 +860,7 @@ or referencing TLS options in the [`IngressRoute`](#kind-ingressroute) / [`Ingre
       entryPoints:
         - web
       routes:
-      - match: Host(`example.com`) && PathPrefix(`/stripit`)
+      - match: Host(`bar.com`) && PathPrefix(`/stripit`)
         kind: Rule
         services:
         - name: whoami
@@ -1460,83 +901,6 @@ or referencing TLS options in the [`IngressRoute`](#kind-ingressroute) / [`Ingre
 	just as in the [middleware case](../../middlewares/overview.md#provider-namespace).
 	Specifying a namespace attribute in this case would not make any sense, and will be ignored.
 
-### Kind: `TLSStore`
-
-`TLSStore` is the CRD implementation of a [Traefik "TLS Store"](../../https/tls.md#certificates-stores).
-
-Register the `TLSStore` kind in the Kubernetes cluster before creating `TLSStore` objects
-or referencing TLS stores in the [`IngressRoute`](#kind-ingressroute) / [`IngressRouteTCP`](#kind-ingressroutetcp) objects.
-
-!!! important "Default TLS Store"
-
-    Traefik currently only uses the [TLS Store named "default"](../../https/tls.md#certificates-stores).
-    This means that if you have two stores that are named default in different kubernetes namespaces,
-    they may be randomly chosen.
-    For the time being, please only configure one TLSSTore named default.
-
-!!! info "TLSStore Attributes"
-   
-    ```yaml tab="TLSStore"
-    apiVersion: traefik.containo.us/v1alpha1
-    kind: TLSStore
-    metadata:
-      name: default
-      namespace: default
-    
-    spec:
-      defaultCertificate:
-        secretName: mySecret                      # [1]
-    ```
-
-| Ref | Attribute                   | Purpose                                                                                                                                                                    |
-|-----|-----------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| [1] | `secretName`                | The name of the referenced Kubernetes [Secret](https://kubernetes.io/docs/concepts/configuration/secret/) that holds the default certificate for the store.                                                                             |
-
-??? example "Declaring and referencing a TLSStore"
-   
-    ```yaml tab="TLSStore"
-    apiVersion: traefik.containo.us/v1alpha1
-    kind: TLSStore
-    metadata:
-      name: default
-      namespace: default
-    
-    spec:
-      defaultCertificate:
-        secretName:  supersecret
-    ```
-    
-    ```yaml tab="IngressRoute"
-    apiVersion: traefik.containo.us/v1alpha1
-    kind: IngressRoute
-    metadata:
-      name: ingressroutebar
-    
-    spec:
-      entryPoints:
-        - web
-      routes:
-      - match: Host(`example.com`) && PathPrefix(`/stripit`)
-        kind: Rule
-        services:
-        - name: whoami
-          port: 80
-      tls:
-        store: 
-          name: default
-    ```
-
-    ```yaml tab="Secret"
-    apiVersion: v1
-    kind: Secret
-    metadata:
-      name: supersecret
-    
-    data:
-      tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0=
-      tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCi0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0=
-    ```
-
 ## Further
 
 Also see the [full example](../../user-guides/crd-acme/index.md) with Let's Encrypt.

docs/content/routing/providers/kubernetes-ingress.md

@@ -1,416 +0,0 @@
-# Traefik & Kubernetes
-
-The Kubernetes Ingress Controller.
-{: .subtitle }
-
-## Routing Configuration
-
-The provider then watches for incoming ingresses events, such as the example below,
-and derives the corresponding dynamic configuration from it,
-which in turn will create the resulting routers, services, handlers, etc.
-
-## Configuration Example
-
-??? example "Configuring Kubernetes Ingress Controller"
-    
-    ```yaml tab="RBAC"
-    ---
-    kind: ClusterRole
-    apiVersion: rbac.authorization.k8s.io/v1beta1
-    metadata:
-      name: traefik-ingress-controller
-    rules:
-      - apiGroups:
-          - ""
-        resources:
-          - services
-          - endpoints
-          - secrets
-        verbs:
-          - get
-          - list
-          - watch
-      - apiGroups:
-          - extensions
-        resources:
-          - ingresses
-        verbs:
-          - get
-          - list
-          - watch
-      - apiGroups:
-          - extensions
-        resources:
-          - ingresses/status
-        verbs:
-          - update
-    
-    ---
-    kind: ClusterRoleBinding
-    apiVersion: rbac.authorization.k8s.io/v1beta1
-    metadata:
-      name: traefik-ingress-controller
-    roleRef:
-      apiGroup: rbac.authorization.k8s.io
-      kind: ClusterRole
-      name: traefik-ingress-controller
-    subjects:
-      - kind: ServiceAccount
-        name: traefik-ingress-controller
-        namespace: default
-    ```
-    
-    ```yaml tab="Ingress"
-    kind: Ingress
-    apiVersion: networking.k8s.io/v1beta1
-    metadata:
-      name: myingress
-      annotations:
-        traefik.ingress.kubernetes.io/router.entrypoints: web
-    
-    spec:
-      rules:
-        - host: example.com
-          http:
-            paths:
-              - path: /bar
-                backend:
-                  serviceName: whoami
-                  servicePort: 80
-              - path: /foo
-                backend:
-                  serviceName: whoami
-                  servicePort: 80
-    ```
-    
-    ```yaml tab="Traefik"
-    apiVersion: v1
-    kind: ServiceAccount
-    metadata:
-      name: traefik-ingress-controller
-    
-    ---
-    kind: Deployment
-    apiVersion: apps/v1
-    metadata:
-      name: traefik
-      labels:
-        app: traefik
-    
-    spec:
-      replicas: 1
-      selector:
-        matchLabels:
-          app: traefik
-      template:
-        metadata:
-          labels:
-            app: traefik
-        spec:
-          serviceAccountName: traefik-ingress-controller
-          containers:
-            - name: traefik
-              image: traefik:v2.2
-              args:
-                - --log.level=DEBUG
-                - --api
-                - --api.insecure
-                - --entrypoints.web.address=:80
-                - --providers.kubernetesingress
-              ports:
-                - name: web
-                  containerPort: 80
-                - name: admin
-                  containerPort: 8080
-    
-    ---
-    apiVersion: v1
-    kind: Service
-    metadata:
-      name: traefik
-    spec:
-      type: LoadBalancer
-      selector:
-        app: traefik
-      ports:
-        - protocol: TCP
-          port: 80
-          name: web
-          targetPort: 80
-        - protocol: TCP
-          port: 8080
-          name: admin
-          targetPort: 8080
-    ```
-    
-    ```yaml tab="Whoami"
-    kind: Deployment
-    apiVersion: apps/v1
-    metadata:
-      name: whoami
-      labels:
-        app: containous
-        name: whoami
-    
-    spec:
-      replicas: 2
-      selector:
-        matchLabels:
-          app: containous
-          task: whoami
-      template:
-        metadata:
-          labels:
-            app: containous
-            task: whoami
-        spec:
-          containers:
-            - name: containouswhoami
-              image: containous/whoami
-              ports:
-                - containerPort: 80
-    
-    ---
-    apiVersion: v1
-    kind: Service
-    metadata:
-      name: whoami
-    
-    spec:
-      ports:
-        - name: http
-          port: 80
-      selector:
-        app: containous
-        task: whoami
-    ```
-
-## Annotations
-
-#### On Ingress
-
-??? info "`traefik.ingress.kubernetes.io/router.entrypoints`"
-
-    See [entry points](../routers/index.md#entrypoints) for more information.
-
-    ```yaml
-    traefik.ingress.kubernetes.io/router.entrypoints: ep1,ep2
-    ```
-
-??? info "`traefik.ingress.kubernetes.io/router.middlewares`"
-
-    See [middlewares](../routers/index.md#middlewares) and [middlewares overview](../../middlewares/overview.md) for more information.
-
-    ```yaml
-    traefik.ingress.kubernetes.io/router.middlewares: auth@file,prefix@kubernetescrd,cb@file
-    ```
-
-??? info "`traefik.ingress.kubernetes.io/router.priority`"
-
-    See [priority](../routers/index.md#priority) for more information.
-
-    ```yaml
-    traefik.ingress.kubernetes.io/router.priority: "42"
-    ```
-
-??? info "`traefik.ingress.kubernetes.io/router.pathmatcher`"
-
-    Overrides the default router rule type used for a path.  
-    Only path-related matcher name can be specified: `Path`, `PathPrefix`.
-    
-    Default `PathPrefix`
-
-    ```yaml
-    traefik.ingress.kubernetes.io/router.pathmatcher: Path
-    ```
-
-??? info "`traefik.ingress.kubernetes.io/router.tls`"
-
-    See [tls](../routers/index.md#tls) for more information.
-
-    ```yaml
-    traefik.ingress.kubernetes.io/router.tls: "true"
-    ```
-
-??? info "`traefik.ingress.kubernetes.io/router.tls.certresolver`"
-
-    See [certResolver](../routers/index.md#certresolver) for more information.
-
-    ```yaml
-    traefik.ingress.kubernetes.io/router.tls.certresolver: myresolver
-    ```
-
-??? info "`traefik.ingress.kubernetes.io/router.tls.domains.n.main`"
-
-    See [domains](../routers/index.md#domains) for more information.
-
-    ```yaml
-    traefik.ingress.kubernetes.io/router.tls.domains.0.main: example.org
-    ```
-
-??? info "`traefik.ingress.kubernetes.io/router.tls.domains.n.sans`"
-
-    See [domains](../routers/index.md#domains) for more information.
-
-    ```yaml
-    traefik.ingress.kubernetes.io/router.tls.domains.0.sans: test.example.org,dev.example.org
-    ```
-
-??? info "`traefik.ingress.kubernetes.io/router.tls.options`"
-
-    See [options](../routers/index.md#options) for more information.
-
-    ```yaml
-    traefik.ingress.kubernetes.io/router.tls.options: foobar
-    ```
-
-#### On Service
-
-??? info "`traefik.ingress.kubernetes.io/service.serversscheme`"
-
-    Overrides the default scheme.
-
-    ```yaml
-    traefik.ingress.kubernetes.io/service.serversscheme: h2c
-    ```
-
-??? info "`traefik.ingress.kubernetes.io/service.passhostheader`"
-
-    See [pass Host header](../services/index.md#pass-host-header) for more information.
-
-    ```yaml
-    traefik.ingress.kubernetes.io/service.passhostheader: "true"
-    ```
-
-??? info "`traefik.ingress.kubernetes.io/service.sticky.cookie`"
-
-    See [sticky sessions](../services/index.md#sticky-sessions) for more information.
-
-    ```yaml
-    traefik.ingress.kubernetes.io/service.sticky.cookie: "true"
-    ```
-
-??? info "`traefik.ingress.kubernetes.io/service.sticky.cookie.name`"
-
-    See [sticky sessions](../services/index.md#sticky-sessions) for more information.
-
-    ```yaml
-    traefik.ingress.kubernetes.io/service.sticky.cookie.name: foobar
-    ```
-
-??? info "`traefik.ingress.kubernetes.io/service.sticky.cookie.secure`"
-
-    See [sticky sessions](../services/index.md#sticky-sessions) for more information.
-
-    ```yaml
-    traefik.ingress.kubernetes.io/service.sticky.cookie.secure: "true"
-    ```
-
-??? info "`traefik.ingress.kubernetes.io/service.sticky.cookie.samesite`"
-
-    See [sticky sessions](../services/index.md#sticky-sessions) for more information.
-
-    ```yaml
-    traefik.ingress.kubernetes.io/service.sticky.cookie.samesite: "none"
-    ```
-
-??? info "`traefik.ingress.kubernetes.io/service.sticky.cookie.httponly`"
-
-    See [sticky sessions](../services/index.md#sticky-sessions) for more information.
-
-    ```yaml
-    traefik.ingress.kubernetes.io/service.sticky.cookie.httponly: "true"
-    ```
-
-### TLS
-
-#### Communication Between Traefik and Pods
-
-Traefik automatically requests endpoint information based on the service provided in the ingress spec.
-Although Traefik will connect directly to the endpoints (pods),
-it still checks the service port to see if TLS communication is required.
-
-There are 3 ways to configure Traefik to use https to communicate with pods:
-
-1. If the service port defined in the ingress spec is `443` (note that you can still use `targetPort` to use a different port on your pod).
-1. If the service port defined in the ingress spec has a name that starts with https (such as `https-api`, `https-web` or just `https`).
-1. If the ingress spec includes the annotation `traefik.ingress.kubernetes.io/service.serversscheme: https`.
-
-If either of those configuration options exist, then the backend communication protocol is assumed to be TLS,
-and will connect via TLS automatically.
-
-!!! info
-    
-    Please note that by enabling TLS communication between traefik and your pods,
-    you will have to have trusted certificates that have the proper trust chain and IP subject name.
-    If this is not an option, you may need to skip TLS certificate verification.
-    See the [insecureSkipVerify](../../routing/overview.md#insecureskipverify) setting for more details.
-
-#### Certificates Management
-
-??? example "Using a secret"
-    
-    ```yaml tab="Ingress"
-    kind: Ingress
-    apiVersion: networking.k8s.io/v1beta1
-    metadata:
-      name: foo
-      namespace: production
-    
-    spec:
-      rules:
-      - host: example.net
-        http:
-          paths:
-          - path: /bar
-            backend:
-              serviceName: service1
-              servicePort: 80
-    
-      tls:
-      - secretName: supersecret
-    ```
-      
-    ```yaml tab="Secret"
-    apiVersion: v1
-    kind: Secret
-    metadata:
-      name: supersecret
-    
-    data:
-      tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0=
-      tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCi0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0=
-    ```
-
-TLS certificates can be managed in Secrets objects.
-
-!!! info
-    
-    Only TLS certificates provided by users can be stored in Kubernetes Secrets.
-    [Let's Encrypt](../../https/acme.md) certificates cannot be managed in Kubernetes Secrets yet.
-
-## Global Default Backend Ingresses
-
-Ingresses can be created that look like the following:
-
-```yaml
-apiVersion: networking.k8s.io/v1beta1
-kind: Ingress
-metadata:
- name: cheese
-
-spec:
- backend:
-   serviceName: stilton
-   servicePort: 80
-```
-
-This ingress follows the Global Default Backend property of ingresses.
-This will allow users to create a "default router" that will match all unmatched requests.
-
-!!! info
-    
-    Due to Traefik's use of priorities, you may have to set this ingress priority lower than other ingresses in your environment,
-    to avoid this global ingress from satisfying requests that could match other ingresses.
-    
-    To do this, use the `traefik.ingress.kubernetes.io/router.priority` annotation (as seen in [Annotations on Ingress](#on-ingress)) on your ingresses accordingly.

docs/content/routing/providers/kv.md

@@ -1,398 +0,0 @@
-# Traefik & KV Stores
-
-A Story of key & values
-{: .subtitle }
-
-## Routing Configuration
-
-!!! info "Keys"
-
-    - Keys are case insensitive.
-    - The complete list of keys can be found in [the reference page](../../reference/dynamic-configuration/kv.md).
-
-### Routers
-
-!!! warning "The character `@` is not authorized in the router name `<router_name>`."
-
-??? info "`traefik/http/routers/<router_name>/rule`"
-
-    See [rule](../routers/index.md#rule) for more information.
-    
-    | Key (Path)                           | Value                      |
-    |--------------------------------------|----------------------------|
-    | `traefik/http/routers/myrouter/rule` | ```Host(`example.com`)```  |
-
-??? info "`traefik/http/routers/<router_name>/entrypoints`"
-
-    See [entry points](../routers/index.md#entrypoints) for more information.
-
-    | Key (Path)                                    | Value       |
-    |-----------------------------------------------|-------------|
-    | `traefik.http.routers.myrouter.entrypoints/0` | `web`       |
-    | `traefik.http.routers.myrouter.entrypoints/1` | `websecure` |
-
-??? info "`traefik/http/routers/<router_name>/middlewares`"
-
-    See [middlewares](../routers/index.md#middlewares) and [middlewares overview](../../middlewares/overview.md) for more information.
-
-    | Key (Path)                                    | Value       |
-    |-----------------------------------------------|-------------|
-    | `traefik/http/routers/myrouter/middlewares/0` | `auth`      |
-    | `traefik/http/routers/myrouter/middlewares/1` | `prefix`    |
-    | `traefik/http/routers/myrouter/middlewares/2` | `cb`        |
-
-??? info "`traefik/http/routers/<router_name>/service`"
-
-    See [rule](../routers/index.md#service) for more information.
-
-    | Key (Path)                              | Value       |
-    |-----------------------------------------|-------------|
-    | `traefik/http/routers/myrouter/service` | `myservice` |
-
-??? info "`traefik/http/routers/<router_name>/tls`"
-
-    See [tls](../routers/index.md#tls) for more information.
-
-    | Key (Path)                          | Value  |
-    |-------------------------------------|--------|
-    | `traefik/http/routers/myrouter/tls` | `true` |
-    
-??? info "`traefik/http/routers/<router_name>/tls/certresolver`"
-
-    See [certResolver](../routers/index.md#certresolver) for more information.
-
-    | Key (Path)                                       | Value        |
-    |--------------------------------------------------|--------------|
-    | `traefik/http/routers/myrouter/tls/certresolver` | `myresolver` |    
-
-??? info "`traefik/http/routers/<router_name>/tls/domains/<n>/main`"
-
-    See [domains](../routers/index.md#domains) for more information.
-
-    | Key (Path)                                         | Value         |
-    |----------------------------------------------------|---------------|
-    | `traefik/http/routers/myrouter/tls/domains/0/main` | `example.org` |
-    
-??? info "`traefik/http/routers/<router_name>/tls/domains/<n>/sans/<n>`"
-
-    See [domains](../routers/index.md#domains) for more information.
-
-    | Key (Path)                                           | Value              |
-    |------------------------------------------------------|--------------------|
-    | `traefik/http/routers/myrouter/tls/domains/0/sans/0` | `test.example.org` |
-    | `traefik/http/routers/myrouter/tls/domains/0/sans/1` | `dev.example.org`  |
-    
-??? info "`traefik/http/routers/<router_name>/tls/options`"
-
-    See [options](../routers/index.md#options) for more information.
-
-    | Key (Path)                                  | Value    |
-    |---------------------------------------------|----------|
-    | `traefik/http/routers/myrouter/tls/options` | `foobar` |
-
-??? info "`traefik/http/routers/<router_name>/priority`"
-
-    See [priority](../routers/index.md#priority) for more information.
-
-    | Key (Path)                               | Value |
-    |------------------------------------------|-------|
-    | `traefik/http/routers/myrouter/priority` | `42`  |
-
-### Services
-
-!!! warning "The character `@` is not authorized in the service name `<service_name>`."
-
-??? info "`traefik/http/services/<service_name>/loadbalancer/servers/<n>/url`"
-
-    See [servers](../services/index.md#servers) for more information.
-
-    | Key (Path)                                                      | Value                                   |
-    |-----------------------------------------------------------------|-----------------------------------------|
-    | `traefik/http/services/myservice/loadbalancer/servers/0/url`    | `http://<ip-server-1>:<port-server-1>/` |
-
-??? info "`traefik/http/services/<service_name>/loadbalancer/passhostheader`"
-
-    See [pass Host header](../services/index.md#pass-host-header) for more information.
-
-    | Key (Path)                                                      | Value  |
-    |-----------------------------------------------------------------|--------|
-    | `traefik/http/services/myservice/loadbalancer/passhostheader`   | `true` |
-
-??? info "`traefik/http/services/<service_name>/loadbalancer/healthcheck/headers/<header_name>`"
-
-    See [health check](../services/index.md#health-check) for more information.
-
-    | Key (Path)                                                               | Value    |
-    |--------------------------------------------------------------------------|----------|
-    | `traefik/http/services/myservice/loadbalancer/healthcheck/headers/X-Foo` | `foobar` |
-
-??? info "`traefik/http/services/<service_name>/loadbalancer/healthcheck/hostname`"
-
-    See [health check](../services/index.md#health-check) for more information.
-
-    | Key (Path)                                                          | Value         |
-    |---------------------------------------------------------------------|---------------|
-    | `traefik/http/services/myservice/loadbalancer/healthcheck/hostname` | `example.org` |
-
-??? info "`traefik/http/services/<service_name>/loadbalancer/healthcheck/interval`"
-
-    See [health check](../services/index.md#health-check) for more information.
-
-    | Key (Path)                                                          | Value |
-    |---------------------------------------------------------------------|-------|
-    | `traefik/http/services/myservice/loadbalancer/healthcheck/interval` | `10`  |
-
-??? info "`traefik/http/services/<service_name>/loadbalancer/healthcheck/path`"
-
-    See [health check](../services/index.md#health-check) for more information.
-
-    | Key (Path)                                                      | Value  |
-    |-----------------------------------------------------------------|--------|
-    | `traefik/http/services/myservice/loadbalancer/healthcheck/path` | `/foo` |
-
-??? info "`traefik/http/services/<service_name>/loadbalancer/healthcheck/port`"
-
-    See [health check](../services/index.md#health-check) for more information.
-
-    | Key (Path)                                                      | Value |
-    |-----------------------------------------------------------------|-------|
-    | `traefik/http/services/myservice/loadbalancer/healthcheck/port` | `42`  |
-
-??? info "`traefik/http/services/<service_name>/loadbalancer/healthcheck/scheme`"
-
-    See [health check](../services/index.md#health-check) for more information.
-
-    | Key (Path)                                                        | Value  |
-    |-------------------------------------------------------------------|--------|
-    | `traefik/http/services/myservice/loadbalancer/healthcheck/scheme` | `http` |
-
-??? info "`traefik/http/services/<service_name>/loadbalancer/healthcheck/timeout`"
-
-    See [health check](../services/index.md#health-check) for more information.
-
-    | Key (Path)                                                         | Value |
-    |--------------------------------------------------------------------|-------|
-    | `traefik/http/services/myservice/loadbalancer/healthcheck/timeout` | `10`  |
-
-??? info "`traefik/http/services/<service_name>/loadbalancer/sticky`"
-
-    See [sticky sessions](../services/index.md#sticky-sessions) for more information.
-
-    | Key (Path)                                            | Value  |
-    |-------------------------------------------------------|--------|
-    | `traefik/http/services/myservice/loadbalancer/sticky` | `true` |
-
-??? info "`traefik/http/services/<service_name>/loadbalancer/sticky/cookie/httponly`"
-
-    See [sticky sessions](../services/index.md#sticky-sessions) for more information.
-
-    | Key (Path)                                                            | Value  |
-    |-----------------------------------------------------------------------|--------|
-    | `traefik/http/services/myservice/loadbalancer/sticky/cookie/httponly` | `true` |
-
-??? info "`traefik/http/services/<service_name>/loadbalancer/sticky/cookie/name`"
-
-    See [sticky sessions](../services/index.md#sticky-sessions) for more information.
-
-    | Key (Path)                                                        | Value    |
-    |-------------------------------------------------------------------|----------|
-    | `traefik/http/services/myservice/loadbalancer/sticky/cookie/name` | `foobar` |
-
-??? info "`traefik/http/services/<service_name>/loadbalancer/sticky/cookie/secure`"
-
-    See [sticky sessions](../services/index.md#sticky-sessions) for more information.
-
-    | Key (Path)                                                          | Value  |
-    |---------------------------------------------------------------------|--------|
-    | `traefik/http/services/myservice/loadbalancer/sticky/cookie/secure` | `true` |
-
-??? info "`traefik/http/services/<service_name>/loadbalancer/sticky/cookie/samesite`"
-
-    See [sticky sessions](../services/index.md#sticky-sessions) for more information.
-
-    | Key (Path)                                                            | Value  |
-    |-----------------------------------------------------------------------|--------|
-    | `traefik/http/services/myservice/loadbalancer/sticky/cookie/samesite` | `none` |
-
-??? info "`traefik/http/services/<service_name>/loadbalancer/responseforwarding/flushinterval`"
-
-    See [response forwarding](../services/index.md#response-forwarding) for more information.
-
-    | Key (Path)                                                                      | Value |
-    |---------------------------------------------------------------------------------|-------|
-    | `traefik/http/services/myservice/loadbalancer/responseforwarding/flushinterval` | `10`  |
-
-??? info "`traefik/http/services/<service_name>/mirroring/service`"
-
-    | Key (Path)                                               | Value    |
-    |----------------------------------------------------------|----------|
-    | `traefik/http/services/<service_name>/mirroring/service` | `foobar` |
-
-??? info "`traefik/http/services/<service_name>/mirroring/mirrors/<n>/name`"
-
-    | Key (Path)                                                        | Value    |
-    |-------------------------------------------------------------------|----------|
-    | `traefik/http/services/<service_name>/mirroring/mirrors/<n>/name` | `foobar` |
-
-??? info "`traefik/http/services/<service_name>/mirroring/mirrors/<n>/percent`"
-
-    | Key (Path)                                                           | Value |
-    |----------------------------------------------------------------------|-------|
-    | `traefik/http/services/<service_name>/mirroring/mirrors/<n>/percent` | `42`  |
-
-??? info "`traefik/http/services/<service_name>/weighted/services/<n>/name`"
-
-    | Key (Path)                                                        | Value    |
-    |-------------------------------------------------------------------|----------|
-    | `traefik/http/services/<service_name>/weighted/services/<n>/name` | `foobar` |
-
-??? info "`traefik/http/services/<service_name>/weighted/services/<n>/weight`"
-
-    | Key (Path)                                                          | Value |
-    |---------------------------------------------------------------------|-------|
-    | `traefik/http/services/<service_name>/weighted/services/<n>/weight` | `42`  |
-
-??? info "`traefik/http/services/<service_name>/weighted/sticky/cookie/name`"
-
-    | Key (Path)                                                         | Value    |
-    |--------------------------------------------------------------------|----------|
-    | `traefik/http/services/<service_name>/weighted/sticky/cookie/name` | `foobar` |
-
-??? info "`traefik/http/services/<service_name>/weighted/sticky/cookie/secure`"
-
-    | Key (Path)                                                           | Value  |
-    |----------------------------------------------------------------------|--------|
-    | `traefik/http/services/<service_name>/weighted/sticky/cookie/secure` | `true` |
-
-??? info "`traefik/http/services/<service_name>/weighted/sticky/cookie/samesite`"
-
-    | Key (Path)                                                             | Value  |
-    |------------------------------------------------------------------------|--------|
-    | `traefik/http/services/<service_name>/weighted/sticky/cookie/samesite` | `none` |
-
-??? info "`traefik/http/services/<service_name>/weighted/sticky/cookie/httpOnly`"
-
-    | Key (Path)                                                             | Value  |
-    |------------------------------------------------------------------------|--------|
-    | `traefik/http/services/<service_name>/weighted/sticky/cookie/httpOnly` | `true` |
-
-### Middleware
-
-More information about available middlewares in the dedicated [middlewares section](../../middlewares/overview.md).
-
-!!! warning "The character `@` is not authorized in the middleware name."
-
-!!! warning "Conflicts in Declaration"
-
-    If you declare multiple middleware with the same name but with different parameters, the middleware fails to be declared.
-
-### TCP
-
-You can declare TCP Routers and/or Services using KV.
-
-#### TCP Routers
-
-??? info "`traefik/tcp/routers/<router_name>/entrypoints`"
-
-    See [entry points](../routers/index.md#entrypoints_1) for more information.
-
-    | Key (Path)                                      | Value |
-    |-------------------------------------------------|-------|
-    | `traefik/tcp/routers/mytcprouter/entrypoints/0` | `ep1` |
-    | `traefik/tcp/routers/mytcprouter/entrypoints/1` | `ep2` |
-    
-??? info "`traefik/tcp/routers/<router_name>/rule`"
-
-    See [rule](../routers/index.md#rule_1) for more information.
-
-    | Key (Path)                           | Value                        |
-    |--------------------------------------|------------------------------|
-    | `traefik/tcp/routers/my-router/rule` | ```HostSNI(`example.com`)``` |  
-
-??? info "`traefik/tcp/routers/<router_name>/service`"
-
-    See [service](../routers/index.md#services) for more information.
-    
-    | Key (Path)                                | Value       |
-    |-------------------------------------------|-------------|
-    | `traefik/tcp/routers/mytcprouter/service` | `myservice` |
-
-??? info "`traefik/tcp/routers/<router_name>/tls`"
-
-    See [TLS](../routers/index.md#tls_1) for more information.
-
-    | Key (Path)                            | Value  |
-    |---------------------------------------|--------|
-    | `traefik/tcp/routers/mytcprouter/tls` | `true` |
-
-??? info "`traefik/tcp/routers/<router_name>/tls/certresolver`"
-
-    See [certResolver](../routers/index.md#certresolver_1) for more information.
-
-    | Key (Path)                                         | Value        |
-    |----------------------------------------------------|--------------|
-    | `traefik/tcp/routers/mytcprouter/tls/certresolver` | `myresolver` |
-
-??? info "`traefik/tcp/routers/<router_name>/tls/domains/<n>/main`"
-
-    See [domains](../routers/index.md#domains_1) for more information.
-
-    | Key (Path)                                           | Value         |
-    |------------------------------------------------------|---------------|
-    | `traefik/tcp/routers/mytcprouter/tls/domains/0/main` | `example.org` |
-        
-??? info "`traefik/tcp/routers/<router_name>/tls/domains/<n>/sans`"
-
-    See [domains](../routers/index.md#domains_1) for more information.
-
-    | Key (Path)                                             | Value              |
-    |--------------------------------------------------------|--------------------|
-    | `traefik/tcp/routers/mytcprouter/tls/domains/0/sans/0` | `test.example.org` |
-    | `traefik/tcp/routers/mytcprouter/tls/domains/0/sans/1` | `dev.example.org`  |
-    
-??? info "`traefik/tcp/routers/<router_name>/tls/options`"
-
-    See [options](../routers/index.md#options_1) for more information.
-
-    | Key (Path)                                    | Value    |
-    |-----------------------------------------------|----------|
-    | `traefik/tcp/routers/mytcprouter/tls/options` | `foobar` |
-    
-
-??? info "`traefik/tcp/routers/<router_name>/tls/passthrough`"
-
-    See [TLS](../routers/index.md#tls_1) for more information.
-
-    | Key (Path)                                        | Value  |
-    |---------------------------------------------------|--------|
-    | `traefik/tcp/routers/mytcprouter/tls/passthrough` | `true` |
-
-#### TCP Services
-
-??? info "`traefik/tcp/services/<service_name>/loadbalancer/servers/<n>/url`"
-
-    See [servers](../services/index.md#servers) for more information.
-
-    | Key (Path)                                                         | Value            |
-    |--------------------------------------------------------------------|------------------|
-    | `traefik/tcp/services/mytcpservice/loadbalancer/servers/0/address` | `xx.xx.xx.xx:xx` |
-
-??? info "`traefik/tcp/services/<service_name>/loadbalancer/terminationdelay`"
-
-    See [termination delay](../services/index.md#termination-delay) for more information.
-
-    | Key (Path)                                                        | Value |
-    |-------------------------------------------------------------------|-------|
-    | `traefik/tcp/services/mytcpservice/loadbalancer/terminationdelay` | `100` |
-
-??? info "`traefik/tcp/services/<service_name>/weighted/services/<n>/name`"
-
-    | Key (Path)                                                          | Value    |
-    |---------------------------------------------------------------------|----------|
-    | `traefik/tcp/services/<service_name>/weighted/services/0/name`      | `foobar` |
-
-??? info "`traefik/tcp/services/<service_name>/weighted/services/<n>/weight`"
-
-    | Key (Path)                                                       | Value |
-    |------------------------------------------------------------------|-------|
-    | `traefik/tcp/services/<service_name>/weighted/services/0/weight` | `42`  |

docs/content/routing/providers/marathon.md

@@ -29,7 +29,7 @@ and the router automatically gets a rule defined by defaultRule (if no rule for
 
     ```json
     labels: {
-      "traefik.http.routers.myproxy.rule": "Host(`example.net`)",
+      "traefik.http.routers.myproxy.rule": "Host(`foo.com`)",
       "traefik.http.services.myservice.loadbalancer.server.port": "80"
     }
     ```
@@ -41,7 +41,7 @@ and the router automatically gets a rule defined by defaultRule (if no rule for
 
     ```json
     labels: {
-      "traefik.http.routers.myproxy.rule": "Host(`example.net`)"
+      "traefik.http.routers.myproxy.rule": "Host(`foo.com`)"
 	}
     ```
 
@@ -50,7 +50,7 @@ and the router automatically gets a rule defined by defaultRule (if no rule for
 To update the configuration of the Router automatically attached to the application,
 add labels starting with `traefik.http.routers.{router-name-of-your-choice}.` and followed by the option you want to change.
 
-For example, to change the routing rule, you could add the label ```"traefik.http.routers.routername.rule": "Host(`example.com`)"```.
+For example, to change the routing rule, you could add the label ```"traefik.http.routers.routername.rule": "Host(`mydomain.com`)"```.
 
 !!! warning "The character `@` is not authorized in the router name `<router_name>`."
 
@@ -59,7 +59,7 @@ For example, to change the routing rule, you could add the label ```"traefik.htt
     See [rule](../routers/index.md#rule) for more information. 
     
     ```json
-    "traefik.http.routers.myrouter.rule": "Host(`example.com`)"
+    "traefik.http.routers.myrouter.rule": "Host(`mydomain.com`)"
     ```
 
 ??? info "`traefik.http.routers.<router_name>.entrypoints`"
@@ -107,7 +107,7 @@ For example, to change the routing rule, you could add the label ```"traefik.htt
     See [domains](../routers/index.md#domains) for more information.
     
     ```json
-    "traefik.http.routers.myrouter.tls.domains[0].main": "example.org"
+    "traefik.http.routers.myrouter.tls.domains[0].main": "foobar.com"
     ```
 
 ??? info "`traefik.http.routers.<router_name>.tls.domains[n].sans`"
@@ -115,7 +115,7 @@ For example, to change the routing rule, you could add the label ```"traefik.htt
     See [domains](../routers/index.md#domains) for more information.
     
     ```json
-    "traefik.http.routers.myrouter.tls.domains[0].sans": "test.example.org,dev.example.org"
+    "traefik.http.routers.myrouter.tls.domains[0].sans": "test.foobar.com,dev.foobar.com"
     ```
 
 ??? info "`traefik.http.routers.<router_name>.tls.options`"
@@ -181,7 +181,7 @@ For example, to change the passHostHeader behavior, you'd add the label `"traefi
     See [health check](../services/index.md#health-check) for more information.
     
     ```json
-    "traefik.http.services.myservice.loadbalancer.healthcheck.hostname": "example.org"
+    "traefik.http.services.myservice.loadbalancer.healthcheck.hostname": "foobar.com"
     ```
 
 ??? info "`traefik.http.services.<service_name>.loadbalancer.healthcheck.interval`"
@@ -224,20 +224,12 @@ For example, to change the passHostHeader behavior, you'd add the label `"traefi
     "traefik.http.services.myservice.loadbalancer.healthcheck.timeout": "10"
     ```
 
-??? info "`traefik.http.services.<service_name>.loadbalancer.healthcheck.followredirects`"
-    
-    See [health check](../services/index.md#health-check) for more information.
-    
-    ```json
-    "traefik.http.services.myservice.loadbalancer.healthcheck.followredirects": "true"
-    ```
-
-??? info "`traefik.http.services.<service_name>.loadbalancer.sticky.cookie`"
+??? info "`traefik.http.services.<service_name>.loadbalancer.sticky`"
     
     See [sticky sessions](../services/index.md#sticky-sessions) for more information.
     
     ```json
-    "traefik.http.services.myservice.loadbalancer.sticky.cookie": "true"
+    "traefik.http.services.myservice.loadbalancer.sticky": "true"
     ```
 
 ??? info "`traefik.http.services.<service_name>.loadbalancer.sticky.cookie.httponly`"
@@ -316,7 +308,7 @@ You can declare TCP Routers and/or Services using labels.
 	{
 		...
 		"labels": {
-			"traefik.tcp.routers.my-router.rule": "HostSNI(`example.com`)",
+			"traefik.tcp.routers.my-router.rule": "HostSNI(`my-host.com`)",
 			"traefik.tcp.routers.my-router.tls": "true",
 			"traefik.tcp.services.my-service.loadbalancer.server.port": "4123"
 		}
@@ -344,7 +336,7 @@ You can declare TCP Routers and/or Services using labels.
     See [rule](../routers/index.md#rule_1) for more information.
     
     ```json
-    "traefik.tcp.routers.mytcprouter.rule": "HostSNI(`example.com`)"
+    "traefik.tcp.routers.mytcprouter.rule": "HostSNI(`myhost.com`)"
     ```
 
 ??? info "`traefik.tcp.routers.<router_name>.service`"
@@ -376,7 +368,7 @@ You can declare TCP Routers and/or Services using labels.
     See [domains](../routers/index.md#domains_1) for more information.
     
     ```json
-    "traefik.tcp.routers.mytcprouter.tls.domains[0].main": "example.org"
+    "traefik.tcp.routers.mytcprouter.tls.domains[0].main": "foobar.com"
     ```
 
 ??? info "`traefik.tcp.routers.<router_name>.tls.domains[n].sans`"
@@ -384,7 +376,7 @@ You can declare TCP Routers and/or Services using labels.
     See [domains](../routers/index.md#domains_1) for more information.
     
     ```json
-    "traefik.tcp.routers.mytcprouter.tls.domains[0].sans": "test.example.org,dev.example.org"
+    "traefik.tcp.routers.mytcprouter.tls.domains[0].sans": "test.foobar.com,dev.foobar.com"
     ```
 
 ??? info "`traefik.tcp.routers.<router_name>.tls.options`"
@@ -421,55 +413,6 @@ You can declare TCP Routers and/or Services using labels.
     "traefik.tcp.services.mytcpservice.loadbalancer.terminationdelay": "100"
     ```
 
-### UDP
-
-You can declare UDP Routers and/or Services using labels.
-
-??? example "Declaring UDP Routers and Services"
-
-    ```json
-	{
-		...
-		"labels": {
-			"traefik.udp.routers.my-router.entrypoints": "udp",
-			"traefik.udp.services.my-service.loadbalancer.server.port": "4123"
-		}
-	}
-    ```
-
-!!! warning "UDP and HTTP"
-
-    If you declare a UDP Router/Service, it will prevent Traefik from automatically creating an HTTP Router/Service (like it does by default if no UDP Router/Service is defined).
-    You can declare both a UDP Router/Service and an HTTP Router/Service for the same container (but you have to do so manually).
-
-#### UDP Routers
-
-??? info "`traefik.udp.routers.<router_name>.entrypoints`"
-    
-    See [entry points](../routers/index.md#entrypoints_2) for more information.
-    
-     ```json
-     "traefik.udp.routers.myudprouter.entrypoints": "ep1,ep2"
-     ```
-
-??? info "`traefik.udp.routers.<router_name>.service`"
-    
-    See [service](../routers/index.md#services_1) for more information.
-    
-    ```json
-    "traefik.udp.routers.myudprouter.service": "myservice"
-    ```
-
-#### UDP Services
-
-??? info "`traefik.udp.services.<service_name>.loadbalancer.server.port`"
-    
-    Registers a port of the application.
-    
-    ```json
-    "traefik.udp.services.myudpservice.loadbalancer.server.port": "423"
-    ```
-
 ### Specific Provider Options
 
 #### `traefik.enable`

docs/content/routing/providers/rancher.md

@@ -35,7 +35,7 @@ The Service automatically gets a server per container in this rancher service, a
 
     ```yaml
     labels:
-      - "traefik.http.routers.myproxy.rule=Host(`example.net`)"
+      - "traefik.http.routers.myproxy.rule=Host(`foo.com`)"
       # service myservice gets automatically assigned to router myproxy
       - "traefik.http.services.myservice.loadbalancer.server.port=80"
     ```
@@ -48,14 +48,14 @@ The Service automatically gets a server per container in this rancher service, a
     labels:
       # no service specified or defined and yet one gets automatically created
       # and assigned to router myproxy.
-      - "traefik.http.routers.myproxy.rule=Host(`example.net`)"
+      - "traefik.http.routers.myproxy.rule=Host(`foo.com`)"
     ```
 
 ### Routers
 
 To update the configuration of the Router automatically attached to the container, add labels starting with `traefik.routers.{name-of-your-choice}.` and followed by the option you want to change.
 
-For example, to change the rule, you could add the label ```traefik.http.routers.my-container.rule=Host(`example.com`)```.
+For example, to change the rule, you could add the label ```traefik.http.routers.my-container.rule=Host(`mydomain.com`)```.
 
 !!! warning "The character `@` is not authorized in the router name `<router_name>`."
 
@@ -64,7 +64,7 @@ For example, to change the rule, you could add the label ```traefik.http.routers
     See [rule](../routers/index.md#rule) for more information. 
     
     ```yaml
-    - "traefik.http.routers.myrouter.rule=Host(`example.com`)"
+    - "traefik.http.routers.myrouter.rule=Host(`mydomain.com`)"
     ```
 
 ??? info "`traefik.http.routers.<router_name>.entrypoints`"
@@ -112,7 +112,7 @@ For example, to change the rule, you could add the label ```traefik.http.routers
     See [domains](../routers/index.md#domains) for more information.
     
     ```yaml
-    - "traefik.http.routers.myrouter.tls.domains[0].main=example.org"
+    - "traefik.http.routers.myrouter.tls.domains[0].main=foobar.com"
     ```
 
 ??? info "`traefik.http.routers.<router_name>.tls.domains[n].sans`"
@@ -120,7 +120,7 @@ For example, to change the rule, you could add the label ```traefik.http.routers
     See [domains](../routers/index.md#domains) for more information.
     
     ```yaml
-    - "traefik.http.routers.myrouter.tls.domains[0].sans=test.example.org,dev.example.org"
+    - "traefik.http.routers.myrouter.tls.domains[0].sans=test.foobar.com,dev.foobar.com"
     ```
 
 ??? info "`traefik.http.routers.<router_name>.tls.options`"
@@ -187,7 +187,7 @@ you'd add the label `traefik.http.services.{name-of-your-choice}.loadbalancer.pa
     See [health check](../services/index.md#health-check) for more information.
     
     ```yaml
-    - "traefik.http.services.myservice.loadbalancer.healthcheck.hostname=example.org"
+    - "traefik.http.services.myservice.loadbalancer.healthcheck.hostname=foobar.com"
     ```
 
 ??? info "`traefik.http.services.<service_name>.loadbalancer.healthcheck.interval`"
@@ -230,20 +230,12 @@ you'd add the label `traefik.http.services.{name-of-your-choice}.loadbalancer.pa
     - "traefik.http.services.myservice.loadbalancer.healthcheck.timeout=10"
     ```
 
-??? info "`traefik.http.services.<service_name>.loadbalancer.healthcheck.followredirects`"
-    
-    See [health check](../services/index.md#health-check) for more information.
-    
-    ```yaml
-    - "traefik.http.services.myservice.loadbalancer.healthcheck.followredirects=true"
-    ```
-
-??? info "`traefik.http.services.<service_name>.loadbalancer.sticky.cookie`"
+??? info "`traefik.http.services.<service_name>.loadbalancer.sticky`"
     
     See [sticky sessions](../services/index.md#sticky-sessions) for more information.
     
     ```yaml
-    - "traefik.http.services.myservice.loadbalancer.sticky.cookie=true"
+    - "traefik.http.services.myservice.loadbalancer.sticky=true"
     ```
 
 ??? info "`traefik.http.services.<service_name>.loadbalancer.sticky.cookie.httponly`"
@@ -322,7 +314,7 @@ You can declare TCP Routers and/or Services using labels.
          my-container:
            # ...
            labels:
-             - "traefik.tcp.routers.my-router.rule=HostSNI(`example.com`)"
+             - "traefik.tcp.routers.my-router.rule=HostSNI(`my-host.com`)"
              - "traefik.tcp.routers.my-router.tls=true"
              - "traefik.tcp.services.my-service.loadbalancer.server.port=4123"
     ```
@@ -347,7 +339,7 @@ You can declare TCP Routers and/or Services using labels.
     See [rule](../routers/index.md#rule_1) for more information.
     
     ```yaml
-    - "traefik.tcp.routers.mytcprouter.rule=HostSNI(`example.com`)"
+    - "traefik.tcp.routers.mytcprouter.rule=HostSNI(`myhost.com`)"
     ```
 
 ??? info "`traefik.tcp.routers.<router_name>.service`"
@@ -379,7 +371,7 @@ You can declare TCP Routers and/or Services using labels.
     See [domains](../routers/index.md#domains_1) for more information.
     
     ```yaml
-    - "traefik.tcp.routers.mytcprouter.tls.domains[0].main=example.org"
+    - "traefik.tcp.routers.mytcprouter.tls.domains[0].main=foobar.com"
     ```
 
 ??? info "`traefik.tcp.routers.<router_name>.tls.domains[n].sans`"
@@ -387,7 +379,7 @@ You can declare TCP Routers and/or Services using labels.
     See [domains](../routers/index.md#domains_1) for more information.
     
     ```yaml
-    - "traefik.tcp.routers.mytcprouter.tls.domains[0].sans=test.example.org,dev.example.org"
+    - "traefik.tcp.routers.mytcprouter.tls.domains[0].sans=test.foobar.com,dev.foobar.com"
     ```
 
 ??? info "`traefik.tcp.routers.<router_name>.tls.options`"
@@ -424,54 +416,6 @@ You can declare TCP Routers and/or Services using labels.
     - "traefik.tcp.services.mytcpservice.loadbalancer.terminationdelay=100"
     ```
 
-### UDP
-
-You can declare UDP Routers and/or Services using labels.
-
-??? example "Declaring UDP Routers and Services"
-
-    ```yaml
-       services:
-         my-container:
-           # ...
-           labels:
-             - "traefik.udp.routers.my-router.entrypoints=udp"
-             - "traefik.udp.services.my-service.loadbalancer.server.port=4123"
-    ```
-
-!!! warning "UDP and HTTP"
-
-    If you declare a UDP Router/Service, it will prevent Traefik from automatically creating an HTTP Router/Service (like it does by default if no UDP Router/Service is defined).
-    You can declare both a UDP Router/Service and an HTTP Router/Service for the same container (but you have to do so manually).
-
-#### UDP Routers
-
-??? info "`traefik.udp.routers.<router_name>.entrypoints`"
-    
-    See [entry points](../routers/index.md#entrypoints_2) for more information.
-    
-    ```yaml
-    - "traefik.udp.routers.myudprouter.entrypoints=ep1,ep2"
-    ```
-
-??? info "`traefik.udp.routers.<router_name>.service`"
-    
-    See [service](../routers/index.md#services_1) for more information.
-    
-    ```yaml
-    - "traefik.udp.routers.myudprouter.service=myservice"
-    ```
-
-#### UDP Services
-
-??? info "`traefik.udp.services.<service_name>.loadbalancer.server.port`"
-    
-    Registers a port of the application.
-    
-    ```yaml
-    - "traefik.udp.services.myudpservice.loadbalancer.server.port=423"
-    ```
-
 ### Specific Provider Options
 
 #### `traefik.enable`

docs/content/routing/routers/index.md

@@ -6,8 +6,7 @@ Connecting Requests to Services
 ![routers](../../assets/img/routers.png)
 
 A router is in charge of connecting incoming requests to the services that can handle them.
-In the process, routers may use pieces of [middleware](../../middlewares/overview.md) to update the request,
-or act before forwarding the request to the service.
+In the process, routers may use pieces of [middleware](../../middlewares/overview.md) to update the request, or act before forwarding the request to the service.
 
 ## Configuration Example
 
@@ -101,7 +100,7 @@ If you want to limit the router scope to a set of entry points, set the `entryPo
     [http.routers]
       [http.routers.Router-1]
         # By default, routers listen to every entry points
-        rule = "Host(`example.com`)"
+        rule = "Host(`traefik.io`)"
         service = "service-1"
     ```
     
@@ -111,7 +110,7 @@ If you want to limit the router scope to a set of entry points, set the `entryPo
       routers:
         Router-1:
           # By default, routers listen to every entry points
-          rule: "Host(`example.com`)"
+          rule: "Host(`traefik.io`)"
           service: "service-1"
     ```
     
@@ -156,7 +155,7 @@ If you want to limit the router scope to a set of entry points, set the `entryPo
       [http.routers.Router-1]
         # won't listen to entry point web
         entryPoints = ["websecure", "other"]
-        rule = "Host(`example.com`)"
+        rule = "Host(`traefik.io`)"
         service = "service-1"
     ```
     
@@ -169,7 +168,7 @@ If you want to limit the router scope to a set of entry points, set the `entryPo
           entryPoints:
             - "websecure"
             - "other"
-          rule: "Host(`example.com`)"
+          rule: "Host(`traefik.io`)"
           service: "service-1"
     ```
 
@@ -214,31 +213,30 @@ If the rule is verified, the router becomes active, calls middlewares, and then
     
     Single quotes `'` are not accepted as values are [Golang's String Literals](https://golang.org/ref/spec#String_literals).
 
-!!! example "Host is example.com"
+!!! example "Host is traefik.io"
 
     ```toml
-    rule = "Host(`example.com`)"
+    rule = "Host(`traefik.io`)"
     ```
 
-!!! example "Host is example.com OR Host is example.org AND path is /traefik"
+!!! example "Host is traefik.io OR Host is containo.us AND path is /traefik"
 
     ```toml
-    rule = "Host(`example.com`) || (Host(`example.org`) && Path(`/traefik`))"
+    rule = "Host(`traefik.io`) || (Host(`containo.us`) && Path(`/traefik`))"
     ```
 
 The table below lists all the available matchers:
 
-| Rule                                                                   | Description                                                                                                    |
-|------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------|
-| ```Headers(`key`, `value`)```                                          | Check if there is a key `key`defined in the headers, with the value `value`                                    |
-| ```HeadersRegexp(`key`, `regexp`)```                                   | Check if there is a key `key`defined in the headers, with a value that matches the regular expression `regexp` |
-| ```Host(`example.com`, ...)```                                         | Check if the request domain (host header value) targets one of the given `domains`.                            |
-| ```HostHeader(`example.com`, ...)```                                   | Check if the request domain (host header value) targets one of the given `domains`.                            |
-| ```HostRegexp(`example.com`, `{subdomain:[a-z]+}.example.com`, ...)``` | Check if the request domain matches the given `regexp`.                                                        |
-| ```Method(`GET`, ...)```                                               | Check if the request method is one of the given `methods` (`GET`, `POST`, `PUT`, `DELETE`, `PATCH`)            |
-| ```Path(`/path`, `/articles/{cat:[a-z]+}/{id:[0-9]+}`, ...)```         | Match exact request path. It accepts a sequence of literal and regular expression paths.                       |
-| ```PathPrefix(`/products/`, `/articles/{cat:[a-z]+}/{id:[0-9]+}`)```   | Match request prefix path. It accepts a sequence of literal and regular expression prefix paths.               |
-| ```Query(`foo=bar`, `bar=baz`)```                                      | Match Query String parameters. It accepts a sequence of key=value pairs.                                       |
+| Rule                                                                 | Description                                                                                                    |
+|----------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------|
+| ```Headers(`key`, `value`)```                                        | Check if there is a key `key`defined in the headers, with the value `value`                                    |
+| ```HeadersRegexp(`key`, `regexp`)```                                 | Check if there is a key `key`defined in the headers, with a value that matches the regular expression `regexp` |
+| ```Host(`domain-1`, ...)```                                          | Check if the request domain targets one of the given `domains`.                                                |
+| ```HostRegexp(`traefik.io`, `{subdomain:[a-z]+}.traefik.io`, ...)``` | Check if the request domain matches the given `regexp`.                                                        |
+| ```Method(`GET`, ...)```                                             | Check if the request method is one of the given `methods` (`GET`, `POST`, `PUT`, `DELETE`, `PATCH`)            |
+| ```Path(`/path`, `/articles/{category}/{id:[0-9]+}`, ...)```         | Match exact request path. It accepts a sequence of literal and regular expression paths.                       |
+| ```PathPrefix(`/products/`, `/articles/{category}/{id:[0-9]+}`)```   | Match request prefix path. It accepts a sequence of literal and regular expression prefix paths.               |
+| ```Query(`foo=bar`, `bar=baz`)```                                    | Match Query String parameters. It accepts a sequence of key=value pairs.                                      |
 
 !!! important "Regexp Syntax"
 
@@ -387,7 +385,7 @@ but there are exceptions for label-based providers.
 See the specific [docker](../providers/docker.md#service-definition), [rancher](../providers/rancher.md#service-definition),
 or [marathon](../providers/marathon.md#service-definition) documentation.
 
-!!! warning "The character `@` is not authorized in the service name."
+!!! warning "The character `@` is not authorized in the middleware name."
 
 !!! important "HTTP routers can only target HTTP services (not TCP services)."
 
@@ -472,11 +470,6 @@ It refers to a [TLS Options](../../https/tls.md#tls-options) and will be applied
     the TLS option is picked from the mapping mentioned above and based on the server name provided during the TLS handshake,
     and it all happens before routing actually occurs.
 
-!!! info "Domain Fronting"
-
-    In the case of domain fronting,
-    if the TLS options associated with the Host Header and the SNI are different then Traefik will respond with a status code `421`.
-
 ??? example "Configuring the TLS options"
 
     ```toml tab="File (TOML)"
@@ -494,8 +487,8 @@ It refers to a [TLS Options](../../https/tls.md#tls-options) and will be applied
         minVersion = "VersionTLS12"
         cipherSuites = [
           "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
-          "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256",
-          "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256",
+          "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305",
+          "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305",
           "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
           "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
         ]
@@ -518,8 +511,8 @@ It refers to a [TLS Options](../../https/tls.md#tls-options) and will be applied
           minVersion: VersionTLS12
           cipherSuites:
             - TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
-            - TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256
-            - TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
+            - TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
+            - TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305
             - TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
             - TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
     ```
@@ -586,7 +579,7 @@ http:
 ```
 
 !!! info "Multiple Hosts in a Rule"
-    The rule ```Host(`test1.example.com`,`test2.example.com`)``` will request a certificate with the main domain `test1.example.com` and SAN `test2.example.com`.
+    The rule ```Host(`test1.traefik.io`,`test2.traefik.io`)``` will request a certificate with the main domain `test1.traefik.io` and SAN `test2.traefik.io`.
 
 #### `domains`
 
@@ -660,7 +653,7 @@ If you want to limit the router scope to a set of entry points, set the entry po
     [tcp.routers]
       [tcp.routers.Router-1]
         # By default, routers listen to every entrypoints
-        rule = "HostSNI(`example.com`)"
+        rule = "HostSNI(`traefik.io`)"
         service = "service-1"
         # will route TLS requests (and ignore non tls requests)
         [tcp.routers.Router-1.tls]
@@ -673,7 +666,7 @@ If you want to limit the router scope to a set of entry points, set the entry po
       routers:
         Router-1:
           # By default, routers listen to every entrypoints
-          rule: "HostSNI(`example.com`)"
+          rule: "HostSNI(`traefik.io`)"
           service: "service-1"
           # will route TLS requests (and ignore non tls requests)
           tls: {}
@@ -722,7 +715,7 @@ If you want to limit the router scope to a set of entry points, set the entry po
       [tcp.routers.Router-1]
         # won't listen to entry point web
         entryPoints = ["websecure", "other"]
-        rule = "HostSNI(`example.com`)"
+        rule = "HostSNI(`traefik.io`)"
         service = "service-1"
         # will route TLS requests (and ignore non tls requests)
         [tcp.routers.Router-1.tls]
@@ -737,7 +730,7 @@ If you want to limit the router scope to a set of entry points, set the entry po
           entryPoints:
             - "websecure"
             - "other"
-          rule: "HostSNI(`example.com`)"
+          rule: "HostSNI(`traefik.io`)"
           service: "service-1"
           # will route TLS requests (and ignore non tls requests)
           tls: {}
@@ -799,12 +792,11 @@ Services are the target for the router.
 
 #### General
 
-When a TLS section is specified,
-it instructs Traefik that the current router is dedicated to TLS requests only (and that the router should ignore non-TLS requests).
+ When a TLS section is specified, it instructs Traefik that the current router is dedicated to TLS requests only (and that the router should ignore non-TLS requests).
+ 
+ By default, Traefik will terminate the SSL connections (meaning that it will send decrypted data to the services), but Traefik can be configured in order to let the requests pass through (keeping the data encrypted), and be forwarded to the service "as is". 
 
-By default, a router with a TLS section will terminate the TLS connections, meaning that it will send decrypted data to the services.
-
-??? example "Router for TLS requests"
+??? example "Configuring TLS Termination"
 
     ```toml tab="File (TOML)"
     ## Dynamic configuration
@@ -827,13 +819,6 @@ By default, a router with a TLS section will terminate the TLS connections, mean
           tls: {}
     ```
 
-#### `passthrough`
-
-As seen above, a TLS router will terminate the TLS connection by default.
-However, the `passthrough` option can be specified to set whether the requests should be forwarded "as is", keeping all data encrypted.
-
-It defaults to `false`.
-
 ??? example "Configuring passthrough"
 
     ```toml tab="File (TOML)"
@@ -879,8 +864,8 @@ It refers to a [TLS Options](../../https/tls.md#tls-options) and will be applied
         minVersion = "VersionTLS12"
         cipherSuites = [
           "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
-          "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256",
-          "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256",
+          "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305",
+          "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305",
           "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
           "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
         ]
@@ -903,8 +888,8 @@ It refers to a [TLS Options](../../https/tls.md#tls-options) and will be applied
           minVersion: VersionTLS12
           cipherSuites:
             - TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
-            - TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256
-            - TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
+            - TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
+            - TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305
             - TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
             - TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
     ```
@@ -961,157 +946,3 @@ tcp:
             sans: 
               - "*.snitest.com"
 ```
-
-## Configuring UDP Routers
-
-!!! warning "The character `@` is not allowed in the router name"
-
-### General
-
-Similarly to TCP, as UDP is the transport layer, there is no concept of a request,
-so there is no notion of an URL path prefix to match an incoming UDP packet with.
-Furthermore, as there is no good TLS support at the moment for multiple hosts,
-there is no Host SNI notion to match against either.
-Therefore, there is no criterion that could be used as a rule to match incoming packets in order to route them.
-So UDP "routers" at this time are pretty much only load-balancers in one form or another.
-
-!!! important "Sessions and timeout"
-
-	Even though UDP is connectionless (and because of that),
-	the implementation of an UDP router in Traefik relies on what we (and a couple of other implementations) call a `session`.
-	It basically means that some state is kept about an ongoing communication between a client and a backend,
-	notably so that the proxy knows where to forward a response packet from a backend.
-	As expected, a `timeout` is associated to each of these sessions,
-	so that they get cleaned out if they go through a period of inactivity longer than a given duration (that is hardcoded to 3 seconds for now).
-	Making this timeout configurable will be considered later if we get more usage feedback on this matter.
-
-### EntryPoints
-
-If not specified, UDP routers will accept packets from all defined (UDP) entry points.
-If one wants to limit the router scope to a set of entry points, one should set the entry points option.
-
-??? example "Listens to Every Entry Point"
-
-    **Dynamic Configuration**
-
-    ```toml tab="File (TOML)"
-    ## Dynamic configuration
-
-    [udp.routers]
-      [udp.routers.Router-1]
-        # By default, routers listen to all UDP entrypoints,
-        # i.e. "other", and "streaming".
-        service = "service-1"
-    ```
-
-    ```yaml tab="File (YAML)"
-    ## Dynamic configuration
-
-    udp:
-      routers:
-        Router-1:
-          # By default, routers listen to all UDP entrypoints
-          # i.e. "other", and "streaming".
-          service: "service-1"
-    ```
-
-    **Static Configuration**
-
-    ```toml tab="File (TOML)"
-    ## Static configuration
-
-    [entryPoints]
-      # not used by UDP routers
-      [entryPoints.web]
-        address = ":80"
-      # used by UDP routers
-      [entryPoints.other]
-        address = ":9090/udp"
-      [entryPoints.streaming]
-        address = ":9191/udp"
-    ```
-
-    ```yaml tab="File (YAML)"
-    ## Static configuration
-
-    entryPoints:
-      # not used by UDP routers
-      web:
-        address: ":80"
-      # used by UDP routers
-      other:
-        address: ":9090/udp"
-      streaming:
-        address: ":9191/udp"
-    ```
-
-    ```bash tab="CLI"
-    ## Static configuration
-    --entrypoints.web.address=":80"
-    --entrypoints.other.address=":9090/udp"
-    --entrypoints.streaming.address=":9191/udp"
-    ```
-
-??? example "Listens to Specific Entry Points"
-
-    **Dynamic Configuration**
-
-    ```toml tab="File (TOML)"
-    ## Dynamic configuration
-    [udp.routers]
-      [udp.routers.Router-1]
-        # does not listen on "other" entry point
-        entryPoints = ["streaming"]
-        service = "service-1"
-    ```
-
-    ```yaml tab="File (YAML)"
-    ## Dynamic configuration
-    udp:
-      routers:
-        Router-1:
-          # does not listen on "other" entry point
-          entryPoints:
-            - "streaming"
-          service: "service-1"
-    ```
-
-    **Static Configuration**
-
-    ```toml tab="File (TOML)"
-    ## Static configuration
-
-    [entryPoints]
-      [entryPoints.web]
-        address = ":80"
-      [entryPoints.other]
-        address = ":9090/udp"
-      [entryPoints.streaming]
-        address = ":9191/udp"
-    ```
-
-    ```yaml tab="File (YAML)"
-    ## Static configuration
-
-    entryPoints:
-      web:
-        address: ":80"
-      other:
-        address: ":9090/udp"
-      streaming:
-        address: ":9191/udp"
-    ```
-
-    ```bash tab="CLI"
-    ## Static configuration
-    --entrypoints.web.address=":80"
-    --entrypoints.other.address=":9090/udp"
-    --entrypoints.streaming.address=":9191/udp"
-    ```
-
-### Services
-
-There must be one (and only one) UDP [service](../services/index.md) referenced per UDP router.
-Services are the target for the router.
-
-!!! important "UDP routers can only target UDP services (and not HTTP or TCP services)."

docs/content/routing/services/index.md

@@ -55,28 +55,6 @@ The `Services` are responsible for configuring how to reach the actual services
             - address: "<private-ip-server-2>:<private-port-server-2>"
     ```
 
-??? example "Declaring a UDP Service with Two Servers -- Using the [File Provider](../../providers/file.md)"
-
-    ```toml tab="TOML"
-    ## Dynamic configuration
-    [udp.services]
-      [udp.services.my-service.loadBalancer]
-         [[udp.services.my-service.loadBalancer.servers]]
-           address = "<private-ip-server-1>:<private-port-server-1>"
-         [[udp.services.my-service.loadBalancer.servers]]
-           address = "<private-ip-server-2>:<private-port-server-2>"
-    ```
-
-    ```yaml tab="YAML"
-    udp:
-      services:
-        my-service:
-          loadBalancer:
-            servers:
-            - address: "<private-ip-server-1>:<private-port-server-1>"
-            - address: "<private-ip-server-2>:<private-port-server-2>"
-    ```
-
 ## Configuring HTTP Services
 
 ### Servers Load Balancer
@@ -167,12 +145,8 @@ For now, only round robin load balancing is supported:
 
 #### Sticky sessions
 
-When sticky sessions are enabled, a cookie is set on the initial request and response to let the client know which server handles the first response.
-On subsequent requests, to keep the session alive with the same server, the client should resend the same cookie.
-
-!!! info "Stickiness on multiple levels"
-
-    When chaining or mixing load-balancers (e.g. a load-balancer of servers is one of the "children" of a load-balancer of services), for stickiness to work all the way, the option needs to be specified at all required levels. Which means the client needs to send a cookie with as many key/value pairs as there are sticky levels.
+When sticky sessions are enabled, a cookie is set on the initial request to track which server handles the first response.
+On subsequent requests, the client is forwarded to the same server.
 
 !!! info "Stickiness & Unhealthy Servers"
 
@@ -234,80 +208,6 @@ On subsequent requests, to keep the session alive with the same server, the clie
                 httpOnly: true
     ```
 
-??? example "Setting Stickiness on all the required levels -- Using the [File Provider](../../providers/file.md)"
-
-    ```toml tab="TOML"
-    ## Dynamic configuration
-    [http.services]
-      [http.services.wrr1]
-        [http.services.wrr1.weighted.sticky.cookie]
-          name = "lvl1"
-        [[http.services.wrr1.weighted.services]]
-          name = "whoami1"
-          weight = 1
-        [[http.services.wrr1.weighted.services]]
-          name = "whoami2"
-          weight = 1
-
-      [http.services.whoami1]
-        [http.services.whoami1.loadBalancer]
-          [http.services.whoami1.loadBalancer.sticky.cookie]
-            name = "lvl2"
-          [[http.services.whoami1.loadBalancer.servers]]
-            url = "http://127.0.0.1:8081"
-          [[http.services.whoami1.loadBalancer.servers]]
-            url = "http://127.0.0.1:8082"
-
-      [http.services.whoami2]
-        [http.services.whoami2.loadBalancer]
-          [http.services.whoami2.loadBalancer.sticky.cookie]
-            name = "lvl2"
-          [[http.services.whoami2.loadBalancer.servers]]
-            url = "http://127.0.0.1:8083"
-          [[http.services.whoami2.loadBalancer.servers]]
-            url = "http://127.0.0.1:8084"
-    ```
-
-    ```yaml tab="YAML"
-    ## Dynamic configuration
-    http:
-      services:
-        wrr1:
-          weighted:
-            sticky:
-              cookie:
-                name: lvl1
-            services:
-              - name: whoami1
-                weight: 1
-              - name: whoami2
-                weight: 1
-
-        whoami1:
-          loadBalancer:
-            sticky:
-              cookie:
-                name: lvl2
-            servers:
-              - url: http://127.0.0.1:8081
-              - url: http://127.0.0.1:8082
-
-        whoami2:
-          loadBalancer:
-            sticky:
-              cookie:
-                name: lvl2
-            servers:
-              - url: http://127.0.0.1:8083
-              - url: http://127.0.0.1:8084
-    ```
-
-    To keep a session open with the same server, the client would then need to specify the two levels within the cookie for each request, e.g. with curl:
-    
-    ```
-    curl -b "lvl1=whoami1; lvl2=http://127.0.0.1:8081" http://localhost:8000
-    ```
-
 #### Health Check
 
 Configure health check to remove unhealthy servers from the load balancing rotation.
@@ -322,7 +222,6 @@ Below are the available options for the health check mechanism:
 - `interval` defines the frequency of the health check calls.
 - `timeout` defines the maximum duration Traefik will wait for a health check request before considering the server failed (unhealthy).
 - `headers` defines custom headers to be sent to the health check endpoint.
-- `followRedirects` defines whether redirects should be followed during the health check calls (default: true).
 
 !!! info "Interval & Timeout Format"
 
@@ -334,12 +233,6 @@ Below are the available options for the health check mechanism:
     Traefik keeps monitoring the health of unhealthy servers.
     If a server has recovered (returning `2xx` -> `3xx` responses again), it will be added back to the load balacer rotation pool.
 
-!!! warning "Health check in Kubernetes"
-
-    The Traefik health check is not available for `kubernetesCRD` and `kubernetesIngress` providers because Kubernetes
-    already has a health check mechanism.
-    Unhealthy pods will be removed by kubernetes. (cf [liveness documentation](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#define-a-liveness-http-request))
-
 ??? example "Custom Interval & Timeout -- Using the [File Provider](../../providers/file.md)"
 
     ```toml tab="TOML"
@@ -550,8 +443,6 @@ http:
 ### Mirroring (service)
 
 The mirroring is able to mirror requests sent to a service to other services.
-Please note that by default the whole request is buffered in memory while it is being mirrored.
-See the maxBodySize option in the example below for how to modify this behaviour.
 
 !!! info "Supported Providers"
     
@@ -563,10 +454,6 @@ See the maxBodySize option in the example below for how to modify this behaviour
   [http.services.mirrored-api]
     [http.services.mirrored-api.mirroring]
       service = "appv1"
-      # maxBodySize is the maximum size in bytes allowed for the body of the request.
-      # If the body is larger, the request is not mirrored.
-      # Default value is -1, which means unlimited size.
-      maxBodySize = 1024
     [[http.services.mirrored-api.mirroring.mirrors]]
       name = "appv2"
       percent = 10
@@ -589,10 +476,6 @@ http:
     mirrored-api:
       mirroring:
         service: appv1
-        # maxBodySize is the maximum size allowed for the body of the request.
-        # If the body is larger, the request is not mirrored.
-        # Default value is -1, which means unlimited size.
-        maxBodySize = 1024
         mirrors:
         - name: appv2
           percent: 10
@@ -756,117 +639,3 @@ tcp:
         servers:
         - address: "xxx.xxx.xxx.xxx:8080"
 ```
-
-## Configuring UDP Services
-
-### General
-
-Each of the fields of the service section represents a kind of service.
-Which means, that for each specified service, one of the fields, and only one,
-has to be enabled to define what kind of service is created.
-Currently, the two available kinds are `LoadBalancer`, and `Weighted`.
-
-### Servers Load Balancer
-
-The servers load balancer is in charge of balancing the requests between the servers of the same service.
-
-??? example "Declaring a Service with Two Servers -- Using the [File Provider](../../providers/file.md)"
-
-    ```toml tab="TOML"
-    ## Dynamic configuration
-    [udp.services]
-      [udp.services.my-service.loadBalancer]
-        [[udp.services.my-service.loadBalancer.servers]]
-          address = "xx.xx.xx.xx:xx"
-        [[udp.services.my-service.loadBalancer.servers]]
-          address = "xx.xx.xx.xx:xx"
-    ```
-
-    ```yaml tab="YAML"
-    ## Dynamic configuration
-    udp:
-      services:
-        my-service:
-          loadBalancer:
-            servers:
-            - address: "xx.xx.xx.xx:xx"
-            - address: "xx.xx.xx.xx:xx"
-    ```
-
-#### Servers
-
-The Servers field defines all the servers that are part of this load-balancing group,
-i.e. each address (IP:Port) on which an instance of the service's program is deployed.
-
-??? example "A Service with One Server -- Using the [File Provider](../../providers/file.md)"
-
-    ```toml tab="TOML"
-    ## Dynamic configuration
-    [udp.services]
-      [udp.services.my-service.loadBalancer]
-        [[udp.services.my-service.loadBalancer.servers]]
-          address = "xx.xx.xx.xx:xx"
-    ```
-
-    ```yaml tab="YAML"
-    ## Dynamic configuration
-    udp:
-      services:
-        my-service:
-          loadBalancer:
-            servers:
-              - address: "xx.xx.xx.xx:xx"
-    ```
-
-### Weighted Round Robin
-
-The Weighted Round Robin (alias `WRR`) load-balancer of services is in charge of balancing the requests between multiple services based on provided weights.
-
-This strategy is only available to load balance between [services](./index.md) and not between [servers](./index.md#servers).
-
-This strategy can only be defined with [File](../../providers/file.md).
-
-```toml tab="TOML"
-## Dynamic configuration
-[udp.services]
-  [udp.services.app]
-    [[udp.services.app.weighted.services]]
-      name = "appv1"
-      weight = 3
-    [[udp.services.app.weighted.services]]
-      name = "appv2"
-      weight = 1
-
-  [udp.services.appv1]
-    [udp.services.appv1.loadBalancer]
-      [[udp.services.appv1.loadBalancer.servers]]
-        address = "private-ip-server-1:8080/"
-
-  [udp.services.appv2]
-    [udp.services.appv2.loadBalancer]
-      [[udp.services.appv2.loadBalancer.servers]]
-        address = "private-ip-server-2:8080/"
-```
-
-```yaml tab="YAML"
-## Dynamic configuration
-udp:
-  services:
-    app:
-      weighted:
-        services:
-        - name: appv1
-          weight: 3
-        - name: appv2
-          weight: 1
-
-    appv1:
-      loadBalancer:
-        servers:
-        - address: "xxx.xxx.xxx.xxx:8080"
-
-    appv2:
-      loadBalancer:
-        servers:
-        - address: "xxx.xxx.xxx.xxx:8080"
-```

docs/content/user-guides/crd-acme/01-crd.yml

@@ -0,0 +1,160 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: ingressroutes.traefik.containo.us
+
+spec:
+  group: traefik.containo.us
+  version: v1alpha1
+  names:
+    kind: IngressRoute
+    plural: ingressroutes
+    singular: ingressroute
+  scope: Namespaced
+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: ingressroutetcps.traefik.containo.us
+
+spec:
+  group: traefik.containo.us
+  version: v1alpha1
+  names:
+    kind: IngressRouteTCP
+    plural: ingressroutetcps
+    singular: ingressroutetcp
+  scope: Namespaced
+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: middlewares.traefik.containo.us
+
+spec:
+  group: traefik.containo.us
+  version: v1alpha1
+  names:
+    kind: Middleware
+    plural: middlewares
+    singular: middleware
+  scope: Namespaced
+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: tlsoptions.traefik.containo.us
+
+spec:
+  group: traefik.containo.us
+  version: v1alpha1
+  names:
+    kind: TLSOption
+    plural: tlsoptions
+    singular: tlsoption
+  scope: Namespaced
+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: traefikservices.traefik.containo.us
+
+spec:
+  group: traefik.containo.us
+  version: v1alpha1
+  names:
+    kind: TraefikService
+    plural: traefikservices
+    singular: traefikservice
+  scope: Namespaced
+
+---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1beta1
+metadata:
+  name: traefik-ingress-controller
+
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - services
+      - endpoints
+      - secrets
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - extensions
+    resources:
+      - ingresses
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - extensions
+    resources:
+      - ingresses/status
+    verbs:
+      - update
+  - apiGroups:
+      - traefik.containo.us
+    resources:
+      - middlewares
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - traefik.containo.us
+    resources:
+      - ingressroutes
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - traefik.containo.us
+    resources:
+      - ingressroutetcps
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - traefik.containo.us
+    resources:
+      - tlsoptions
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - traefik.containo.us
+    resources:
+      - traefikservices
+    verbs:
+      - get
+      - list
+      - watch
+
+---
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1beta1
+metadata:
+  name: traefik-ingress-controller
+
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: traefik-ingress-controller
+subjects:
+  - kind: ServiceAccount
+    name: traefik-ingress-controller
+    namespace: default

docs/content/user-guides/crd-acme/03-deployments.yml

@@ -26,7 +26,7 @@ spec:
       serviceAccountName: traefik-ingress-controller
       containers:
         - name: traefik
-          image: traefik:v2.2
+          image: traefik:v2.1
           args:
             - --api.insecure
             - --accesslog

docs/content/user-guides/crd-acme/04-ingressroutes.yml

@@ -7,7 +7,7 @@ spec:
   entryPoints:
     - web
   routes:
-  - match: Host(`your.example.com`) && PathPrefix(`/notls`)
+  - match: Host(`your.domain.com`) && PathPrefix(`/notls`)
     kind: Rule
     services:
     - name: whoami
@@ -23,7 +23,7 @@ spec:
   entryPoints:
     - websecure
   routes:
-  - match: Host(`your.example.com`) && PathPrefix(`/tls`)
+  - match: Host(`your.domain.com`) && PathPrefix(`/tls`)
     kind: Rule
     services:
     - name: whoami

docs/content/user-guides/crd-acme/index.md

@@ -43,10 +43,7 @@ First, the definition of the `IngressRoute` and the `Middleware` kinds.
 Also note the RBAC authorization resources; they'll be referenced through the `serviceAccountName` of the deployment, later on.
 
 ```yaml
---8<-- "content/reference/dynamic-configuration/kubernetes-crd-definition.yml"
-
----
---8<-- "content/reference/dynamic-configuration/kubernetes-crd-rbac.yml"
+--8<-- "content/user-guides/crd-acme/01-crd.yml"
 ```
 
 ### Services
@@ -97,11 +94,11 @@ Give it a few seconds for the ACME TLS challenge to complete, and you should the
 Both with or (just for fun, do not do that in production) without TLS:
 
 ```bash
-curl [-k] https://your.example.com/tls
+curl [-k] https://your.domain.com/tls
 ```
 
 ```bash
-curl http://your.example.com:8000/notls
+curl [-k] http://your.domain.com:8000/notls
 ```
 
 Note that you'll have to use `-k` as long as you're using the staging server of Let's Encrypt, since it is not an authorized certificate authority on systems where it hasn't been manually added.

docs/content/user-guides/crd-acme/k3s.yml

@@ -1,5 +1,5 @@
 server:
-  image: rancher/k3s:v1.17.2-k3s1
+  image: rancher/k3s:v0.8.0
   command: server --disable-agent --no-deploy traefik
   environment:
     - K3S_CLUSTER_SECRET=somethingtotallyrandom
@@ -17,7 +17,7 @@ server:
     - 6443:6443
 
 node:
-  image: rancher/k3s:v1.17.2-k3s1
+  image: rancher/k3s:v0.8.0
   privileged: true
   links:
     - server
@@ -26,5 +26,5 @@ node:
     - K3S_CLUSTER_SECRET=somethingtotallyrandom
   volumes:
     # this is where you would place a alternative traefik image (saved as a .tar file with
-    # 'docker save'), if you want to use it, instead of the traefik:v2.2 image.
+    # 'docker save'), if you want to use it, instead of the traefik:v2.1 image.
     - /sowewhere/on/your/host/custom-image:/var/lib/rancher/k3s/agent/images

docs/content/user-guides/docker-compose/acme-dns/docker-compose.yml

@@ -3,7 +3,7 @@ version: "3.3"
 services:
 
   traefik:
-    image: "traefik:v2.2"
+    image: "traefik:v2.1"
     container_name: "traefik"
     command:
       #- "--log.level=DEBUG"
@@ -15,7 +15,7 @@ services:
       - "--certificatesresolvers.myresolver.acme.dnschallenge=true"
       - "--certificatesresolvers.myresolver.acme.dnschallenge.provider=ovh"
       #- "--certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory"
-      - "--certificatesresolvers.myresolver.acme.email=postmaster@example.com"
+      - "--certificatesresolvers.myresolver.acme.email=postmaster@mydomain.com"
       - "--certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json"
     ports:
       - "80:80"
@@ -35,6 +35,6 @@ services:
     container_name: "simple-service"
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.whoami.rule=Host(`whoami.example.com`)"
+      - "traefik.http.routers.whoami.rule=Host(`whoami.mydomain.com`)"
       - "traefik.http.routers.whoami.entrypoints=websecure"
       - "traefik.http.routers.whoami.tls.certresolver=myresolver"

docs/content/user-guides/docker-compose/acme-dns/docker-compose_secrets.yml

@@ -13,7 +13,7 @@ secrets:
 services:
 
   traefik:
-    image: "traefik:v2.2"
+    image: "traefik:v2.1"
     container_name: "traefik"
     command:
       #- "--log.level=DEBUG"
@@ -25,7 +25,7 @@ services:
       - "--certificatesresolvers.myresolver.acme.dnschallenge=true"
       - "--certificatesresolvers.myresolver.acme.dnschallenge.provider=ovh"
       #- "--certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory"
-      - "--certificatesresolvers.myresolver.acme.email=postmaster@example.com"
+      - "--certificatesresolvers.myresolver.acme.email=postmaster@mydomain.com"
       - "--certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json"
     ports:
       - "80:80"
@@ -50,6 +50,6 @@ services:
     container_name: "simple-service"
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.whoami.rule=Host(`whoami.example.com`)"
+      - "traefik.http.routers.whoami.rule=Host(`whoami.mydomain.com`)"
       - "traefik.http.routers.whoami.entrypoints=websecure"
       - "traefik.http.routers.whoami.tls.certresolver=myresolver"

docs/content/user-guides/docker-compose/acme-dns/index.md

@@ -32,8 +32,8 @@ For the DNS challenge, you'll need:
       - "OVH_CONSUMER_KEY=[YOUR_OWN_VALUE]"
     ```
 
-- Replace `postmaster@example.com` by your **own email** within the `certificatesresolvers.myresolver.acme.email` command line argument of the `traefik` service.
-- Replace `whoami.example.com` by your **own domain** within the `traefik.http.routers.whoami.rule` label of the `whoami` service.
+- Replace `postmaster@mydomain.com` by your **own email** within the `certificatesresolvers.myresolver.acme.email` command line argument of the `traefik` service.
+- Replace `whoami.mydomain.com` by your **own domain** within the `traefik.http.routers.whoami.rule` label of the `whoami` service.
 - Optionally uncomment the following lines if you want to test/debug: 
 
 	```yaml
@@ -73,7 +73,7 @@ command:
   # Tell which provider to use
   - "--certificatesresolvers.myresolver.acme.dnschallenge.provider=ovh"
   # The email to provide to let's encrypt
-  - "--certificatesresolvers.myresolver.acme.email=postmaster@example.com"
+  - "--certificatesresolvers.myresolver.acme.email=postmaster@mydomain.com"
 ```
 
 - We provide the required configuration to our provider via environment variables: 
@@ -131,7 +131,7 @@ The point is to manage those secret files by another mean, and read them from th
 !!! Note
 
     You could store those secrets anywhere on the server,
-    just make sure to use the proper path for the `file` directive for the secrets definition in the `docker-compose.yml` file.
+    just make sure to use the proper path for the `file` directive fo the secrets definition in the `docker-compose.yml` file.
 
 - Use this `docker-compose.yml` file:
 
@@ -141,7 +141,7 @@ The point is to manage those secret files by another mean, and read them from th
 
 !!! Note
 
-    Still think about changing `postmaster@example.com` & `whoami.example.com` by your own values.
+    Still think about changing `postmaster@mydomain.com` & `whoami.mydomain.com` by your own values.
 
 Let's explain a bit what we just did:
 

docs/content/user-guides/docker-compose/acme-http/docker-compose.yml

@@ -3,7 +3,7 @@ version: "3.3"
 services:
 
   traefik:
-    image: "traefik:v2.2"
+    image: "traefik:v2.1"
     container_name: "traefik"
     command:
       #- "--log.level=DEBUG"
@@ -15,7 +15,7 @@ services:
       - "--certificatesresolvers.myresolver.acme.httpchallenge=true"
       - "--certificatesresolvers.myresolver.acme.httpchallenge.entrypoint=web"
       #- "--certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory"
-      - "--certificatesresolvers.myresolver.acme.email=postmaster@example.com"
+      - "--certificatesresolvers.myresolver.acme.email=postmaster@mydomain.com"
       - "--certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json"
     ports:
       - "80:80"
@@ -30,6 +30,6 @@ services:
     container_name: "simple-service"
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.whoami.rule=Host(`whoami.example.com`)"
+      - "traefik.http.routers.whoami.rule=Host(`whoami.mydomain.com`)"
       - "traefik.http.routers.whoami.entrypoints=websecure"
       - "traefik.http.routers.whoami.tls.certresolver=myresolver"

docs/content/user-guides/docker-compose/acme-http/index.md

@@ -18,8 +18,8 @@ For the HTTP challenge you will need:
 --8<-- "content/user-guides/docker-compose/acme-http/docker-compose.yml"
 ```
 
-- Replace `postmaster@example.com` by your **own email** within the `certificatesresolvers.myresolver.acme.email` command line argument of the `traefik` service.
-- Replace `whoami.example.com` by your **own domain** within the `traefik.http.routers.whoami.rule` label of the `whoami` service.
+- Replace `postmaster@mydomain.com` by your **own email** within the `certificatesresolvers.myresolver.acme.email` command line argument of the `traefik` service.
+- Replace `whoami.mydomain.com` by your **own domain** within the `traefik.http.routers.whoami.rule` label of the `whoami` service.
 - Optionally uncomment the following lines if you want to test/debug:
 
 	```yaml
@@ -59,7 +59,7 @@ command:
   # Tell it to use our predefined entrypoint named "web"
   - "--certificatesresolvers.myresolver.acme.httpchallenge.entrypoint=web"
   # The email to provide to let's encrypt
-  - "--certificatesresolvers.myresolver.acme.email=postmaster@example.com"
+  - "--certificatesresolvers.myresolver.acme.email=postmaster@mydomain.com"
 ```
 
 - We add a volume to store our certificates:

docs/content/user-guides/docker-compose/acme-tls/docker-compose.yml

@@ -3,7 +3,7 @@ version: "3.3"
 services:
 
   traefik:
-    image: "traefik:v2.2"
+    image: "traefik:v2.1"
     container_name: "traefik"
     command:
       #- "--log.level=DEBUG"
@@ -13,7 +13,7 @@ services:
       - "--entrypoints.websecure.address=:443"
       - "--certificatesresolvers.myresolver.acme.tlschallenge=true"
       #- "--certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory"
-      - "--certificatesresolvers.myresolver.acme.email=postmaster@example.com"
+      - "--certificatesresolvers.myresolver.acme.email=postmaster@mydomain.com"
       - "--certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json"
     ports:
       - "443:443"
@@ -27,6 +27,6 @@ services:
     container_name: "simple-service"
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.whoami.rule=Host(`whoami.example.com`)"
+      - "traefik.http.routers.whoami.rule=Host(`whoami.mydomain.com`)"
       - "traefik.http.routers.whoami.entrypoints=websecure"
       - "traefik.http.routers.whoami.tls.certresolver=myresolver"

docs/content/user-guides/docker-compose/acme-tls/index.md

@@ -18,8 +18,8 @@ For the TLS challenge you will need:
 --8<-- "content/user-guides/docker-compose/acme-tls/docker-compose.yml"
 ```
 
-- Replace `postmaster@example.com` by your **own email** within the `certificatesresolvers.myresolver.acme.email` command line argument of the `traefik` service.
-- Replace `whoami.example.com` by your **own domain** within the `traefik.http.routers.whoami.rule` label of the `whoami` service.
+- Replace `postmaster@mydomain.com` by your **own email** within the `certificatesresolvers.myresolver.acme.email` command line argument of the `traefik` service.
+- Replace `whoami.mydomain.com` by your **own domain** within the `traefik.http.routers.whoami.rule` label of the `whoami` service.
 - Optionally uncomment the following lines if you want to test/debug:
 
 	```yaml

docs/content/user-guides/docker-compose/basic-example/docker-compose.yml

@@ -3,7 +3,7 @@ version: "3.3"
 services:
 
   traefik:
-    image: "traefik:v2.2"
+    image: "traefik:v2.1"
     container_name: "traefik"
     command:
       #- "--log.level=DEBUG"