libnetwork/config: remove "Experimental" and "Debug" options

These were no longer used.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit a8a8bd1e42)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

daemon/daemon.go

@@ -1355,7 +1355,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)),

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) {

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

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"},

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"},

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"},