Merge adc1e62 into e723aab

k8snetworkplumbingwg · May 30, 2019 · cd054e4 · cd054e4
2 parents e723aab + adc1e62
commit cd054e4
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/multus/multus.go b/multus/multus.go
@@ -417,16 +417,12 @@ func cmdGet(args *skel.CmdArgs, exec invoke.Exec, kubeClient k8s.KubeClient) (cn
 }
 
 func cmdDel(args *skel.CmdArgs, exec invoke.Exec, kubeClient k8s.KubeClient) error {
-	in, err := types.LoadNetConf(args.StdinData)
 	logging.Debugf("cmdDel: %v, %v, %v", args, exec, kubeClient)
+	in, err := types.LoadNetConf(args.StdinData)
 	if err != nil {
 		return err
 	}
 
-	if args.Netns == "" {
-		return nil
-	}
-
 	netnsfound := true
 	netns, err := ns.GetNS(args.Netns)
 	if err != nil {
@@ -436,7 +432,7 @@ func cmdDel(args *skel.CmdArgs, exec invoke.Exec, kubeClient k8s.KubeClient) err
 		_, ok := err.(ns.NSPathNotExistErr)
 		if ok {
 			netnsfound = false
-			logging.Debugf("cmdDel: WARNING netns may not exist, netns: %s, err: %s", netns, err)
+			logging.Debugf("cmdDel: WARNING netns may not exist, netns: %s, err: %s", args.Netns, err)
 		} else {
 			return fmt.Errorf("failed to open netns %q: %v", netns, err)
 		}