Merge pull request kubernetes#34813 from gmarek/automated-cherry-pick…

…-of-#34809-upstream-release-1.4 Automated cherry pick of kubernetes#34809
shyamjvs · Oct 14, 2016 · 619ed8e · 619ed8e
2 parents 9848126 + eb68b0a
commit 619ed8e
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/pkg/controller/node/nodecontroller.go b/pkg/controller/node/nodecontroller.go
@@ -399,6 +399,10 @@ func (nc *NodeController) Run() {
 
 	// Incorporate the results of node status pushed from kubelet to master.
 	go wait.Until(func() {
+		if !nc.nodeController.HasSynced() || !nc.podController.HasSynced() || !nc.daemonSetController.HasSynced() {
+			glog.V(2).Infof("NodeController is waiting for informers to sync...")
+			return
+		}
 		if err := nc.monitorNodeStatus(); err != nil {
 			glog.Errorf("Error monitoring node status: %v", err)
 		}
@@ -417,6 +421,10 @@ func (nc *NodeController) Run() {
 	//    c. If there are pods still terminating, wait for their estimated completion
 	//       before retrying
 	go wait.Until(func() {
+		if !nc.nodeController.HasSynced() || !nc.podController.HasSynced() || !nc.daemonSetController.HasSynced() {
+			glog.V(2).Infof("NodeController is waiting for informers to sync...")
+			return
+		}
 		nc.evictorLock.Lock()
 		defer nc.evictorLock.Unlock()
 		for k := range nc.zonePodEvictor {
@@ -450,6 +458,10 @@ func (nc *NodeController) Run() {
 	// TODO: replace with a controller that ensures pods that are terminating complete
 	// in a particular time period
 	go wait.Until(func() {
+		if !nc.nodeController.HasSynced() || !nc.podController.HasSynced() || !nc.daemonSetController.HasSynced() {
+			glog.V(2).Infof("NodeController is waiting for informers to sync...")
+			return
+		}
 		nc.evictorLock.Lock()
 		defer nc.evictorLock.Unlock()
 		for k := range nc.zoneTerminationEvictor {
@@ -478,6 +490,10 @@ func (nc *NodeController) Run() {
 	}, nodeEvictionPeriod, wait.NeverStop)
 
 	go wait.Until(func() {
+		if !nc.nodeController.HasSynced() || !nc.podController.HasSynced() || !nc.daemonSetController.HasSynced() {
+			glog.V(2).Infof("NodeController is waiting for informers to sync...")
+			return
+		}
 		pods, err := nc.podStore.List(labels.Everything())
 		if err != nil {
 			utilruntime.HandleError(err)