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

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

Browse Source 
Handle empty netns in DEL for `loopback` and `host-device`.
This commit is contained in:
Dan Williams 2018-10-17 10:21:29 -05:00 committed by GitHub
commit b93d284d18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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)