Skip to content

Commit b93d284

Browse files
authored
Merge pull request #213 from Random-Liu/handle-empty-netns
Handle empty netns in DEL for `loopback` and `host-device`.
2 parents 3129152 + 2955d63 commit b93d284

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

plugins/main/host-device/host-device.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@ func cmdDel(args *skel.CmdArgs) error {
8585
if err != nil {
8686
return err
8787
}
88+
if args.Netns == "" {
89+
return nil
90+
}
8891
containerNs, err := ns.GetNS(args.Netns)
8992
if err != nil {
9093
return fmt.Errorf("failed to open netns %q: %v", args.Netns, err)

plugins/main/loopback/loopback.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ func cmdAdd(args *skel.CmdArgs) error {
4848
}
4949

5050
func cmdDel(args *skel.CmdArgs) error {
51+
if args.Netns == "" {
52+
return nil
53+
}
5154
args.IfName = "lo" // ignore config, this only works for loopback
5255
err := ns.WithNetNSPath(args.Netns, func(ns.NetNS) error {
5356
link, err := netlink.LinkByName(args.IfName)

0 commit comments

Comments
 (0)