From a8a8bd1e42dca7160af2169ea6e6981eeaa100fa Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 23 Sep 2022 19:10:35 +0200 Subject: [PATCH] libnetwork/config: remove "Experimental" and "Debug" options These were no longer used. Signed-off-by: Sebastiaan van Stijn --- daemon/daemon.go | 1 - libnetwork/config/config.go | 10 ---------- libnetwork/controller.go | 2 +- libnetwork/drivers_freebsd.go | 2 +- libnetwork/drivers_linux.go | 2 +- libnetwork/drivers_windows.go | 2 +- 6 files changed, 4 insertions(+), 15 deletions(-) diff --git a/daemon/daemon.go b/daemon/daemon.go index bb38689fc1..46c37ec7d4 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -1374,7 +1374,6 @@ func (daemon *Daemon) networkOptions(pg plugingetter.PluginGetter, activeSandbox dd := runconfig.DefaultDaemonNetworkMode() options = []nwconfig.Option{ - nwconfig.OptionExperimental(conf.Experimental), nwconfig.OptionDataDir(conf.Root), nwconfig.OptionExecRoot(conf.GetExecRoot()), nwconfig.OptionDefaultDriver(string(dd)), diff --git a/libnetwork/config/config.go b/libnetwork/config/config.go index a33ffba338..d27b342c8a 100644 --- a/libnetwork/config/config.go +++ b/libnetwork/config/config.go @@ -30,8 +30,6 @@ type Config struct { // DaemonCfg represents libnetwork core configuration type DaemonCfg struct { - Debug bool - Experimental bool DataDir string ExecRoot string DefaultNetwork string @@ -153,14 +151,6 @@ func OptionPluginGetter(pg plugingetter.PluginGetter) Option { } } -// OptionExperimental function returns an option setter for experimental daemon -func OptionExperimental(exp bool) Option { - return func(c *Config) { - logrus.Debugf("Option Experimental: %v", exp) - c.Daemon.Experimental = exp - } -} - // OptionNetworkControlPlaneMTU function returns an option setter for control plane MTU func OptionNetworkControlPlaneMTU(exp int) Option { return func(c *Config) { diff --git a/libnetwork/controller.go b/libnetwork/controller.go index 27e49ebe0c..fe83dffd8b 100644 --- a/libnetwork/controller.go +++ b/libnetwork/controller.go @@ -205,7 +205,7 @@ func New(cfgOptions ...config.Option) (NetworkController, error) { return nil, err } - for _, i := range getInitializers(c.cfg.Daemon.Experimental) { + for _, i := range getInitializers() { var dcfg map[string]interface{} // External plugins don't need config passed through daemon. They can diff --git a/libnetwork/drivers_freebsd.go b/libnetwork/drivers_freebsd.go index 30ac1d50ad..05023a2f67 100644 --- a/libnetwork/drivers_freebsd.go +++ b/libnetwork/drivers_freebsd.go @@ -5,7 +5,7 @@ import ( "github.com/docker/docker/libnetwork/drivers/remote" ) -func getInitializers(experimental bool) []initializer { +func getInitializers() []initializer { return []initializer{ {null.Init, "null"}, {remote.Init, "remote"}, diff --git a/libnetwork/drivers_linux.go b/libnetwork/drivers_linux.go index 6357149245..022e5c76a9 100644 --- a/libnetwork/drivers_linux.go +++ b/libnetwork/drivers_linux.go @@ -10,7 +10,7 @@ import ( "github.com/docker/docker/libnetwork/drivers/remote" ) -func getInitializers(experimental bool) []initializer { +func getInitializers() []initializer { in := []initializer{ {bridge.Init, "bridge"}, {host.Init, "host"}, diff --git a/libnetwork/drivers_windows.go b/libnetwork/drivers_windows.go index 7dbf34ccbb..28db05759d 100644 --- a/libnetwork/drivers_windows.go +++ b/libnetwork/drivers_windows.go @@ -7,7 +7,7 @@ import ( "github.com/docker/docker/libnetwork/drivers/windows/overlay" ) -func getInitializers(experimental bool) []initializer { +func getInitializers() []initializer { return []initializer{ {null.Init, "null"}, {overlay.Init, "overlay"},