Merge pull request #697 from fasaxc/fix-resync-loop-ready

bcreane · web-flow · commit aab828ef9fd5 · 2017-11-27T11:44:23.000-08:00
Pro-actively mark the ready flag resync as done.
diff --git a/lib/backend/k8s/syncer.go b/lib/backend/k8s/syncer.go
@@ -837,6 +837,8 @@ func (syn *kubeSyncer) performSnapshot(versions *resourceVersions) (map[string][
 		}
 		snap[KEY_RS] = []model.KVPair{*ready}
 		keys[KEY_RS] = map[string]bool{ready.Key.String(): true}
+		// There's no watcher for the ready state so we simply mark the resync as done.
+		syn.needsResync[KEY_RS] = false
 
 		log.Infof("Snapshot resourceVersions: %+v", versions)
 		log.Debugf("Created snapshot: %+v", snap)

Original file line number	Diff line number	Diff line change
`@@ -837,6 +837,8 @@ func (syn kubeSyncer) performSnapshot(versions resourceVersions) (map[string][`
`837`	`837`	`}`
`838`	`838`	`snap[KEY_RS] = []model.KVPair{*ready}`
`839`	`839`	`keys[KEY_RS] = map[string]bool{ready.Key.String(): true}`
	`840`	`+ // There's no watcher for the ready state so we simply mark the resync as done.`
	`841`	`+ syn.needsResync[KEY_RS] = false`
`840`	`842`
`841`	`843`	`log.Infof("Snapshot resourceVersions: %+v", versions)`
`842`	`844`	`log.Debugf("Created snapshot: %+v", snap)`