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

Account dcoker0 IPv6 address on daemon start

Browse source 
- In case --fixed-cidr-v6 is specified and docker0 bridge already
  has a global scope IPv6 address belonging to that v6 network
  (likely from a previous daemon instance), to maintain consistency
  with what done for the docker0 IPv4 address, daemon has to pass it
  down to libnetwork in the IPAMConfig as network gateway to make
  sure that the address is not given to some container.

Signed-off-by: Alessandro Boch <aboch@docker.com>
This commit is contained in:
Alessandro Boch 2016-01-11 23:47:44 -08:00
parent 3f1b16e236
commit cfa3682ca4
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
daemon/daemon_unix.go
View file

@ -528,12 +528,16 @@ func initBridgeDriver(controller libnetwork.NetworkController, config *Config) e
netOption[bridge.DefaultBindingIP] = config.Bridge.DefaultIP.String() netOption[bridge.DefaultBindingIP] = config.Bridge.DefaultIP.String()
} }
ipamV4Conf := libnetwork.IpamConf{} var (
ipamV4Conf *libnetwork.IpamConf
ipamV6Conf *libnetwork.IpamConf
)
ipamV4Conf.AuxAddresses = make(map[string]string) ipamV4Conf = &libnetwork.IpamConf{AuxAddresses: make(map[string]string)}
if nw, _, err := ipamutils.ElectInterfaceAddresses(bridgeName); err == nil { nw, nw6List, err := ipamutils.ElectInterfaceAddresses(bridgeName)
ipamV4Conf.PreferredPool = nw.String() if err == nil {
ipamV4Conf.PreferredPool = types.GetIPNetCanonical(nw).String()
hip, _ := types.GetHostPartIP(nw.IP, nw.Mask) hip, _ := types.GetHostPartIP(nw.IP, nw.Mask)
if hip.IsGlobalUnicast() { if hip.IsGlobalUnicast() {
ipamV4Conf.Gateway = nw.IP.String() ipamV4Conf.Gateway = nw.IP.String()
@ -564,10 +568,7 @@ func initBridgeDriver(controller libnetwork.NetworkController, config *Config) e
ipamV4Conf.AuxAddresses["DefaultGatewayIPv4"] = config.Bridge.DefaultGatewayIPv4.String() ipamV4Conf.AuxAddresses["DefaultGatewayIPv4"] = config.Bridge.DefaultGatewayIPv4.String()
} }
var ( var deferIPv6Alloc bool
ipamV6Conf *libnetwork.IpamConf
deferIPv6Alloc bool
)
if config.Bridge.FixedCIDRv6 != "" { if config.Bridge.FixedCIDRv6 != "" {
_, fCIDRv6, err := net.ParseCIDR(config.Bridge.FixedCIDRv6) _, fCIDRv6, err := net.ParseCIDR(config.Bridge.FixedCIDRv6)
if err != nil { if err != nil {
@ -587,6 +588,16 @@ func initBridgeDriver(controller libnetwork.NetworkController, config *Config) e
ipamV6Conf = &libnetwork.IpamConf{AuxAddresses: make(map[string]string)} ipamV6Conf = &libnetwork.IpamConf{AuxAddresses: make(map[string]string)}
} }
ipamV6Conf.PreferredPool = fCIDRv6.String() ipamV6Conf.PreferredPool = fCIDRv6.String()
// In case the --fixed-cidr-v6 is specified and the current docker0 bridge IPv6
// address belongs to the same network, we need to inform libnetwork about it, so
// that it can be reserved with IPAM and it will not be given away to somebody else
for _, nw6 := range nw6List {
if fCIDRv6.Contains(nw6.IP) {
ipamV6Conf.Gateway = nw6.IP.String()
break
}
}
} }
if config.Bridge.DefaultGatewayIPv6 != nil { if config.Bridge.DefaultGatewayIPv6 != nil {
@ -596,13 +607,13 @@ func initBridgeDriver(controller libnetwork.NetworkController, config *Config) e
ipamV6Conf.AuxAddresses["DefaultGatewayIPv6"] = config.Bridge.DefaultGatewayIPv6.String() ipamV6Conf.AuxAddresses["DefaultGatewayIPv6"] = config.Bridge.DefaultGatewayIPv6.String()
} }
v4Conf := []*libnetwork.IpamConf{&ipamV4Conf} v4Conf := []*libnetwork.IpamConf{ipamV4Conf}
v6Conf := []*libnetwork.IpamConf{} v6Conf := []*libnetwork.IpamConf{}
if ipamV6Conf != nil { if ipamV6Conf != nil {
v6Conf = append(v6Conf, ipamV6Conf) v6Conf = append(v6Conf, ipamV6Conf)
} }
// Initialize default network on "bridge" with the same name // Initialize default network on "bridge" with the same name
_, err := controller.NewNetwork("bridge", "bridge", _, err = controller.NewNetwork("bridge", "bridge",
libnetwork.NetworkOptionGeneric(options.Generic{ libnetwork.NetworkOptionGeneric(options.Generic{
netlabel.GenericData: netOption, netlabel.GenericData: netOption,
netlabel.EnableIPv6: config.Bridge.EnableIPv6, netlabel.EnableIPv6: config.Bridge.EnableIPv6,