From e16f14a44d815e38af06152bba12d2ff21e0eb02 Mon Sep 17 00:00:00 2001 From: Michael Zimmermann Date: Mon, 25 Nov 2024 18:29:16 +0100 Subject: [PATCH] vendor: update containers/common Signed-off-by: Michael Zimmermann --- go.mod | 2 +- go.sum | 4 ++-- .../containers/common/libnetwork/netavark/config.go | 4 ++++ .../github.com/containers/common/libnetwork/types/const.go | 6 ++++++ vendor/modules.txt | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index b786a34b49..83e41c206c 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/checkpoint-restore/go-criu/v7 v7.2.0 github.com/containernetworking/plugins v1.5.1 github.com/containers/buildah v1.38.1-0.20241119213149-52437ef15d33 - github.com/containers/common v0.61.1-0.20241125104856-ceceb404e9aa + github.com/containers/common v0.61.1-0.20241125172552-a801fac4edc0 github.com/containers/conmon v2.0.20+incompatible github.com/containers/gvisor-tap-vsock v0.8.0 github.com/containers/image/v5 v5.33.0 diff --git a/go.sum b/go.sum index 71c6bef976..1f6c5b901e 100644 --- a/go.sum +++ b/go.sum @@ -81,8 +81,8 @@ github.com/containernetworking/plugins v1.5.1 h1:T5ji+LPYjjgW0QM+KyrigZbLsZ8jaX+ github.com/containernetworking/plugins v1.5.1/go.mod h1:MIQfgMayGuHYs0XdNudf31cLLAC+i242hNm6KuDGqCM= github.com/containers/buildah v1.38.1-0.20241119213149-52437ef15d33 h1:Ih6KuyByK7ZGGzkS0M5rVBPLWIyeDvdL5klhsKBo8vA= github.com/containers/buildah v1.38.1-0.20241119213149-52437ef15d33/go.mod h1:RxIuKhwTpRl3ma4d4BF6QzSSeg9zNNvo/xhYJOKeDQs= -github.com/containers/common v0.61.1-0.20241125104856-ceceb404e9aa h1:XetqxHBrm3klRHIe8L1QIOr57B0HUVdihxY1wop0KXg= -github.com/containers/common v0.61.1-0.20241125104856-ceceb404e9aa/go.mod h1:3mUU2/PxkOwvL46fmaRVj0YfBDBxNPOMctIvBHWo4Ak= +github.com/containers/common v0.61.1-0.20241125172552-a801fac4edc0 h1:Vh8IytxprODmjd4sALcSVUzhT28vT537UWsfCXcahWk= +github.com/containers/common v0.61.1-0.20241125172552-a801fac4edc0/go.mod h1:3mUU2/PxkOwvL46fmaRVj0YfBDBxNPOMctIvBHWo4Ak= github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg= github.com/containers/conmon v2.0.20+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I= github.com/containers/gvisor-tap-vsock v0.8.0 h1:Z8ZEWb+Lio0d+lXexONdUWT4rm9lF91vH0g3ARnMy7o= diff --git a/vendor/github.com/containers/common/libnetwork/netavark/config.go b/vendor/github.com/containers/common/libnetwork/netavark/config.go index 8b43a787e4..33ef26acf0 100644 --- a/vendor/github.com/containers/common/libnetwork/netavark/config.go +++ b/vendor/github.com/containers/common/libnetwork/netavark/config.go @@ -207,6 +207,10 @@ func (n *netavarkNetwork) networkCreate(newNetwork *types.Network, defaultNet bo if len(value) == 0 { return nil, errors.New("invalid vrf name") } + case types.ModeOption: + if !slices.Contains(types.ValidBridgeModes, value) { + return nil, fmt.Errorf("unknown bridge mode %q", value) + } default: return nil, fmt.Errorf("unsupported bridge network option %s", key) } diff --git a/vendor/github.com/containers/common/libnetwork/types/const.go b/vendor/github.com/containers/common/libnetwork/types/const.go index a916182007..6e2c3fbf4b 100644 --- a/vendor/github.com/containers/common/libnetwork/types/const.go +++ b/vendor/github.com/containers/common/libnetwork/types/const.go @@ -24,6 +24,9 @@ const ( // DefaultSubnet is the subnet that will be used for the default CNI network. DefaultSubnet = "10.88.0.0/16" + BridgeModeManaged = "managed" + BridgeModeUnmanaged = "unmanaged" + // valid macvlan driver mode values MacVLANModeBridge = "bridge" MacVLANModePrivate = "private" @@ -53,6 +56,9 @@ const ( Netavark NetworkBackend = "netavark" ) +// ValidBridgeModes is the list of valid mode options for the bridge driver +var ValidBridgeModes = []string{BridgeModeManaged, BridgeModeUnmanaged} + // ValidMacVLANModes is the list of valid mode options for the macvlan driver var ValidMacVLANModes = []string{MacVLANModeBridge, MacVLANModePrivate, MacVLANModeVepa, MacVLANModePassthru} diff --git a/vendor/modules.txt b/vendor/modules.txt index 33143d0c44..c0ba1db111 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -174,7 +174,7 @@ github.com/containers/buildah/pkg/sshagent github.com/containers/buildah/pkg/util github.com/containers/buildah/pkg/volumes github.com/containers/buildah/util -# github.com/containers/common v0.61.1-0.20241125104856-ceceb404e9aa +# github.com/containers/common v0.61.1-0.20241125172552-a801fac4edc0 ## explicit; go 1.22.6 github.com/containers/common/internal github.com/containers/common/internal/attributedstring