kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #40186 from pradipd/default-nat-subnet 

Dockerd won't start if a network with the default subnet prefix already exists in HNS.
This commit is contained in:
Brian Goff 2019-12-03 09:31:29 -08:00 committed by GitHub
parent 3152f94362 89c6febfc2
commit e25754b80c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
daemon/daemon_windows.go
View File

@ -35,7 +35,6 @@ import (
const ( const (
isWindows = true isWindows = true
defaultNetworkSpace = "172.16.0.0/12"
platformSupported = true platformSupported = true
windowsMinCPUShares = 1 windowsMinCPUShares = 1
windowsMaxCPUShares = 10000 windowsMaxCPUShares = 10000
@ -427,15 +426,19 @@ func initBridgeDriver(controller libnetwork.NetworkController, config *config.Co
winlibnetwork.NetworkName: runconfig.DefaultDaemonNetworkMode().NetworkName(), winlibnetwork.NetworkName: runconfig.DefaultDaemonNetworkMode().NetworkName(),
} }
subnetPrefix := defaultNetworkSpace var ipamOption libnetwork.NetworkOption
var subnetPrefix string
if config.BridgeConfig.FixedCIDR != "" { if config.BridgeConfig.FixedCIDR != "" {
subnetPrefix = config.BridgeConfig.FixedCIDR subnetPrefix = config.BridgeConfig.FixedCIDR
} }
ipamV4Conf := libnetwork.IpamConf{PreferredPool: subnetPrefix} if subnetPrefix != "" {
v4Conf := []*libnetwork.IpamConf{&ipamV4Conf} ipamV4Conf := libnetwork.IpamConf{PreferredPool: subnetPrefix}
v6Conf := []*libnetwork.IpamConf{} v4Conf := []*libnetwork.IpamConf{&ipamV4Conf}
ipamOption := libnetwork.NetworkOptionIpam("default", "", v4Conf, v6Conf, nil) v6Conf := []*libnetwork.IpamConf{}
ipamOption = libnetwork.NetworkOptionIpam("default", "", v4Conf, v6Conf, nil)
}
_, err := controller.NewNetwork(string(runconfig.DefaultDaemonNetworkMode()), runconfig.DefaultDaemonNetworkMode().NetworkName(), "", _, err := controller.NewNetwork(string(runconfig.DefaultDaemonNetworkMode()), runconfig.DefaultDaemonNetworkMode().NetworkName(), "",
libnetwork.NetworkOptionGeneric(options.Generic{ libnetwork.NetworkOptionGeneric(options.Generic{