github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-09-20 09:01:15 +00:00
Code Issues Projects Releases Wiki Activity

fixing the cmddel fix code

Browse Source
This commit is contained in:
rkamudhan
2018-08-16 23:37:59 +01:00
committed by Kuralamudhan Ramakrishnan
parent b01f784504
commit f0f1d506c4
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
multus/multus.go
View File

@@ -313,8 +313,7 @@ func cmdDel(args *skel.CmdArgs, exec invoke.Exec, kubeClient k8s.KubeClient) err
} }
netns, err := ns.GetNS(args.Netns) netns, err := ns.GetNS(args.Netns)
if err != nil { if err != nil {
if err != nil { // if NetNs is passed down by the Cloud Orchestration Engine, or if it called multiple times
// 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. // so don't return an error if the device is already removed.
// https://github.com/kubernetes/kubernetes/issues/43014#issuecomment-287164444 // https://github.com/kubernetes/kubernetes/issues/43014#issuecomment-287164444
_, ok := err.(ns.NSPathNotExistErr) _, ok := err.(ns.NSPathNotExistErr)
@@ -323,7 +322,6 @@ func cmdDel(args *skel.CmdArgs, exec invoke.Exec, kubeClient k8s.KubeClient) err
} }
return fmt.Errorf("failed to open netns %q: %v", netns, err) return fmt.Errorf("failed to open netns %q: %v", netns, err)
} }
}
defer netns.Close() defer netns.Close()
k8sArgs, err := k8s.GetK8sArgs(args) k8sArgs, err := k8s.GetK8sArgs(args)