diff --git a/cmd/traefik/plugins.go b/cmd/traefik/plugins.go index 0f0e80079..8291a6c88 100644 --- a/cmd/traefik/plugins.go +++ b/cmd/traefik/plugins.go @@ -14,7 +14,7 @@ func initPlugins(staticCfg *static.Configuration) (*plugins.Client, map[string]p opts := plugins.ClientOptions{ Output: outputDir, - Token: staticCfg.Experimental.Pilot.Token, + Token: staticCfg.Pilot.Token, } client, err := plugins.NewClient(opts) @@ -31,9 +31,7 @@ func initPlugins(staticCfg *static.Configuration) (*plugins.Client, map[string]p } func isPilotEnabled(staticCfg *static.Configuration) bool { - return staticCfg.Experimental != nil && - staticCfg.Experimental.Pilot != nil && - staticCfg.Experimental.Pilot.Token != "" + return staticCfg.Pilot != nil && staticCfg.Pilot.Token != "" } func hasPlugins(staticCfg *static.Configuration) bool { diff --git a/cmd/traefik/traefik.go b/cmd/traefik/traefik.go index bb6ff11b2..15f88fb37 100644 --- a/cmd/traefik/traefik.go +++ b/cmd/traefik/traefik.go @@ -202,7 +202,7 @@ func setupServer(staticConfiguration *static.Configuration) (*server.Server, err if isPilotEnabled(staticConfiguration) { pilotRegistry := metrics.RegisterPilot() - aviator = pilot.New(staticConfiguration.Experimental.Pilot.Token, pilotRegistry, routinesPool) + aviator = pilot.New(staticConfiguration.Pilot.Token, pilotRegistry, routinesPool) routinesPool.GoCtx(func(ctx context.Context) { aviator.Tick(ctx) }) diff --git a/pkg/config/static/experimental.go b/pkg/config/static/experimental.go index 7b8794d52..8c0915e78 100644 --- a/pkg/config/static/experimental.go +++ b/pkg/config/static/experimental.go @@ -4,13 +4,6 @@ import "github.com/containous/traefik/v2/pkg/plugins" // Experimental experimental Traefik features. type Experimental struct { - Pilot *Pilot `description:"Traefik Pilot configuration." json:"pilot,omitempty" toml:"pilot,omitempty" yaml:"pilot,omitempty"` - Plugins map[string]plugins.Descriptor `description:"Plugins configuration." json:"plugins,omitempty" toml:"plugins,omitempty" yaml:"plugins,omitempty"` DevPlugin *plugins.DevPlugin `description:"Dev plugin configuration." json:"devPlugin,omitempty" toml:"devPlugin,omitempty" yaml:"devPlugin,omitempty"` } - -// Pilot Configuration related to Traefik Pilot. -type Pilot struct { - Token string `description:"Traefik Pilot token." json:"token,omitempty" toml:"token,omitempty" yaml:"token,omitempty"` -} diff --git a/pkg/config/static/pilot.go b/pkg/config/static/pilot.go new file mode 100644 index 000000000..eb56752ee --- /dev/null +++ b/pkg/config/static/pilot.go @@ -0,0 +1,6 @@ +package static + +// Pilot Configuration related to Traefik Pilot. +type Pilot struct { + Token string `description:"Traefik Pilot token." json:"token,omitempty" toml:"token,omitempty" yaml:"token,omitempty"` +} diff --git a/pkg/config/static/static_config.go b/pkg/config/static/static_config.go index 6b4aedf17..5c953fe1e 100644 --- a/pkg/config/static/static_config.go +++ b/pkg/config/static/static_config.go @@ -72,6 +72,8 @@ type Configuration struct { CertificatesResolvers map[string]CertificateResolver `description:"Certificates resolvers configuration." json:"certificatesResolvers,omitempty" toml:"certificatesResolvers,omitempty" yaml:"certificatesResolvers,omitempty" export:"true"` + Pilot *Pilot `description:"Traefik Pilot configuration." json:"pilot,omitempty" toml:"pilot,omitempty" yaml:"pilot,omitempty"` + Experimental *Experimental `description:"experimental features." json:"experimental,omitempty" toml:"experimental,omitempty" yaml:"experimental,omitempty"` }