Use the libpod.conf cni_config_dir option for inspect and delete

The pkg/network/files.go methods currently use the constant '/etc/cni/net.d'
for network handling. This results in the unability of podman-network-inspect
and podman-network-rm to locate the cni network configuration files.
This commit propagates the libpod.Runtime through the networking methods and
finally makes use of its configuration (config.Network.NetworkConfigDir).
Closes #6212

Signed-off-by: Maximilian Müller <maxm123@techie.com>

1 files changed, 21 insertions, 10 deletions

diff --git a/pkg/network/files.go b/pkg/network/files.go
index 116189c43..81c0e1a28 100644
--- a/pkg/network/files.go
+++ b/pkg/network/files.go
@@ -9,9 +9,17 @@ import (
 
 	"github.com/containernetworking/cni/libcni"
 	"github.com/containernetworking/plugins/plugins/ipam/host-local/backend/allocator"
+	"github.com/containers/common/pkg/config"
 	"github.com/pkg/errors"
 )
 
+func GetCNIConfDir(config *config.Config) string {
+	if len(config.Network.NetworkConfigDir) < 1 {
+		return CNIConfigDir
+	}
+	return config.Network.NetworkConfigDir
+}
+
 // LoadCNIConfsFromDir loads all the CNI configurations from a dir
 func LoadCNIConfsFromDir(dir string) ([]*libcni.NetworkConfigList, error) {
 	var configs []*libcni.NetworkConfigList
@@ -33,8 +41,8 @@ func LoadCNIConfsFromDir(dir string) ([]*libcni.NetworkConfigList, error) {
 
 // GetCNIConfigPathByName finds a CNI network by name and
 // returns its configuration file path
-func GetCNIConfigPathByName(name string) (string, error) {
-	files, err := libcni.ConfFiles(CNIConfigDir, []string{".conflist"})
+func GetCNIConfigPathByName(config *config.Config, name string) (string, error) {
+	files, err := libcni.ConfFiles(GetCNIConfDir(config), []string{".conflist"})
 	if err != nil {
 		return "", err
 	}
@@ -52,8 +60,8 @@ func GetCNIConfigPathByName(name string) (string, error) {
 
 // ReadRawCNIConfByName reads the raw CNI configuration for a CNI
 // network by name
-func ReadRawCNIConfByName(name string) ([]byte, error) {
-	confFile, err := GetCNIConfigPathByName(name)
+func ReadRawCNIConfByName(config *config.Config, name string) ([]byte, error) {
+	confFile, err := GetCNIConfigPathByName(config, name)
 	if err != nil {
 		return nil, err
 	}
@@ -73,9 +81,10 @@ func GetCNIPlugins(list *libcni.NetworkConfigList) string {
 
 // GetNetworksFromFilesystem gets all the networks from the cni configuration
 // files
-func GetNetworksFromFilesystem() ([]*allocator.Net, error) {
+func GetNetworksFromFilesystem(config *config.Config) ([]*allocator.Net, error) {
 	var cniNetworks []*allocator.Net
-	networks, err := LoadCNIConfsFromDir(CNIConfigDir)
+
+	networks, err := LoadCNIConfsFromDir(GetCNIConfDir(config))
 	if err != nil {
 		return nil, err
 	}
@@ -96,9 +105,10 @@ func GetNetworksFromFilesystem() ([]*allocator.Net, error) {
 
 // GetNetworkNamesFromFileSystem gets all the names from the cni network
 // configuration files
-func GetNetworkNamesFromFileSystem() ([]string, error) {
+func GetNetworkNamesFromFileSystem(config *config.Config) ([]string, error) {
 	var networkNames []string
-	networks, err := LoadCNIConfsFromDir(CNIConfigDir)
+
+	networks, err := LoadCNIConfsFromDir(GetCNIConfDir(config))
 	if err != nil {
 		return nil, err
 	}
@@ -133,9 +143,10 @@ func GetInterfaceNameFromConfig(path string) (string, error) {
 
 // GetBridgeNamesFromFileSystem is a convenience function to get all the bridge
 // names from the configured networks
-func GetBridgeNamesFromFileSystem() ([]string, error) {
+func GetBridgeNamesFromFileSystem(config *config.Config) ([]string, error) {
 	var bridgeNames []string
-	networks, err := LoadCNIConfsFromDir(CNIConfigDir)
+
+	networks, err := LoadCNIConfsFromDir(GetCNIConfDir(config))
 	if err != nil {
 		return nil, err
 	}