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

plugins/{ptp,bridge}: teardown first

Browse Source 
This will allow the IPAM allocations to be cleared in case the
interfaces and iptables rules are non-existent.
This commit is contained in:
Stefan Junker 2016-05-11 18:50:25 +02:00
parent 2c482f433c
commit 5d67d22caa
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/main/bridge/bridge.go
View File

@ -238,6 +238,10 @@ func cmdDel(args *skel.CmdArgs) error {
return err
}
if err := ipam.ExecDel(n.IPAM.Type, args.StdinData); err != nil {
return err
}
var ipn *net.IPNet
err = ns.WithNetNSPath(args.Netns, false, func(hostNS *os.File) error {
var err error
@ -256,7 +260,7 @@ func cmdDel(args *skel.CmdArgs) error {
}
}
return ipam.ExecDel(n.IPAM.Type, args.StdinData)
return nil
}
func main() {

6
plugins/main/ptp/ptp.go
View File

@ -195,6 +195,10 @@ func cmdDel(args *skel.CmdArgs) error {
return fmt.Errorf("failed to load netconf: %v", err)
}
if err := ipam.ExecDel(conf.IPAM.Type, args.StdinData); err != nil {
return err
}
var ipn *net.IPNet
err := ns.WithNetNSPath(args.Netns, false, func(hostNS *os.File) error {
var err error
@ -213,7 +217,7 @@ func cmdDel(args *skel.CmdArgs) error {
}
}
return ipam.ExecDel(conf.IPAM.Type, args.StdinData)
return nil
}
func main() {