Merge pull request #5870 from dchen1107/podstatus

Fix a bug of running node selector predicate on kubelet introduced by #5...
This commit is contained in:
David Oppenheimer
2015-03-24 14:05:27 -07:00

View File

@@ -177,7 +177,7 @@ func NewMainKubelet(
}
serviceLister := &cache.StoreToServiceLister{serviceStore}
serviceStore = cache.NewStore(cache.MetaNamespaceKeyFunc)
nodeStore := cache.NewStore(cache.MetaNamespaceKeyFunc)
if kubeClient != nil {
// TODO: cache.NewListWatchFromClient is limited as it takes a client implementation rather
// than an interface. There is no way to construct a list+watcher using resource name.
@@ -194,9 +194,9 @@ func NewMainKubelet(
labels.Everything(), fields.Everything(), resourceVersion)
},
}
cache.NewReflector(listWatch, &api.Service{}, serviceStore, 0).Run()
cache.NewReflector(listWatch, &api.Node{}, nodeStore, 0).Run()
}
nodeLister := &cache.StoreToNodeLister{serviceStore}
nodeLister := &cache.StoreToNodeLister{nodeStore}
containerGC, err := newContainerGC(dockerClient, containerGCPolicy)
if err != nil {