Fix retrying in ipam controller

This commit is contained in:
wojtekt 2018-08-31 13:41:16 +02:00
parent ff46c0fe6b
commit fcd2882722

View File

@ -157,7 +157,6 @@ func (ca *cloudCIDRAllocator) worker(stopChan <-chan struct{}) {
} }
if err := ca.updateCIDRAllocation(workItem); err == nil { if err := ca.updateCIDRAllocation(workItem); err == nil {
glog.V(3).Infof("Updated CIDR for %q", workItem) glog.V(3).Infof("Updated CIDR for %q", workItem)
ca.removeNodeFromProcessing(workItem)
} else { } else {
glog.Errorf("Error updating CIDR for %q: %v", workItem, err) glog.Errorf("Error updating CIDR for %q: %v", workItem, err)
if canRetry, timeout := ca.retryParams(workItem); canRetry { if canRetry, timeout := ca.retryParams(workItem); canRetry {
@ -170,6 +169,7 @@ func (ca *cloudCIDRAllocator) worker(stopChan <-chan struct{}) {
} }
glog.Errorf("Exceeded retry count for %q, dropping from queue", workItem) glog.Errorf("Exceeded retry count for %q, dropping from queue", workItem)
} }
ca.removeNodeFromProcessing(workItem)
case <-stopChan: case <-stopChan:
return return
} }