Switch cni plugin conf dir first and and then load the default conf f…

…rom the dir Signed-off-by: Yakul Garg <2000yeshu@gmail.com>
neverinstall · Mar 27, 2024 · d9f8918 · d9f8918
1 parent 5f05b58
commit d9f8918
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/cmd/ctr/commands/run/run.go b/cmd/ctr/commands/run/run.go
@@ -188,7 +188,12 @@ var Command = cli.Command{
 		var network gocni.CNI
 		if enableCNI {
 			if cniConfDir != "" {
-				if network, err = gocni.New(gocni.WithDefaultConf, gocni.WithPluginConfDir(cniConfDir)); err != nil {
+				network, err = gocni.New(gocni.WithPluginConfDir(cniConfDir))
+				if err != nil {
+					return err
+				}
+
+				if err := network.Load(gocni.WithDefaultConf); err != nil {
 					return err
 				}
 			} else if network, err = gocni.New(gocni.WithDefaultConf); err != nil {

diff --git a/cmd/ctr/commands/tasks/kill.go b/cmd/ctr/commands/tasks/kill.go
@@ -51,7 +51,12 @@ func RemoveCniNetworkIfExist(ctx context.Context, container containerd.Container
 	var network gocni.CNI
 	if networkMetaData.EnableCni {
 		if networkMetaData.CniConfDir != "" {
-			if network, err = gocni.New(gocni.WithDefaultConf, gocni.WithPluginConfDir(networkMetaData.CniConfDir)); err != nil {
+			network, err = gocni.New(gocni.WithPluginConfDir(networkMetaData.CniConfDir))
+			if err != nil {
+				return err
+			}
+
+			if err := network.Load(gocni.WithDefaultConf); err != nil {
 				return err
 			}
 		} else {