Merge pull request #6675 from wojtek-t/nodes_support_field_selector

pkg/client/nodes.go

@@ -32,7 +32,7 @@ type NodesInterface interface {
 type NodeInterface interface {
 	Get(name string) (result *api.Node, err error)
 	Create(node *api.Node) (*api.Node, error)
-	List(selector labels.Selector) (*api.NodeList, error)
+	List(label labels.Selector, field fields.Selector) (*api.NodeList, error)
 	Delete(name string) error
 	Update(*api.Node) (*api.Node, error)
 	UpdateStatus(*api.Node) (*api.Node, error)
@@ -66,9 +66,9 @@ func (c *nodes) Create(node *api.Node) (*api.Node, error) {
 }
 
 // List takes a selector, and returns the list of nodes that match that selector in the cluster.
-func (c *nodes) List(selector labels.Selector) (*api.NodeList, error) {
+func (c *nodes) List(label labels.Selector, field fields.Selector) (*api.NodeList, error) {
 	result := &api.NodeList{}
-	err := c.r.Get().Resource(c.resourceName()).LabelsSelectorParam(selector).Do().Into(result)
+	err := c.r.Get().Resource(c.resourceName()).LabelsSelectorParam(label).FieldsSelectorParam(field).Do().Into(result)
 	return result, err
 }
 

pkg/client/nodes_test.go

@@ -23,6 +23,7 @@ import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/fields"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
 )
 
@@ -41,7 +42,7 @@ func TestListMinions(t *testing.T) {
 		},
 		Response: Response{StatusCode: 200, Body: &api.NodeList{ListMeta: api.ListMeta{ResourceVersion: "1"}}},
 	}
-	response, err := c.Setup().Nodes().List(labels.Everything())
+	response, err := c.Setup().Nodes().List(labels.Everything(), fields.Everything())
 	c.Validate(t, response, err)
 }
 
@@ -72,7 +73,7 @@ func TestListMinionsLabels(t *testing.T) {
 	c.Setup()
 	c.QueryValidator[labelSelectorQueryParamName] = validateLabels
 	selector := labels.Set{"foo": "bar", "name": "baz"}.AsSelector()
-	receivedNodeList, err := c.Nodes().List(selector)
+	receivedNodeList, err := c.Nodes().List(selector, fields.Everything())
 	c.Validate(t, receivedNodeList, err)
 }
 

pkg/client/testclient/fake_nodes.go

@@ -34,7 +34,7 @@ func (c *FakeNodes) Get(name string) (*api.Node, error) {
 	return obj.(*api.Node), err
 }
 
-func (c *FakeNodes) List(selector labels.Selector) (*api.NodeList, error) {
+func (c *FakeNodes) List(label labels.Selector, field fields.Selector) (*api.NodeList, error) {
 	obj, err := c.Fake.Invokes(FakeAction{Action: "list-nodes"}, &api.NodeList{})
 	return obj.(*api.NodeList), err
 }

pkg/cloudprovider/controller/nodecontroller.go

@@ -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
 	}

pkg/cloudprovider/controller/nodecontroller_test.go

