Merge pull request kubernetes#6381 from lavalamp/fix

Stop the bleeding for kubernetes#6059
duda · Apr 2, 2015 · bac5cd3 · bac5cd3
2 parents 6ac59c8 + 6be09c5
commit bac5cd3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/pkg/kubelet/config/apiserver.go b/pkg/kubelet/config/apiserver.go
@@ -18,6 +18,8 @@ limitations under the License.
 package config
 
 import (
+	"time"
+
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache"
@@ -40,7 +42,9 @@ func newSourceApiserverFromLW(lw cache.ListerWatcher, updates chan<- interface{}
 		}
 		updates <- kubelet.PodUpdate{pods, kubelet.SET, kubelet.ApiserverSource}
 	}
-	cache.NewReflector(lw, &api.Pod{}, cache.NewUndeltaStore(send, cache.MetaNamespaceKeyFunc), 0).Run()
+	// TODO: the 30 second poll loop is here to mitigate #6059 and
+	// shouldn't be neeeded once that is resolved.
+	cache.NewReflector(lw, &api.Pod{}, cache.NewUndeltaStore(send, cache.MetaNamespaceKeyFunc), 30*time.Second).Run()
 }
 
 func getHostFieldLabel(apiVersion string) string {

diff --git a/plugin/pkg/scheduler/factory/factory.go b/plugin/pkg/scheduler/factory/factory.go
@@ -143,7 +143,9 @@ func (f *ConfigFactory) CreateFromKeys(predicateKeys, priorityKeys util.StringSe
 	}
 
 	// Watch and queue pods that need scheduling.
-	cache.NewReflector(f.createUnassignedPodLW(), &api.Pod{}, f.PodQueue, 0).Run()
+	// TODO: the 30 second poll loop is here to mitigate #6059 and
+	// shouldn't be neeeded once that is resolved.
+	cache.NewReflector(f.createUnassignedPodLW(), &api.Pod{}, f.PodQueue, 30*time.Second).Run()
 
 	// Pass through all events to the scheduled pod store, but on a deletion,
 	// also remove from the assumed pods.