Bump cni go dependency

apostasie · apostasie · commit 921648084f76 · 2025-04-15T22:20:04.000-07:00
Signed-off-by: apostasie &lt;spam_blackhole@farcloser.world&gt;
diff --git a/go.mod b/go.mod
@@ -25,7 +25,7 @@ require (
 	github.com/containerd/stargz-snapshotter/estargz v0.16.3
 	github.com/containerd/stargz-snapshotter/ipfs v0.16.3
 	github.com/containerd/typeurl/v2 v2.2.3
-	github.com/containernetworking/cni v1.2.3
+	github.com/containernetworking/cni v1.3.0
 	github.com/containernetworking/plugins v1.6.2
 	github.com/coreos/go-iptables v0.8.0
 	github.com/coreos/go-systemd/v22 v22.5.0
diff --git a/go.sum b/go.sum
@@ -65,8 +65,8 @@ github.com/containerd/ttrpc v1.2.7 h1:qIrroQvuOL9HQ1X6KHe2ohc7p+HP/0VE6XPU7elJRq
 github.com/containerd/ttrpc v1.2.7/go.mod h1:YCXHsb32f+Sq5/72xHubdiJRQY9inL4a4ZQrAbN1q9o=
 github.com/containerd/typeurl/v2 v2.2.3 h1:yNA/94zxWdvYACdYO8zofhrTVuQY73fFU1y++dYSw40=
 github.com/containerd/typeurl/v2 v2.2.3/go.mod h1:95ljDnPfD3bAbDJRugOiShd/DlAAsxGtUBhJxIn7SCk=
-github.com/containernetworking/cni v1.2.3 h1:hhOcjNVUQTnzdRJ6alC5XF+wd9mfGIUaj8FuJbEslXM=
-github.com/containernetworking/cni v1.2.3/go.mod h1:DuLgF+aPd3DzcTQTtp/Nvl1Kim23oFKdm2okJzBQA5M=
+github.com/containernetworking/cni v1.3.0 h1:v6EpN8RznAZj9765HhXQrtXgX+ECGebEYEmnuFjskwo=
+github.com/containernetworking/cni v1.3.0/go.mod h1:Bs8glZjjFfGPHMw6hQu82RUgEPNGEaBb9KS5KtNMnJ4=
 github.com/containernetworking/plugins v1.6.2 h1:pqP8Mq923TLyef5g97XfJ/xpDeVek4yF8A4mzy9Tc4U=
 github.com/containernetworking/plugins v1.6.2/go.mod h1:SP5UG3jDO9LtmfbBJdP+nl3A1atOtbj2MBOYsnaxy64=
 github.com/containers/ocicrypt v1.2.1 h1:0qIOTT9DoYwcKmxSt8QJt+VzMY18onl9jUXsxpVhSmM=
diff --git a/pkg/netutil/netutil.go b/pkg/netutil/netutil.go
@@ -539,12 +539,7 @@ func cniLoad(fileNames []string) (configList []*NetworkConfig, err error) {
 				return nil, wrapCNIError(fileName, err)
 			}
 		} else {
-			var netConfig *libcni.NetworkConfig
-			netConfig, err = libcni.ConfFromBytes(bytes)
-			if err != nil {
-				return nil, wrapCNIError(fileName, err)
-			}
-			netConfigList, err = libcni.ConfListFromConf(netConfig)
+			netConfigList, err = libcni.NetworkConfFromBytes(bytes)
 			if err != nil {
 				return nil, wrapCNIError(fileName, err)
 			}

-Original file line number
+Diff line change
 	github.com/containerd/stargz-snapshotter/estargz v0.16.3
 	github.com/containerd/stargz-snapshotter/ipfs v0.16.3
 	github.com/containerd/typeurl/v2 v2.2.3
 -	github.com/containernetworking/cni v1.2.3
 +	github.com/containernetworking/cni v1.3.0
 	github.com/containernetworking/plugins v1.6.2
 	github.com/coreos/go-iptables v0.8.0
 	github.com/coreos/go-systemd/v22 v22.5.0
Original file line number	Diff line number	Diff line change
`@@ -539,12 +539,7 @@ func cniLoad(fileNames []string) (configList []*NetworkConfig, err error) {`
`539`	`539`	`return nil, wrapCNIError(fileName, err)`
`540`	`540`	`}`
`541`	`541`	`} else {`
`542`		`- var netConfig *libcni.NetworkConfig`
`543`		`- netConfig, err = libcni.ConfFromBytes(bytes)`
`544`		`- if err != nil {`
`545`		`- return nil, wrapCNIError(fileName, err)`
`546`		`- }`
`547`		`- netConfigList, err = libcni.ConfListFromConf(netConfig)`
	`542`	`+ netConfigList, err = libcni.NetworkConfFromBytes(bytes)`
`548`	`543`	`if err != nil {`
`549`	`544`	`return nil, wrapCNIError(fileName, err)`
`550`	`545`	`}`