Merge pull request #213 from Random-Liu/handle-empty-netns

Handle empty netns in DEL for `loopback` and `host-device`.
containernetworking · Oct 17, 2018 · b93d284 · b93d284
2 parents 3129152 + 2955d63
commit b93d284
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/plugins/main/host-device/host-device.go b/plugins/main/host-device/host-device.go
@@ -85,6 +85,9 @@ func cmdDel(args *skel.CmdArgs) error {
  if err != nil {
  return err
  }
+ if args.Netns == "" {
+ return nil
+ }
  containerNs, err := ns.GetNS(args.Netns)
  if err != nil {
  return fmt.Errorf("failed to open netns %q: %v", args.Netns, err)

diff --git a/plugins/main/loopback/loopback.go b/plugins/main/loopback/loopback.go
@@ -48,6 +48,9 @@ func cmdAdd(args *skel.CmdArgs) error {
 }
 
 func cmdDel(args *skel.CmdArgs) error {
+ if args.Netns == "" {
+ return nil
+ }
  args.IfName = "lo" // ignore config, this only works for loopback
  err := ns.WithNetNSPath(args.Netns, func(ns.NetNS) error {
  link, err := netlink.LinkByName(args.IfName)