mirror of
https://github.com/containers/podman.git
synced 2025-12-06 13:56:22 +08:00
Bump c/common to v0.47.4
As the title says. Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
This commit is contained in:
29
vendor/github.com/containers/common/libnetwork/cni/cni_conversion.go
generated
vendored
29
vendor/github.com/containers/common/libnetwork/cni/cni_conversion.go
generated
vendored
@@ -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 {
|
||||
|
||||
2
vendor/github.com/containers/common/libnetwork/cni/config.go
generated
vendored
2
vendor/github.com/containers/common/libnetwork/cni/config.go
generated
vendored
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user