Bump c/common to v0.47.4

As the title says.

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
This commit is contained in:
tomsweeneyredhat
2022-02-09 15:24:08 -05:00
parent 12836a5610
commit 1512740e3b
12 changed files with 57 additions and 23 deletions

View File

@@ -222,14 +222,33 @@ func (n *cniNetwork) createCNIConfigListFromNetwork(network *types.Network, writ
err error
)
if len(network.Subnets) > 0 {
defIpv4Route := false
defIpv6Route := false
for _, subnet := range network.Subnets {
route, err := newIPAMDefaultRoute(util.IsIPv6(subnet.Subnet.IP))
if err != nil {
return nil, "", err
}
routes = append(routes, route)
ipam := newIPAMLocalHostRange(subnet.Subnet, subnet.LeaseRange, subnet.Gateway)
ipamRanges = append(ipamRanges, []ipamLocalHostRangeConf{*ipam})
// only add default route for not internal networks
if !network.Internal {
ipv6 := util.IsIPv6(subnet.Subnet.IP)
if !ipv6 && defIpv4Route {
continue
}
if ipv6 && defIpv6Route {
continue
}
if ipv6 {
defIpv6Route = true
} else {
defIpv4Route = true
}
route, err := newIPAMDefaultRoute(ipv6)
if err != nil {
return nil, "", err
}
routes = append(routes, route)
}
}
ipamConf = newIPAMHostLocalConf(routes, ipamRanges)
} else {

View File

@@ -82,7 +82,7 @@ func (n *cniNetwork) networkCreate(newNetwork *types.Network, defaultNet bool) (
return nil, errors.Wrapf(types.ErrInvalidArg, "unsupported driver %s", newNetwork.Driver)
}
err = internalutil.ValidateSubnets(newNetwork, usedNetworks)
err = internalutil.ValidateSubnets(newNetwork, !newNetwork.Internal, usedNetworks)
if err != nil {
return nil, err
}