kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

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

Browse source 
These were no longer used.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-09-23 19:10:35 +02:00
parent 67da3f7e6b
commit a8a8bd1e42
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
6 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
daemon/daemon.go
View file

@ -1374,7 +1374,6 @@ func (daemon *Daemon) networkOptions(pg plugingetter.PluginGetter, activeSandbox
dd := runconfig.DefaultDaemonNetworkMode() dd := runconfig.DefaultDaemonNetworkMode()
options = []nwconfig.Option{ options = []nwconfig.Option{
nwconfig.OptionExperimental(conf.Experimental),
nwconfig.OptionDataDir(conf.Root), nwconfig.OptionDataDir(conf.Root),
nwconfig.OptionExecRoot(conf.GetExecRoot()), nwconfig.OptionExecRoot(conf.GetExecRoot()),
nwconfig.OptionDefaultDriver(string(dd)), nwconfig.OptionDefaultDriver(string(dd)),

10
libnetwork/config/config.go
View file

@ -30,8 +30,6 @@ type Config struct {
// DaemonCfg represents libnetwork core configuration // DaemonCfg represents libnetwork core configuration
type DaemonCfg struct { type DaemonCfg struct {
Debug bool
Experimental bool
DataDir string DataDir string
ExecRoot string ExecRoot string
DefaultNetwork 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 // OptionNetworkControlPlaneMTU function returns an option setter for control plane MTU
func OptionNetworkControlPlaneMTU(exp int) Option { func OptionNetworkControlPlaneMTU(exp int) Option {
return func(c *Config) { return func(c *Config) {

2
libnetwork/controller.go
View file

@ -205,7 +205,7 @@ func New(cfgOptions ...config.Option) (NetworkController, error) {
return nil, err return nil, err
} }
for _, i := range getInitializers(c.cfg.Daemon.Experimental) { for _, i := range getInitializers() {
var dcfg map[string]interface{} var dcfg map[string]interface{}
// External plugins don't need config passed through daemon. They can // External plugins don't need config passed through daemon. They can

2
libnetwork/drivers_freebsd.go
View file

@ -5,7 +5,7 @@ import (
"github.com/docker/docker/libnetwork/drivers/remote" "github.com/docker/docker/libnetwork/drivers/remote"
) )
func getInitializers(experimental bool) []initializer { func getInitializers() []initializer {
return []initializer{ return []initializer{
{null.Init, "null"}, {null.Init, "null"},
{remote.Init, "remote"}, {remote.Init, "remote"},

2
libnetwork/drivers_linux.go
View file

@ -10,7 +10,7 @@ import (
"github.com/docker/docker/libnetwork/drivers/remote" "github.com/docker/docker/libnetwork/drivers/remote"
) )
func getInitializers(experimental bool) []initializer { func getInitializers() []initializer {
in := []initializer{ in := []initializer{
{bridge.Init, "bridge"}, {bridge.Init, "bridge"},
{host.Init, "host"}, {host.Init, "host"},

2
libnetwork/drivers_windows.go
View file

@ -7,7 +7,7 @@ import (
"github.com/docker/docker/libnetwork/drivers/windows/overlay" "github.com/docker/docker/libnetwork/drivers/windows/overlay"
) )
func getInitializers(experimental bool) []initializer { func getInitializers() []initializer {
return []initializer{ return []initializer{
{null.Init, "null"}, {null.Init, "null"},
{overlay.Init, "overlay"}, {overlay.Init, "overlay"},