mirror of
https://github.com/containers/podman.git
synced 2025-12-08 14:48:48 +08:00
Update common, image, and storage deps
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
This commit is contained in:
committed by
Paul Holzinger
parent
32d96f40c3
commit
444f19cb2a
31
vendor/github.com/containers/common/libnetwork/netavark/config.go
generated
vendored
31
vendor/github.com/containers/common/libnetwork/netavark/config.go
generated
vendored
@@ -198,6 +198,13 @@ func (n *netavarkNetwork) networkCreate(newNetwork *types.Network, defaultNet bo
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
case types.NoDefaultRoute:
|
||||
val, err := strconv.ParseBool(value)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
// rust only support "true" or "false" while go can parse 1 and 0 as well so we need to change it
|
||||
newNetwork.Options[types.NoDefaultRoute] = strconv.FormatBool(val)
|
||||
|
||||
default:
|
||||
return nil, fmt.Errorf("unsupported bridge network option %s", key)
|
||||
@@ -237,6 +244,12 @@ func (n *netavarkNetwork) networkCreate(newNetwork *types.Network, defaultNet bo
|
||||
return nil, err
|
||||
}
|
||||
|
||||
//validate routes
|
||||
err = internalutil.ValidateRoutes(newNetwork.Routes)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
newNetwork.Created = time.Now()
|
||||
|
||||
if !defaultNet {
|
||||
@@ -317,6 +330,24 @@ func createIpvlanOrMacvlan(network *types.Network) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
case types.NoDefaultRoute:
|
||||
val, err := strconv.ParseBool(value)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
// rust only support "true" or "false" while go can parse 1 and 0 as well so we need to change it
|
||||
network.Options[types.NoDefaultRoute] = strconv.FormatBool(val)
|
||||
case types.BclimOption:
|
||||
if isMacVlan {
|
||||
_, err := strconv.ParseInt(value, 10, 32)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to parse %q option: %w", key, err)
|
||||
}
|
||||
// do not fallthrough for macvlan
|
||||
break
|
||||
}
|
||||
// bclim is only valid for macvlan not ipvlan so fallthrough to error case
|
||||
fallthrough
|
||||
default:
|
||||
return fmt.Errorf("unsupported %s network option %s", driver, key)
|
||||
}
|
||||
|
||||
32
vendor/github.com/containers/common/libnetwork/netavark/network.go
generated
vendored
32
vendor/github.com/containers/common/libnetwork/netavark/network.go
generated
vendored
@@ -15,6 +15,7 @@ import (
|
||||
"github.com/containers/common/libnetwork/internal/util"
|
||||
"github.com/containers/common/libnetwork/types"
|
||||
"github.com/containers/common/pkg/config"
|
||||
cutil "github.com/containers/common/pkg/util"
|
||||
"github.com/containers/storage/pkg/lockfile"
|
||||
"github.com/containers/storage/pkg/unshare"
|
||||
"github.com/sirupsen/logrus"
|
||||
@@ -336,6 +337,37 @@ func (n *netavarkNetwork) DefaultInterfaceName() string {
|
||||
return defaultBridgeName
|
||||
}
|
||||
|
||||
// NetworkInfo return the network information about binary path,
|
||||
// package version and program version.
|
||||
func (n *netavarkNetwork) NetworkInfo() types.NetworkInfo {
|
||||
path := n.netavarkBinary
|
||||
packageVersion := cutil.PackageVersion(path)
|
||||
programVersion, err := cutil.ProgramVersion(path)
|
||||
if err != nil {
|
||||
logrus.Infof("Failed to get the netavark version: %v", err)
|
||||
}
|
||||
info := types.NetworkInfo{
|
||||
Backend: types.Netavark,
|
||||
Version: programVersion,
|
||||
Package: packageVersion,
|
||||
Path: path,
|
||||
}
|
||||
|
||||
dnsPath := n.aardvarkBinary
|
||||
dnsPackage := cutil.PackageVersion(dnsPath)
|
||||
dnsProgram, err := cutil.ProgramVersion(dnsPath)
|
||||
if err != nil {
|
||||
logrus.Infof("Failed to get the aardvark version: %v", err)
|
||||
}
|
||||
info.DNS = types.DNSNetworkInfo{
|
||||
Package: dnsPackage,
|
||||
Path: dnsPath,
|
||||
Version: dnsProgram,
|
||||
}
|
||||
|
||||
return info
|
||||
}
|
||||
|
||||
func (n *netavarkNetwork) Network(nameOrID string) (*types.Network, error) {
|
||||
network, err := n.getNetwork(nameOrID)
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user