Merge pull request #40497 from arkodg/fix-bip-subnet-config
Set the bip network value as the subnet
This commit is contained in:
commit
58c2615208
|
@ -1008,11 +1008,11 @@ func initBridgeDriver(controller libnetwork.NetworkController, config *config.Co
|
|||
}
|
||||
|
||||
if config.BridgeConfig.IP != "" {
|
||||
ipamV4Conf.PreferredPool = config.BridgeConfig.IP
|
||||
ip, _, err := net.ParseCIDR(config.BridgeConfig.IP)
|
||||
ip, ipNet, err := net.ParseCIDR(config.BridgeConfig.IP)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
ipamV4Conf.PreferredPool = ipNet.String()
|
||||
ipamV4Conf.Gateway = ip.String()
|
||||
} else if bridgeName == bridge.DefaultBridgeName && ipamV4Conf.PreferredPool != "" {
|
||||
logrus.Infof("Default bridge (%s) is assigned with an IP address %s. Daemon option --bip can be used to set a preferred IP address", bridgeName, ipamV4Conf.PreferredPool)
|
||||
|
|
|
@ -193,7 +193,7 @@ func TestDaemonWithBipAndDefaultNetworkPool(t *testing.T) {
|
|||
out, err := c.NetworkInspect(context.Background(), "bridge", types.NetworkInspectOptions{})
|
||||
assert.NilError(t, err)
|
||||
// Make sure BIP IP doesn't get override with new default address pool .
|
||||
assert.Equal(t, out.IPAM.Config[0].Subnet, "172.60.0.1/16")
|
||||
assert.Equal(t, out.IPAM.Config[0].Subnet, "172.60.0.0/16")
|
||||
delInterface(t, defaultNetworkBridge)
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue