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

FieldSelector for node List()

Browse Source
This commit is contained in:
Wojciech Tyczynski
2015-04-10 12:08:36 +02:00
parent 8510fc67ff
commit 88eb0b0295
14 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,7 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client/record"
"github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider"
"github.com/GoogleCloudPlatform/kubernetes/pkg/fields"
"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
"github.com/GoogleCloudPlatform/kubernetes/pkg/types"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
@@ -225,7 +226,7 @@ func (nc *NodeController) SyncCloudNodes() error {
if err != nil {
return err
}
nodes, err := nc.kubeClient.Nodes().List(labels.Everything())
nodes, err := nc.kubeClient.Nodes().List(labels.Everything(), fields.Everything())
if err != nil {
return err
}
@@ -459,7 +460,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(labels.Everything())
nodes, err := nc.kubeClient.Nodes().List(labels.Everything(), fields.Everything())
if err != nil {
return err
}

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

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