Merge pull request #61124 from satyasm/avoid-sync-delay

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix Issue #61123, call syncer.Update on add event. **What this PR does / why we need it**: **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #61123 **Special notes for your reviewer**: **Release note**: ```release-note Fixed #61123 by triggering syncer.Update on all cases including when a syncer is created on a new add event. ```

Merge pull request #61124 from satyasm/avoid-sync-delay
d9d13646 · Kubernetes Submit Queue · GitHub · 808545a8 · 4b2de756 · d9d13646
Unverified Commit d9d13646 authored Mar 21, 2018 by Kubernetes Submit Queue Committed by GitHub Mar 21, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

controller.go pkg/controller/nodeipam/ipam/controller.go +3 -2

No files found.
--- a/pkg/controller/nodeipam/ipam/controller.go
+++ b/pkg/controller/nodeipam/ipam/controller.go
@@ -174,14 +174,15 @@ func (c *Controller) onAdd(node *v1.Node) error {
 	c.lock.Lock()
 	defer c.lock.Unlock()
-	if syncer, ok := c.syncers[node.Name]; !ok {
+	syncer, ok := c.syncers[node.Name]
+	if !ok {
 		syncer = c.newSyncer(node.Name)
 		c.syncers[node.Name] = syncer
 		go syncer.Loop(nil)
 	} else {
 		glog.Warningf("Add for node %q that already exists", node.Name)
-		syncer.Update(node)
 	}
+	syncer.Update(node)
 	return nil
 }