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

List in NodesInterface takes label selector

Browse Source
This commit is contained in:
Masahiro Sano
2015-03-29 17:49:23 +09:00
parent 24b478dd0a
commit d04cc5ced4
14 changed files with 59 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cloudprovider/controller/nodecontroller.go
View File

@@ -213,7 +213,7 @@ func (nc *NodeController) SyncCloudNodes() error {
if err != nil {
return err
}
nodes, err := nc.kubeClient.Nodes().List()
nodes, err := nc.kubeClient.Nodes().List(labels.Everything())
if err != nil {
return err
}
@@ -434,7 +434,7 @@ func (nc *NodeController) tryUpdateNodeStatus(node *api.Node) (time.Duration, ap
// post "NodeReady==ConditionUnknown". It also evicts all pods if node is not ready or
// not reachable for a long period of time.
func (nc *NodeController) MonitorNodeStatus() error {
nodes, err := nc.kubeClient.Nodes().List()
nodes, err := nc.kubeClient.Nodes().List(labels.Everything())
if err != nil {
return err
}

2
pkg/cloudprovider/controller/nodecontroller_test.go
View File

@@ -86,7 +86,7 @@ func (m *FakeNodeHandler) Get(name string) (*api.Node, error) {
return nil, nil
}
func (m *FakeNodeHandler) List() (*api.NodeList, error) {
func (m *FakeNodeHandler) List(selector labels.Selector) (*api.NodeList, error) {
defer func() { m.RequestCount++ }()
var nodes []*api.Node
for i := 0; i < len(m.UpdatedNodes); i++ {