Browse code

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

These were no longer used.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2022/09/24 02:10:35
Showing 6 changed files
... ...
@@ -1374,7 +1374,6 @@ func (daemon *Daemon) networkOptions(pg plugingetter.PluginGetter, activeSandbox
1374 1374
 	dd := runconfig.DefaultDaemonNetworkMode()
1375 1375
 
1376 1376
 	options = []nwconfig.Option{
1377
-		nwconfig.OptionExperimental(conf.Experimental),
1378 1377
 		nwconfig.OptionDataDir(conf.Root),
1379 1378
 		nwconfig.OptionExecRoot(conf.GetExecRoot()),
1380 1379
 		nwconfig.OptionDefaultDriver(string(dd)),
... ...
@@ -30,8 +30,6 @@ type Config struct {
30 30
 
31 31
 // DaemonCfg represents libnetwork core configuration
32 32
 type DaemonCfg struct {
33
-	Debug                  bool
34
-	Experimental           bool
35 33
 	DataDir                string
36 34
 	ExecRoot               string
37 35
 	DefaultNetwork         string
... ...
@@ -153,14 +151,6 @@ func OptionPluginGetter(pg plugingetter.PluginGetter) Option {
153 153
 	}
154 154
 }
155 155
 
156
-// OptionExperimental function returns an option setter for experimental daemon
157
-func OptionExperimental(exp bool) Option {
158
-	return func(c *Config) {
159
-		logrus.Debugf("Option Experimental: %v", exp)
160
-		c.Daemon.Experimental = exp
161
-	}
162
-}
163
-
164 156
 // OptionNetworkControlPlaneMTU function returns an option setter for control plane MTU
165 157
 func OptionNetworkControlPlaneMTU(exp int) Option {
166 158
 	return func(c *Config) {
... ...
@@ -205,7 +205,7 @@ func New(cfgOptions ...config.Option) (NetworkController, error) {
205 205
 		return nil, err
206 206
 	}
207 207
 
208
-	for _, i := range getInitializers(c.cfg.Daemon.Experimental) {
208
+	for _, i := range getInitializers() {
209 209
 		var dcfg map[string]interface{}
210 210
 
211 211
 		// External plugins don't need config passed through daemon. They can
... ...
@@ -5,7 +5,7 @@ import (
5 5
 	"github.com/docker/docker/libnetwork/drivers/remote"
6 6
 )
7 7
 
8
-func getInitializers(experimental bool) []initializer {
8
+func getInitializers() []initializer {
9 9
 	return []initializer{
10 10
 		{null.Init, "null"},
11 11
 		{remote.Init, "remote"},
... ...
@@ -10,7 +10,7 @@ import (
10 10
 	"github.com/docker/docker/libnetwork/drivers/remote"
11 11
 )
12 12
 
13
-func getInitializers(experimental bool) []initializer {
13
+func getInitializers() []initializer {
14 14
 	in := []initializer{
15 15
 		{bridge.Init, "bridge"},
16 16
 		{host.Init, "host"},
... ...
@@ -7,7 +7,7 @@ import (
7 7
 	"github.com/docker/docker/libnetwork/drivers/windows/overlay"
8 8
 )
9 9
 
10
-func getInitializers(experimental bool) []initializer {
10
+func getInitializers() []initializer {
11 11
 	return []initializer{
12 12
 		{null.Init, "null"},
13 13
 		{overlay.Init, "overlay"},