Merge pull request #954 from cyclinder/improve_cmd_del

macvlan cmdDel: replace the loadConf function with json.unmarshal
containernetworking · Nov 16, 2023 · abee8cc · abee8cc
2 parents e147446 + 845ef62
commit abee8cc
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/plugins/main/macvlan/macvlan.go b/plugins/main/macvlan/macvlan.go
@@ -383,13 +383,13 @@ func cmdAdd(args *skel.CmdArgs) error {
 }
 
 func cmdDel(args *skel.CmdArgs) error {
-	n, _, err := loadConf(args, args.Args)
+	var n NetConf
+	err := json.Unmarshal(args.StdinData, &n)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to load netConf: %v", err)
 	}
 
 	isLayer3 := n.IPAM.Type != ""
-
 	if isLayer3 {
 		err = ipam.ExecDel(n.IPAM.Type, args.StdinData)
 		if err != nil {