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

Don't let DHCP delete fail on missing lease

Browse Source 
There are at least two reasons why a lease is not present:

 * The dhcp ipam daemon was restarted
 * On add the IPAM plugin failed

Don't fail the IPAM invocation when the lease is not present, to allow
proper device cleanup on CNI delete invocations.
This commit is contained in:
Roman Mohr 2017-10-11 11:38:36 +02:00
parent e256564546
commit cc71426592
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/ipam/dhcp/daemon.go
View File

@ -91,10 +91,9 @@ func (d *DHCP) Release(args *skel.CmdArgs, reply *struct{}) error {
if l := d.getLease(args.ContainerID, conf.Name); l != nil { if l := d.getLease(args.ContainerID, conf.Name); l != nil {
l.Stop() l.Stop()
return nil
} }
return fmt.Errorf("lease not found: %v/%v", args.ContainerID, conf.Name) return nil
} }
func (d *DHCP) getLease(contID, netName string) *DHCPLease { func (d *DHCP) getLease(contID, netName string) *DHCPLease {