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

daemon: simplify networking config

Browse source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2021-07-27 12:12:11 +02:00
parent 91dc595e96
commit e8e278c44f
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
3 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/daemon.go
View file

@ -1445,7 +1445,7 @@ func (daemon *Daemon) networkOptions(dconfig *config.Config, pg plugingetter.Plu
} }
options = append(options, nwconfig.OptionLabels(dconfig.Labels)) options = append(options, nwconfig.OptionLabels(dconfig.Labels))
options = append(options, driverOptions(dconfig)...) options = append(options, driverOptions(dconfig))
if len(dconfig.NetworkConfig.DefaultAddressPools.Value()) > 0 { if len(dconfig.NetworkConfig.DefaultAddressPools.Value()) > 0 {
options = append(options, nwconfig.OptionDefaultAddressPoolConfig(dconfig.NetworkConfig.DefaultAddressPools.Value())) options = append(options, nwconfig.OptionDefaultAddressPoolConfig(dconfig.NetworkConfig.DefaultAddressPools.Value()))

22
daemon/daemon_unix.go
View file

@ -918,18 +918,16 @@ func (daemon *Daemon) initNetworkController(config *config.Config, activeSandbox
return controller, nil return controller, nil
} }
func driverOptions(config *config.Config) []nwconfig.Option { func driverOptions(config *config.Config) nwconfig.Option {
bridgeConfig := options.Generic{ return nwconfig.OptionDriverConfig("bridge", options.Generic{
"EnableIPForwarding": config.BridgeConfig.EnableIPForward, netlabel.GenericData: options.Generic{
"EnableIPTables": config.BridgeConfig.EnableIPTables, "EnableIPForwarding": config.BridgeConfig.EnableIPForward,
"EnableIP6Tables": config.BridgeConfig.EnableIP6Tables, "EnableIPTables": config.BridgeConfig.EnableIPTables,
"EnableUserlandProxy": config.BridgeConfig.EnableUserlandProxy, "EnableIP6Tables": config.BridgeConfig.EnableIP6Tables,
"UserlandProxyPath": config.BridgeConfig.UserlandProxyPath} "EnableUserlandProxy": config.BridgeConfig.EnableUserlandProxy,
bridgeOption := options.Generic{netlabel.GenericData: bridgeConfig} "UserlandProxyPath": config.BridgeConfig.UserlandProxyPath,
},
dOptions := []nwconfig.Option{} })
dOptions = append(dOptions, nwconfig.OptionDriverConfig("bridge", bridgeOption))
return dOptions
} }
func initBridgeDriver(controller libnetwork.NetworkController, config *config.Config) error { func initBridgeDriver(controller libnetwork.NetworkController, config *config.Config) error {

4
daemon/daemon_windows.go
View file

@ -517,8 +517,8 @@ func (daemon *Daemon) conditionalUnmountOnCleanup(container *container.Container
return daemon.Unmount(container) return daemon.Unmount(container)
} }
func driverOptions(config *config.Config) []nwconfig.Option { func driverOptions(_ *config.Config) nwconfig.Option {
return []nwconfig.Option{} return nil
} }
func (daemon *Daemon) stats(c *container.Container) (*types.StatsJSON, error) { func (daemon *Daemon) stats(c *container.Container) (*types.StatsJSON, error) {