From f0f1d506c41a84b3e752402500522ff10a355b41 Mon Sep 17 00:00:00 2001 From: rkamudhan Date: Thu, 16 Aug 2018 23:37:59 +0100 Subject: [PATCH] fixing the cmddel fix code --- multus/multus.go | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/multus/multus.go b/multus/multus.go index 6bd8a6bdb..73f150159 100644 --- a/multus/multus.go +++ b/multus/multus.go @@ -313,16 +313,14 @@ func cmdDel(args *skel.CmdArgs, exec invoke.Exec, kubeClient k8s.KubeClient) err } netns, err := ns.GetNS(args.Netns) if err != nil { - if err != nil { - // if NetNs is passed down by the CEO, or if it called multiple times - // so don't return an error if the device is already removed. - // https://github.com/kubernetes/kubernetes/issues/43014#issuecomment-287164444 - _, ok := err.(ns.NSPathNotExistErr) - if ok { - return nil - } - return fmt.Errorf("failed to open netns %q: %v", netns, err) + // if NetNs is passed down by the Cloud Orchestration Engine, or if it called multiple times + // so don't return an error if the device is already removed. + // https://github.com/kubernetes/kubernetes/issues/43014#issuecomment-287164444 + _, ok := err.(ns.NSPathNotExistErr) + if ok { + return nil } + return fmt.Errorf("failed to open netns %q: %v", netns, err) } defer netns.Close()