Merge 'v2.3' into master.

2020-10-08 14:03:30 +02:00 · 2020-10-08 14:03:30 +02:00 · afcec56be4
commit afcec56be4
parent 326be29568 d2435cf43b
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"
--- a/docs/content/reference/static-configuration/file.yaml
+++ b/docs/content/reference/static-configuration/file.yaml
@ -270,6 +270,8 @@ metrics:
    password: foobar
    addEntryPointsLabels: true
    addServicesLabels: true
+pilot:
+  token: foobar
 ping:
  entryPoint: foobar
  manualRouting: true
@ -384,8 +386,6 @@ certificatesResolvers:
        entryPoint: foobar
      tlsChallenge: {}
 experimental:
-  pilot:
-    token: foobar
  plugins:
    Descriptor0:
      moduleName: foobar