@@ -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++ {

pkg/kubelet/kubelet.go

@@ -171,8 +171,7 @@ func NewMainKubelet(
 		fieldSelector := fields.Set{client.ObjectNameField: hostname}.AsSelector()
 		listWatch := &cache.ListWatch{
 			ListFunc: func() (runtime.Object, error) {
-				// TODO: Use List() with fieldSelector when it is supported.
-				return kubeClient.Nodes().List(labels.Everything())
+				return kubeClient.Nodes().List(labels.Everything(), fieldSelector)
 			},
 			WatchFunc: func(resourceVersion string) (watch.Interface, error) {
 				return kubeClient.Nodes().Watch(labels.Everything(), fieldSelector, resourceVersion)

plugin/pkg/scheduler/factory/factory.go

@@ -234,7 +234,7 @@ func (factory *ConfigFactory) createMinionLW() *cache.ListWatch {
 // Lists all minions and filter out unhealthy ones, then returns
 // an enumerator for cache.Poller.
 func (factory *ConfigFactory) pollMinions() (cache.Enumerator, error) {
-	allNodes, err := factory.Client.Nodes().List(labels.Everything())
+	allNodes, err := factory.Client.Nodes().List(labels.Everything(), fields.Everything())
 	if err != nil {
 		return nil, err
 	}

test/e2e/cadvisor.go

@@ -21,6 +21,7 @@ import (
 	"time"
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/fields"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
 
 	. "github.com/onsi/ginkgo"
@@ -48,7 +49,7 @@ var _ = Describe("Cadvisor", func() {
 
 func CheckCadvisorHealthOnAllNodes(c *client.Client, timeout time.Duration) {
 	By("getting list of nodes")
-	nodeList, err := c.Nodes().List(labels.Everything())
+	nodeList, err := c.Nodes().List(labels.Everything(), fields.Everything())
 	expectNoError(err)
 	var errors []error
 	retries := maxRetries

test/e2e/density.go

@@ -24,6 +24,7 @@ import (
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/fields"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait"
@@ -189,7 +190,7 @@ var _ = Describe("Density", func() {
 		var err error
 		c, err = loadClient()
 		expectNoError(err)
-		minions, err := c.Nodes().List(labels.Everything())
+		minions, err := c.Nodes().List(labels.Everything(), fields.Everything())
 		expectNoError(err)
 		minionCount = len(minions.Items)
 		Expect(minionCount).NotTo(BeZero())

test/e2e/es_cluster_logging.go

@@ -25,6 +25,7 @@ import (
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/fields"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
 
 	. "github.com/onsi/ginkgo"
@@ -163,7 +164,7 @@ func ClusterLevelLoggingWithElasticsearch(c *client.Client) {
 	}
 
 	// Obtain a list of nodes so we can place one synthetic logger on each node.
-	nodes, err := c.Nodes().List(labels.Everything())
+	nodes, err := c.Nodes().List(labels.Everything(), fields.Everything())
 	if err != nil {
 		Failf("Failed to list nodes: %v", err)
 	}

test/e2e/monitoring.go

@@ -24,6 +24,7 @@ import (
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/fields"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
 	influxdb "github.com/influxdb/influxdb/client"
 
@@ -121,7 +122,7 @@ func expectedServicesExist(c *client.Client) error {
 }
 
 func getAllNodesInCluster(c *client.Client) ([]string, error) {
-	nodeList, err := c.Nodes().List(labels.Everything())
+	nodeList, err := c.Nodes().List(labels.Everything(), fields.Everything())
 	if err != nil {
 		return nil, err
 	}

test/e2e/networking.go

@@ -23,6 +23,7 @@ import (
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/fields"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 
@@ -187,7 +188,7 @@ var _ = Describe("Networking", func() {
 
 		By("Creating a webserver (pending) pod on each node")
 
-		nodes, err := c.Nodes().List(labels.Everything())
+		nodes, err := c.Nodes().List(labels.Everything(), fields.Everything())
 		if err != nil {
 			Failf("Failed to list nodes: %v", err)
 		}

test/e2e/pd.go

@@ -24,6 +24,7 @@ import (
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/fields"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 	. "github.com/onsi/ginkgo"
@@ -46,7 +47,7 @@ var _ = Describe("PD", func() {
 
 		podClient = c.Pods(api.NamespaceDefault)
 
-		nodes, err := c.Nodes().List(labels.Everything())
+		nodes, err := c.Nodes().List(labels.Everything(), fields.Everything())
 		expectNoError(err, "Failed to list nodes for e2e cluster.")
 		Expect(len(nodes.Items) >= 2).To(BeTrue())
 

test/soak/serve_hostnames/serve_hostnames.go

@@ -35,6 +35,7 @@ import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/fields"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 	"github.com/golang/glog"
@@ -88,7 +89,7 @@ func main() {
 
 	var nodes *api.NodeList
 	for start := time.Now(); time.Since(start) < nodeListTimeout; time.Sleep(2 * time.Second) {
-		nodes, err = c.Nodes().List(labels.Everything())
+		nodes, err = c.Nodes().List(labels.Everything(), fields.Everything())
 		if err == nil {
 			break
 		}