github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-09-19 08:25:18 +00:00
Code Issues Projects Releases Wiki Activity

Allows cmdDel to finish if netns doesn't exist, omits deferred netns.Close() in such a case

Browse Source
This commit is contained in:
dougbtv
2019-02-21 14:33:03 -05:00
committed by Kuralamudhan Ramakrishnan
parent 8bf358071a
commit 9b41f7635d
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
multus/multus.go
View File

@@ -402,11 +402,15 @@ func cmdDel(args *skel.CmdArgs, exec invoke.Exec, kubeClient k8s.KubeClient) err
// 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)
if ok { if ok {
return nil logging.Debugf("cmdDel: WARNING netns may not exist, netns: %s, err: %s", netns, err)
} else {
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()
if netns != nil {
defer netns.Close()
}
k8sArgs, err := k8s.GetK8sArgs(args) k8sArgs, err := k8s.GetK8sArgs(args)
if err != nil { if err != nil {