Update CNI and CNI plugins

Signed-off-by: Sascha Grunert <[email protected]>

Author: saschagrunert

go.mod

@@ -3,8 +3,8 @@ module github.com/cri-o/ocicni
 go 1.24
 
 require (
-	github.com/containernetworking/cni v1.2.3
-	github.com/containernetworking/plugins v1.6.2
+	github.com/containernetworking/cni v1.3.0
+	github.com/containernetworking/plugins v1.7.1
 	github.com/fsnotify/fsnotify v1.9.0
 	github.com/onsi/ginkgo/v2 v2.24.0
 	github.com/onsi/gomega v1.38.0

go.sum

@@ -1,9 +1,9 @@
 github.com/Masterminds/semver/v3 v3.3.1 h1:QtNSWtVZ3nBfk8mAOu/B6v7FMJ+NHTIgUPi7rj+4nv4=
 github.com/Masterminds/semver/v3 v3.3.1/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
-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/plugins v1.6.2 h1:pqP8Mq923TLyef5g97XfJ/xpDeVek4yF8A4mzy9Tc4U=
-github.com/containernetworking/plugins v1.6.2/go.mod h1:SP5UG3jDO9LtmfbBJdP+nl3A1atOtbj2MBOYsnaxy64=
+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.7.1 h1:CNAR0jviDj6FS5Vg85NTgKWLDzZPfi/lj+VJfhMDTIs=
+github.com/containernetworking/plugins v1.7.1/go.mod h1:xuMdjuio+a1oVQsHKjr/mgzuZ24leAsqUYRnzGoXHy0=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

pkg/ocicni/ocicni.go

@@ -336,7 +336,14 @@ func loadNetworks(ctx context.Context, confDir string, cni *libcni.CNIConfig) (n
 				continue
 			}
 		} else {
-			conf, err := libcni.ConfFromFile(confFile)
+			bytes, err := os.ReadFile(confFile)
+			if err != nil {
+				logrus.Errorf("Error loading CNI config file %s: %v", confFile, err)
+
+				continue
+			}
+
+			conf, err := libcni.NetworkPluginConfFromBytes(bytes)
 			if err != nil {
 				// do not log ENOENT errors
 				if !os.IsNotExist(err) {
@@ -352,6 +359,7 @@ func loadNetworks(ctx context.Context, confDir string, cni *libcni.CNIConfig) (n
 				continue
 			}
 
+			//nolint:staticcheck // we still require this function
 			confList, err = libcni.ConfListFromConf(conf)
 			if err != nil {
 				logrus.Errorf("Error converting CNI config file %s to list: %v", confFile, err)
@@ -487,18 +495,19 @@ func (plugin *cniNetworkPlugin) loadNetworkFromCache(name string, rt *libcni.Run
 		return nil, nil, fmt.Errorf("network %q not found in CNI cache", name)
 	}
 
-	cniNet.config, err = libcni.ConfListFromBytes(confBytes)
+	cniNet.config, err = libcni.NetworkConfFromBytes(confBytes)
 	if err != nil {
+		return nil, nil, err
+	}
+
+	if cniNet.config.Plugins == nil {
 		// Might be a plain NetworkConfig
-		netConf, err := libcni.ConfFromBytes(confBytes)
-		if err != nil {
-			return nil, nil, err
-		}
-		// Up-convert to a NetworkConfigList
-		cniNet.config, err = libcni.ConfListFromConf(netConf)
+		netConf, err := libcni.NetworkPluginConfFromBytes(confBytes)
 		if err != nil {
 			return nil, nil, err
 		}
+
+		cniNet.config.Plugins = []*libcni.PluginConfig{netConf}
 	}
 
 	return cniNet, rt, nil