ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

Handle empty netns in DEL for loopback and host-device.

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu 2018-10-10 10:49:06 -07:00
parent 726759b29b
commit 2955d63c95
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/main/host-device/host-device.go
View File

@ -85,6 +85,9 @@ func cmdDel(args *skel.CmdArgs) error {
if err != nil { if err != nil {
return err return err
} }
if args.Netns == "" {
return nil
}
containerNs, err := ns.GetNS(args.Netns) containerNs, err := ns.GetNS(args.Netns)
if err != nil { if err != nil {
return fmt.Errorf("failed to open netns %q: %v", args.Netns, err) return fmt.Errorf("failed to open netns %q: %v", args.Netns, err)

3
plugins/main/loopback/loopback.go
View File

@ -48,6 +48,9 @@ func cmdAdd(args *skel.CmdArgs) error {
} }
func cmdDel(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 args.IfName = "lo" // ignore config, this only works for loopback
err := ns.WithNetNSPath(args.Netns, func(ns.NetNS) error { err := ns.WithNetNSPath(args.Netns, func(ns.NetNS) error {
link, err := netlink.LinkByName(args.IfName) link, err := netlink.LinkByName(args.IfName)