diff --git a/pkg/kubelet/config/apiserver.go b/pkg/kubelet/config/apiserver.go index d2d4616f861..b859944fc0a 100644 --- a/pkg/kubelet/config/apiserver.go +++ b/pkg/kubelet/config/apiserver.go @@ -18,8 +18,6 @@ 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" @@ -42,9 +40,7 @@ func newSourceApiserverFromLW(lw cache.ListerWatcher, updates chan<- interface{} } updates <- kubelet.PodUpdate{pods, kubelet.SET, kubelet.ApiserverSource} } - // 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() + cache.NewReflector(lw, &api.Pod{}, cache.NewUndeltaStore(send, cache.MetaNamespaceKeyFunc), 0).Run() } func getHostFieldLabel(apiVersion string) string { diff --git a/plugin/pkg/scheduler/factory/factory.go b/plugin/pkg/scheduler/factory/factory.go index 7f9a2bb9e21..f0a7aa131da 100644 --- a/plugin/pkg/scheduler/factory/factory.go +++ b/plugin/pkg/scheduler/factory/factory.go @@ -143,9 +143,7 @@ func (f *ConfigFactory) CreateFromKeys(predicateKeys, priorityKeys util.StringSe } // Watch and queue pods that need scheduling. - // 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() + cache.NewReflector(f.createUnassignedPodLW(), &api.Pod{}, f.PodQueue, 0).Run() // Pass through all events to the scheduled pod store, but on a deletion, // also remove from the assumed pods.