Merge pull request #34817 from gmarek/podgc

pkg/controller/podgc/gc_controller.go

@@ -112,6 +112,10 @@ func (gcc *PodGCController) Run(stop <-chan struct{}) {
 }
 
 func (gcc *PodGCController) gc() {
+	if !gcc.podController.HasSynced() || !gcc.nodeController.HasSynced() {
+		glog.V(2).Infof("PodGCController is waiting for informer sync...")
+		return
+	}
 	pods, err := gcc.podStore.List(labels.Everything())
 	if err != nil {
 		glog.Errorf("Error while listing all Pods: %v", err)

pkg/controller/podgc/gc_controller_test.go

@@ -28,6 +28,14 @@ import (
 	"k8s.io/kubernetes/pkg/util/sets"
 )
 
+type FakeController struct{}
+
+func (*FakeController) Run(<-chan struct{}) {}
+
+func (*FakeController) HasSynced() bool {
+	return true
+}
+
 func TestGCTerminated(t *testing.T) {
 	type nameToPhase struct {
 		name  string
@@ -111,6 +119,8 @@ func TestGCTerminated(t *testing.T) {
 			ObjectMeta: api.ObjectMeta{Name: "node"},
 		})
 		gcc.nodeStore = cache.StoreToNodeLister{Store: store}
+		gcc.podController = &FakeController{}
+		gcc.nodeController = &FakeController{}
 
 		gcc.gc()
 
@@ -181,6 +191,8 @@ func TestGCOrphaned(t *testing.T) {
 
 		store := cache.NewStore(cache.MetaNamespaceKeyFunc)
 		gcc.nodeStore = cache.StoreToNodeLister{Store: store}
+		gcc.podController = &FakeController{}
+		gcc.nodeController = &FakeController{}
 
 		gcc.gc()