remove goimport: go.podman.io/common/libnetwork/cni

Signed-off-by: Lokesh Mandvekar <[email protected]>

Author: lsm5

common/libnetwork/network/interface.go

@@ -28,10 +28,10 @@ const (
 )
 
 // NetworkBackend returns the network backend name and interface
-// It returns either the CNI or netavark backend depending on what is set in the config.
+// It returns netavark backend depending on what is set in the config.
 // If the backend is set to "" we will automatically assign the backend on the following conditions:
 //  1. read ${graphroot}/defaultNetworkBackend
-//  2. find netavark binary (if not installed use CNI)
+//  2. find netavark binary
 //  3. check containers, images and CNI networks and if there are some we have an existing install and should continue to use CNI
 //
 // revive does not like the name because the package is already called network
@@ -41,7 +41,7 @@ func NetworkBackend(store storage.Store, conf *config.Config, syslog bool) (type
 	backend := types.NetworkBackend(conf.Network.NetworkBackend)
 	if backend == "" {
 		var err error
-		backend, err = defaultNetworkBackend(store, conf)
+		backend, err = defaultNetworkBackend(store)
 		if err != nil {
 			return "", nil, fmt.Errorf("failed to get default network backend: %w", err)
 		}
@@ -50,6 +50,19 @@ func NetworkBackend(store storage.Store, conf *config.Config, syslog bool) (type
 	return backendFromType(backend, store, conf, syslog)
 }
 
+func backendFromType(backend types.NetworkBackend, store storage.Store, conf *config.Config, syslog bool) (types.NetworkBackend, types.ContainerNetwork, error) {
+	switch backend {
+	case types.Netavark:
+		netInt, err := netavarkBackendFromConf(store, conf, syslog)
+		if err != nil {
+			return "", nil, err
+		}
+		return types.Netavark, netInt, err
+	default:
+		return "", nil, fmt.Errorf("unsupported network backend %q, check network_backend in containers.conf", backend)
+	}
+}
+
 func netavarkBackendFromConf(store storage.Store, conf *config.Config, syslog bool) (types.ContainerNetwork, error) {
 	netavarkBin, err := conf.FindHelperBinary(netavarkBinary, false)
 	if err != nil {
@@ -83,7 +96,7 @@ func netavarkBackendFromConf(store storage.Store, conf *config.Config, syslog bo
 	return netInt, err
 }
 
-func defaultNetworkBackend(store storage.Store, conf *config.Config) (backend types.NetworkBackend, err error) {
+func defaultNetworkBackend(store storage.Store) (backend types.NetworkBackend, err error) {
 	err = nil
 
 	file := filepath.Join(store.GraphRoot(), defaultNetworkBackendFileName)
@@ -102,39 +115,21 @@ func defaultNetworkBackend(store storage.Store, conf *config.Config) (backend ty
 	if err == nil {
 		val := string(b)
 
-		// if the network backend has been already set previously,
-		// handle the values depending on whether CNI is supported and
-		// whether the network backend is explicitly configured
-		if val == string(types.Netavark) {
+		// set network backend to netavark if not already.
+		if val != string(types.Netavark) {
 			// netavark is always good
-			return types.Netavark, nil
-		} else if val == string(types.CNI) {
-			if cniSupported {
-				return types.CNI, nil
-			}
-			// the user has *not* configured a network
-			// backend explicitly but used CNI in the past
-			// => we upgrade them in this case to netavark only
 			writeBackendToFile(types.Netavark)
 			logrus.Info("Migrating network backend to netavark as no backend has been configured previously")
-			return types.Netavark, nil
 		}
-		return "", fmt.Errorf("unknown network backend value %q in %q", val, file)
+		return types.Netavark, nil
 	}
 
 	// fail for all errors except ENOENT
 	if !errors.Is(err, os.ErrNotExist) {
 		return "", fmt.Errorf("could not read network backend value: %w", err)
 	}
 
-	backend, err = networkBackendFromStore(store, conf)
-	if err != nil {
-		return "", err
-	}
-	// cache the network backend to make sure always the same one will be used
-	writeBackendToFile(backend)
-
-	return backend, nil
+	return "", nil
 }
 
 // getDefaultNetavarkConfigDir return the netavark config dir. For rootful it will

common/libnetwork/network/interface_cni.go

@@ -1,8 +1,6 @@
 package network
 
 const (
-	// cniConfigDir is the directory where cni configuration is found.
-	cniConfigDir = "/etc/cni/net.d/"
 	// netavarkConfigDir is the config directory for the rootful network files.
 	netavarkConfigDir = "/etc/containers/networks"
 	// netavarkRunDir is the run directory for the rootful temporary network files such as the ipam db.

common/libnetwork/network/interface_cni_unsupported.go

@@ -52,7 +52,6 @@ const (
 type NetworkBackend string
 
 const (
-	CNI      NetworkBackend = "cni"
 	Netavark NetworkBackend = "netavark"
 )