github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32081 from wojtek-t/list_from_apiserver_in_nodecontroller

Browse Source 
Automatic merge from submit-queue

NodeController listing nodes from apiserver cache

Ref #31981

This is addressing this particular failure:
https://github.com/kubernetes/kubernetes/issues/31981#issuecomment-244432054
This commit is contained in:
Kubernetes Submit Queue
2016-09-05 09:54:36 -07:00
committed by GitHub
parent 9767c26093 b69d516763
commit de954c0b64
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/controller/node/nodecontroller.go
View File

@@ -486,7 +486,10 @@ func (nc *NodeController) Run() {
// post "NodeReady==ConditionUnknown". It also evicts all pods if node is not ready or // post "NodeReady==ConditionUnknown". It also evicts all pods if node is not ready or
// not reachable for a long period of time. // not reachable for a long period of time.
func (nc *NodeController) monitorNodeStatus() error { func (nc *NodeController) monitorNodeStatus() error {
nodes, err := nc.kubeClient.Core().Nodes().List(api.ListOptions{}) // It is enough to list Nodes from apiserver, since we can tolerate some small
// delays comparing to state from etcd and there is eventual consistency anyway.
// TODO: We should list them from local cache: nodeStore.
nodes, err := nc.kubeClient.Core().Nodes().List(api.ListOptions{ResourceVersion: "0"})
if err != nil { if err != nil {
return err return err
} }