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

Merge pull request #78 from rmohr/dhcp

Browse Source 
Don't let DHCP IPAM plugin fail on missing lease
This commit is contained in:
Matt Dupre 2017-10-11 14:50:19 +01:00 committed by GitHub
commit 0063a1b9d0
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 {