Merge 'v2.3' into master.

2020-10-08 14:03:30 +02:00
parent 326be29568 d2435cf43b
commit afcec56be4
27 changed files with 499 additions and 34 deletions
--- a/docs/content/reference/static-configuration/file.toml
+++ b/docs/content/reference/static-configuration/file.toml
@@ -251,6 +251,9 @@
    addEntryPointsLabels = true
    addServicesLabels = true

+[pilot]
+  token = "foobar"
+
 [ping]
  entryPoint = "foobar"
  manualRouting = true
@@ -365,8 +368,6 @@
      [certificatesResolvers.CertificateResolver1.acme.tlsChallenge]

 [experimental]
-  [experimental.pilot]
-    token = "foobar"
  [experimental.plugins]
    [experimental.plugins.Descriptor0]
      moduleName = "foobar"