Merge current branch v2.4 into master

2021-03-31 09:43:04 +02:00
parent d13d078351 513f6e9a68
commit cb4fb973b2
41 changed files with 1857 additions and 1424 deletions
--- a/cmd/traefik/traefik.go
+++ b/cmd/traefik/traefik.go
@@ -224,6 +224,10 @@ func setupServer(staticConfiguration *static.Configuration) (*server.Server, err
 		})
 	}

+	if staticConfiguration.Pilot != nil {
+		version.PilotEnabled = staticConfiguration.Pilot.Dashboard
+	}
+
 	// Plugins

 	pluginBuilder, err := createPluginBuilder(staticConfiguration)