From 6dcb689d4ee581a043d10dc8fb6a74b32018b12b Mon Sep 17 00:00:00 2001 From: Wojciech Tyczynski Date: Wed, 2 Dec 2015 12:12:57 +0100 Subject: [PATCH] Simplify List() signature in clients. --- cmd/integration/integration.go | 12 +-- .../components/framework/framework.go | 6 +- .../mesos/pkg/service/endpoints_controller.go | 7 +- pkg/client/unversioned/componentstatuses.go | 12 ++- pkg/client/unversioned/daemon_sets.go | 8 +- pkg/client/unversioned/daemon_sets_test.go | 4 +- pkg/client/unversioned/deployment.go | 8 +- pkg/client/unversioned/deployment_test.go | 4 +- pkg/client/unversioned/endpoints.go | 8 +- pkg/client/unversioned/endpoints_test.go | 4 +- pkg/client/unversioned/events.go | 9 +-- pkg/client/unversioned/events_test.go | 5 +- .../unversioned/horizontalpodautoscaler.go | 8 +- .../horizontalpodautoscaler_test.go | 4 +- pkg/client/unversioned/ingress.go | 8 +- pkg/client/unversioned/ingress_test.go | 4 +- pkg/client/unversioned/jobs.go | 8 +- pkg/client/unversioned/jobs_test.go | 4 +- pkg/client/unversioned/limit_ranges.go | 8 +- pkg/client/unversioned/limit_ranges_test.go | 4 +- pkg/client/unversioned/namespaces.go | 8 +- pkg/client/unversioned/namespaces_test.go | 4 +- pkg/client/unversioned/nodes.go | 8 +- pkg/client/unversioned/nodes_test.go | 6 +- .../unversioned/persistentvolume_test.go | 4 +- .../unversioned/persistentvolumeclaim.go | 8 +- .../unversioned/persistentvolumeclaim_test.go | 4 +- pkg/client/unversioned/persistentvolumes.go | 8 +- pkg/client/unversioned/pod_templates.go | 8 +- pkg/client/unversioned/pod_templates_test.go | 4 +- pkg/client/unversioned/pods.go | 8 +- pkg/client/unversioned/pods_test.go | 8 +- .../unversioned/replication_controllers.go | 8 +- .../replication_controllers_test.go | 4 +- pkg/client/unversioned/resource_quotas.go | 8 +- .../unversioned/resource_quotas_test.go | 4 +- pkg/client/unversioned/secrets.go | 8 +- pkg/client/unversioned/service_accounts.go | 8 +- pkg/client/unversioned/services.go | 8 +- pkg/client/unversioned/services_test.go | 6 +- pkg/client/unversioned/testclient/actions.go | 24 +++++- .../testclient/fake_componentstatuses.go | 7 +- .../testclient/fake_daemon_sets.go | 6 +- .../testclient/fake_deployments.go | 9 ++- .../unversioned/testclient/fake_endpoints.go | 6 +- .../unversioned/testclient/fake_events.go | 11 ++- .../fake_horizontal_pod_autoscalers.go | 9 ++- .../unversioned/testclient/fake_ingress.go | 6 +- .../unversioned/testclient/fake_jobs.go | 6 +- .../testclient/fake_limit_ranges.go | 6 +- .../unversioned/testclient/fake_namespaces.go | 6 +- .../unversioned/testclient/fake_nodes.go | 6 +- .../fake_persistent_volume_claims.go | 6 +- .../testclient/fake_persistent_volumes.go | 6 +- .../testclient/fake_pod_templates.go | 6 +- .../unversioned/testclient/fake_pods.go | 9 ++- .../fake_replication_controllers.go | 6 +- .../testclient/fake_resource_quotas.go | 6 +- .../unversioned/testclient/fake_secrets.go | 6 +- .../testclient/fake_service_accounts.go | 6 +- .../unversioned/testclient/fake_services.go | 6 +- .../unversioned/testclient/testclient_test.go | 10 +-- pkg/controller/daemon/controller.go | 7 +- .../deployment/deployment_controller.go | 4 +- .../endpoint/endpoints_controller.go | 7 +- pkg/controller/gc/gc_controller.go | 3 +- pkg/controller/job/controller.go | 6 +- .../namespace/namespace_controller.go | 32 ++++---- pkg/controller/node/nodecontroller.go | 21 +++--- pkg/controller/node/nodecontroller_test.go | 4 +- ...ersistentvolume_claim_binder_controller.go | 6 +- .../persistentvolume_recycler_controller.go | 4 +- pkg/controller/podautoscaler/horizontal.go | 4 +- .../podautoscaler/metrics/metrics_client.go | 4 +- .../replication/replication_controller.go | 5 +- .../resource_quota_controller.go | 16 ++-- pkg/controller/route/routecontroller.go | 4 +- .../serviceaccounts_controller.go | 6 +- .../serviceaccount/tokens_controller.go | 6 +- pkg/kubectl/cmd/util/factory.go | 5 +- pkg/kubectl/describe.go | 23 +++--- pkg/kubectl/rolling_updater.go | 14 ++-- pkg/kubectl/stop.go | 6 +- pkg/kubelet/kubelet.go | 6 +- pkg/util/deployment/deployment.go | 13 ++-- pkg/volume/util.go | 4 +- plugin/pkg/admission/limitranger/admission.go | 4 +- .../namespace/autoprovision/admission.go | 4 +- .../admission/namespace/exists/admission.go | 4 +- .../namespace/lifecycle/admission.go | 4 +- .../pkg/admission/resourcequota/admission.go | 4 +- .../pkg/admission/serviceaccount/admission.go | 6 +- test/e2e/cadvisor.go | 4 +- test/e2e/cluster_size_autoscaling.go | 4 +- test/e2e/cluster_upgrade.go | 2 +- test/e2e/daemon_restart.go | 7 +- test/e2e/daemon_set.go | 15 ++-- test/e2e/density.go | 23 +++--- test/e2e/dns.go | 7 +- test/e2e/es_cluster_logging.go | 10 ++- test/e2e/etcd_failure.go | 7 +- test/e2e/events.go | 40 +++++----- test/e2e/example_cluster_dns.go | 7 +- test/e2e/example_k8petstore.go | 4 +- test/e2e/examples.go | 5 +- test/e2e/framework.go | 5 +- test/e2e/garbage_collector.go | 4 +- test/e2e/ingress.go | 10 +-- test/e2e/job.go | 4 +- test/e2e/kibana_logging.go | 4 +- test/e2e/kubectl.go | 7 +- test/e2e/kubelet.go | 4 +- test/e2e/kubelet_perf.go | 4 +- test/e2e/kubelet_stats.go | 8 +- test/e2e/kubeproxy.go | 7 +- test/e2e/latency.go | 21 +++--- test/e2e/load.go | 6 +- test/e2e/mesos.go | 9 ++- test/e2e/metrics_util.go | 4 +- test/e2e/monitor_resources.go | 4 +- test/e2e/monitoring.go | 13 ++-- test/e2e/namespace.go | 5 +- test/e2e/networking.go | 4 +- test/e2e/nodeoutofdisk.go | 23 +++--- test/e2e/pd.go | 4 +- test/e2e/pods.go | 33 ++++++--- test/e2e/proxy.go | 4 +- test/e2e/reboot.go | 2 +- test/e2e/resize_nodes.go | 9 ++- test/e2e/scheduler_predicates.go | 55 +++++++------- test/e2e/service.go | 6 +- test/e2e/service_accounts.go | 4 +- test/e2e/service_latency.go | 4 +- test/e2e/serviceloadbalancers.go | 5 +- test/e2e/util.go | 74 +++++++++++-------- test/integration/client_test.go | 5 +- test/integration/framework/master_utils.go | 4 +- test/integration/metrics_test.go | 4 +- test/integration/service_account_test.go | 8 +- test/soak/cauldron/cauldron.go | 4 +- test/soak/serve_hostnames/serve_hostnames.go | 4 +- 141 files changed, 532 insertions(+), 650 deletions(-) diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go index 283d31823f4..eb02f45e58c 100644 --- a/cmd/integration/integration.go +++ b/cmd/integration/integration.go @@ -44,7 +44,6 @@ import ( endpointcontroller "k8s.io/kubernetes/pkg/controller/endpoint" nodecontroller "k8s.io/kubernetes/pkg/controller/node" replicationcontroller "k8s.io/kubernetes/pkg/controller/replication" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/kubelet/cadvisor" "k8s.io/kubernetes/pkg/kubelet/cm" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" @@ -273,7 +272,8 @@ func makeTempDirOrDie(prefix string, baseDir string) string { func podsOnNodes(c *client.Client, podNamespace string, labelSelector labels.Selector) wait.ConditionFunc { // Wait until all pods are running on the node. return func() (bool, error) { - pods, err := c.Pods(podNamespace).List(labelSelector, fields.Everything(), unversioned.ListOptions{}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{labelSelector}} + pods, err := c.Pods(podNamespace).List(options) if err != nil { glog.Infof("Unable to get pods to list: %v", err) return false, nil @@ -399,7 +399,7 @@ containers: namespace := kubetypes.NamespaceDefault if err := wait.Poll(time.Second, longTestTimeout, podRunning(c, namespace, podName)); err != nil { - if pods, err := c.Pods(namespace).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}); err == nil { + if pods, err := c.Pods(namespace).List(unversioned.ListOptions{}); err == nil { for _, pod := range pods.Items { glog.Infof("pod found: %s/%s", namespace, pod.Name) } @@ -507,7 +507,7 @@ func runSelfLinkTestOnNamespace(c *client.Client, namespace string) { glog.Fatalf("Failed listing service with supplied self link '%v': %v", svc.SelfLink, err) } - svcList, err := services.List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + svcList, err := services.List(unversioned.ListOptions{}) if err != nil { glog.Fatalf("Failed listing services: %v", err) } @@ -728,7 +728,7 @@ func runPatchTest(c *client.Client) { func runMasterServiceTest(client *client.Client) { time.Sleep(12 * time.Second) - svcList, err := client.Services(api.NamespaceDefault).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + svcList, err := client.Services(api.NamespaceDefault).List(unversioned.ListOptions{}) if err != nil { glog.Fatalf("Unexpected error listing services: %v", err) } @@ -855,7 +855,7 @@ func runServiceTest(client *client.Client) { glog.Fatalf("FAILED: service in other namespace should have no endpoints: %v", err) } - svcList, err := client.Services(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + svcList, err := client.Services(api.NamespaceAll).List(unversioned.ListOptions{}) if err != nil { glog.Fatalf("Failed to list services across namespaces: %v", err) } diff --git a/contrib/mesos/pkg/scheduler/components/framework/framework.go b/contrib/mesos/pkg/scheduler/components/framework/framework.go index b38a50f8e8b..f91c36fdbdd 100644 --- a/contrib/mesos/pkg/scheduler/components/framework/framework.go +++ b/contrib/mesos/pkg/scheduler/components/framework/framework.go @@ -45,10 +45,8 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/kubelet/container" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/sets" ) @@ -652,7 +650,7 @@ func (k *framework) makeTaskRegistryReconciler() taskreconciler.Action { // tasks identified by annotations in the Kubernetes pod registry. func (k *framework) makePodRegistryReconciler() taskreconciler.Action { return taskreconciler.Action(func(drv bindings.SchedulerDriver, cancel <-chan struct{}) <-chan error { - podList, err := k.client.Pods(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + podList, err := k.client.Pods(api.NamespaceAll).List(unversioned.ListOptions{}) if err != nil { return proc.ErrorChanf("failed to reconcile pod registry: %v", err) } @@ -728,7 +726,7 @@ func (k *framework) explicitlyReconcileTasks(driver bindings.SchedulerDriver, ta } func (ks *framework) recoverTasks() error { - podList, err := ks.client.Pods(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + podList, err := ks.client.Pods(api.NamespaceAll).List(unversioned.ListOptions{}) if err != nil { log.V(1).Infof("failed to recover pod registry, madness may ensue: %v", err) return err diff --git a/contrib/mesos/pkg/service/endpoints_controller.go b/contrib/mesos/pkg/service/endpoints_controller.go index 7a507df0c1f..e0b6fe16f52 100644 --- a/contrib/mesos/pkg/service/endpoints_controller.go +++ b/contrib/mesos/pkg/service/endpoints_controller.go @@ -31,7 +31,6 @@ import ( client "k8s.io/kubernetes/pkg/client/unversioned" kservice "k8s.io/kubernetes/pkg/controller/endpoint" "k8s.io/kubernetes/pkg/controller/framework" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" @@ -60,7 +59,7 @@ func NewEndpointController(client *client.Client) *endpointController { e.serviceStore.Store, e.serviceController = framework.NewInformer( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return e.client.Services(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + return e.client.Services(api.NamespaceAll).List(unversioned.ListOptions{}) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { return e.client.Services(api.NamespaceAll).Watch(options) @@ -80,7 +79,7 @@ func NewEndpointController(client *client.Client) *endpointController { e.podStore.Store, e.podController = framework.NewInformer( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return e.client.Pods(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + return e.client.Pods(api.NamespaceAll).List(unversioned.ListOptions{}) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { return e.client.Pods(api.NamespaceAll).Watch(options) @@ -386,7 +385,7 @@ func (e *endpointController) syncService(key string) { // some stragglers could have been left behind if the endpoint controller // reboots). func (e *endpointController) checkLeftoverEndpoints() { - list, err := e.client.Endpoints(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + list, err := e.client.Endpoints(api.NamespaceAll).List(unversioned.ListOptions{}) if err != nil { glog.Errorf("Unable to list endpoints (%v); orphaned endpoints will not be cleaned up. (They're pretty harmless, but you can restart this component if you want another attempt made.)", err) return diff --git a/pkg/client/unversioned/componentstatuses.go b/pkg/client/unversioned/componentstatuses.go index b72a8a5dbdd..86fe6100680 100644 --- a/pkg/client/unversioned/componentstatuses.go +++ b/pkg/client/unversioned/componentstatuses.go @@ -18,8 +18,7 @@ package unversioned import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/api/unversioned" ) type ComponentStatusesInterface interface { @@ -28,11 +27,11 @@ type ComponentStatusesInterface interface { // ComponentStatusInterface contains methods to retrieve ComponentStatus type ComponentStatusInterface interface { - List(label labels.Selector, field fields.Selector) (*api.ComponentStatusList, error) + List(opts unversioned.ListOptions) (*api.ComponentStatusList, error) Get(name string) (*api.ComponentStatus, error) // TODO: It'd be nice to have watch support at some point - //Watch(label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error) + //Watch(opts unversioned.ListOptions) (watch.Interface, error) } // componentStatuses implements ComponentStatusesInterface @@ -44,12 +43,11 @@ func newComponentStatuses(c *Client) *componentStatuses { return &componentStatuses{c} } -func (c *componentStatuses) List(label labels.Selector, field fields.Selector) (result *api.ComponentStatusList, err error) { +func (c *componentStatuses) List(opts unversioned.ListOptions) (result *api.ComponentStatusList, err error) { result = &api.ComponentStatusList{} err = c.client.Get(). Resource("componentStatuses"). - LabelsSelectorParam(label). - FieldsSelectorParam(field). + VersionedParams(&opts, api.Scheme). Do(). Into(result) diff --git a/pkg/client/unversioned/daemon_sets.go b/pkg/client/unversioned/daemon_sets.go index fa17a63567c..f40ffb42c37 100644 --- a/pkg/client/unversioned/daemon_sets.go +++ b/pkg/client/unversioned/daemon_sets.go @@ -20,8 +20,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -31,7 +29,7 @@ type DaemonSetsNamespacer interface { } type DaemonSetInterface interface { - List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*extensions.DaemonSetList, error) + List(opts unversioned.ListOptions) (*extensions.DaemonSetList, error) Get(name string) (*extensions.DaemonSet, error) Create(ctrl *extensions.DaemonSet) (*extensions.DaemonSet, error) Update(ctrl *extensions.DaemonSet) (*extensions.DaemonSet, error) @@ -53,9 +51,9 @@ func newDaemonSets(c *ExtensionsClient, namespace string) *daemonSets { // Ensure statically that daemonSets implements DaemonSetsInterface. var _ DaemonSetInterface = &daemonSets{} -func (c *daemonSets) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (result *extensions.DaemonSetList, err error) { +func (c *daemonSets) List(opts unversioned.ListOptions) (result *extensions.DaemonSetList, err error) { result = &extensions.DaemonSetList{} - err = c.r.Get().Namespace(c.ns).Resource("daemonsets").VersionedParams(&opts, api.Scheme).LabelsSelectorParam(label).FieldsSelectorParam(field).Do().Into(result) + err = c.r.Get().Namespace(c.ns).Resource("daemonsets").VersionedParams(&opts, api.Scheme).Do().Into(result) return } diff --git a/pkg/client/unversioned/daemon_sets_test.go b/pkg/client/unversioned/daemon_sets_test.go index 033a398234f..567077d8cc0 100644 --- a/pkg/client/unversioned/daemon_sets_test.go +++ b/pkg/client/unversioned/daemon_sets_test.go @@ -23,8 +23,6 @@ import ( "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" ) func getDSResourceName() string { @@ -57,7 +55,7 @@ func TestListDaemonSets(t *testing.T) { }, }, } - receivedDSs, err := c.Setup(t).Extensions().DaemonSets(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + receivedDSs, err := c.Setup(t).Extensions().DaemonSets(ns).List(unversioned.ListOptions{}) c.Validate(t, receivedDSs, err) } diff --git a/pkg/client/unversioned/deployment.go b/pkg/client/unversioned/deployment.go index 34d9f3e8d76..32a13e5588f 100644 --- a/pkg/client/unversioned/deployment.go +++ b/pkg/client/unversioned/deployment.go @@ -20,8 +20,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -32,7 +30,7 @@ type DeploymentsNamespacer interface { // DeploymentInterface has methods to work with Deployment resources. type DeploymentInterface interface { - List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*extensions.DeploymentList, error) + List(opts unversioned.ListOptions) (*extensions.DeploymentList, error) Get(name string) (*extensions.Deployment, error) Delete(name string, options *api.DeleteOptions) error Create(*extensions.Deployment) (*extensions.Deployment, error) @@ -56,9 +54,9 @@ func newDeployments(c *ExtensionsClient, namespace string) *deployments { } // List takes label and field selectors, and returns the list of Deployments that match those selectors. -func (c *deployments) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (result *extensions.DeploymentList, err error) { +func (c *deployments) List(opts unversioned.ListOptions) (result *extensions.DeploymentList, err error) { result = &extensions.DeploymentList{} - err = c.client.Get().Namespace(c.ns).Resource("deployments").VersionedParams(&opts, api.Scheme).LabelsSelectorParam(label).FieldsSelectorParam(field).Do().Into(result) + err = c.client.Get().Namespace(c.ns).Resource("deployments").VersionedParams(&opts, api.Scheme).Do().Into(result) return } diff --git a/pkg/client/unversioned/deployment_test.go b/pkg/client/unversioned/deployment_test.go index 989ce54ea9f..058dca9657b 100644 --- a/pkg/client/unversioned/deployment_test.go +++ b/pkg/client/unversioned/deployment_test.go @@ -24,8 +24,6 @@ import ( "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" ) func getDeploymentsResoureName() string { @@ -100,7 +98,7 @@ func TestDeploymentList(t *testing.T) { }, Response: Response{StatusCode: 200, Body: deploymentList}, } - response, err := c.Setup(t).Deployments(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + response, err := c.Setup(t).Deployments(ns).List(unversioned.ListOptions{}) c.Validate(t, response, err) } diff --git a/pkg/client/unversioned/endpoints.go b/pkg/client/unversioned/endpoints.go index ad85cdcd9ef..f5d3237d33b 100644 --- a/pkg/client/unversioned/endpoints.go +++ b/pkg/client/unversioned/endpoints.go @@ -21,8 +21,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -34,7 +32,7 @@ type EndpointsNamespacer interface { // EndpointsInterface has methods to work with Endpoints resources type EndpointsInterface interface { Create(endpoints *api.Endpoints) (*api.Endpoints, error) - List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.EndpointsList, error) + List(opts unversioned.ListOptions) (*api.EndpointsList, error) Get(name string) (*api.Endpoints, error) Delete(name string) error Update(endpoints *api.Endpoints) (*api.Endpoints, error) @@ -60,14 +58,12 @@ func (c *endpoints) Create(endpoints *api.Endpoints) (*api.Endpoints, error) { } // List takes a selector, and returns the list of endpoints that match that selector -func (c *endpoints) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (result *api.EndpointsList, err error) { +func (c *endpoints) List(opts unversioned.ListOptions) (result *api.EndpointsList, err error) { result = &api.EndpointsList{} err = c.r.Get(). Namespace(c.ns). Resource("endpoints"). VersionedParams(&opts, api.Scheme). - LabelsSelectorParam(label). - FieldsSelectorParam(field). Do(). Into(result) return diff --git a/pkg/client/unversioned/endpoints_test.go b/pkg/client/unversioned/endpoints_test.go index 37eb3391db4..93499c79f7a 100644 --- a/pkg/client/unversioned/endpoints_test.go +++ b/pkg/client/unversioned/endpoints_test.go @@ -22,8 +22,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" ) func TestListEndpoints(t *testing.T) { @@ -44,7 +42,7 @@ func TestListEndpoints(t *testing.T) { }, }, } - receivedEndpointsList, err := c.Setup(t).Endpoints(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + receivedEndpointsList, err := c.Setup(t).Endpoints(ns).List(unversioned.ListOptions{}) c.Validate(t, receivedEndpointsList, err) } diff --git a/pkg/client/unversioned/events.go b/pkg/client/unversioned/events.go index d357cee1099..5128d0f9a46 100644 --- a/pkg/client/unversioned/events.go +++ b/pkg/client/unversioned/events.go @@ -22,7 +22,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/watch" ) @@ -37,7 +36,7 @@ type EventInterface interface { Create(event *api.Event) (*api.Event, error) Update(event *api.Event) (*api.Event, error) Patch(event *api.Event, data []byte) (*api.Event, error) - List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.EventList, error) + List(opts unversioned.ListOptions) (*api.EventList, error) Get(name string) (*api.Event, error) Watch(opts unversioned.ListOptions) (watch.Interface, error) // Search finds events about the specified object @@ -117,14 +116,12 @@ func (e *events) Patch(incompleteEvent *api.Event, data []byte) (*api.Event, err } // List returns a list of events matching the selectors. -func (e *events) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.EventList, error) { +func (e *events) List(opts unversioned.ListOptions) (*api.EventList, error) { result := &api.EventList{} err := e.client.Get(). NamespaceIfScoped(e.namespace, len(e.namespace) > 0). Resource("events"). VersionedParams(&opts, api.Scheme). - LabelsSelectorParam(label). - FieldsSelectorParam(field). Do(). Into(result) return result, err @@ -174,7 +171,7 @@ func (e *events) Search(objOrRef runtime.Object) (*api.EventList, error) { refUID = &stringRefUID } fieldSelector := e.GetFieldSelector(&ref.Name, &ref.Namespace, refKind, refUID) - return e.List(labels.Everything(), fieldSelector, unversioned.ListOptions{}) + return e.List(unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{fieldSelector}}) } // Delete deletes an existing event. diff --git a/pkg/client/unversioned/events_test.go b/pkg/client/unversioned/events_test.go index 542af2f7c6b..a0f0b1a41c6 100644 --- a/pkg/client/unversioned/events_test.go +++ b/pkg/client/unversioned/events_test.go @@ -24,8 +24,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" ) func TestEventSearch(t *testing.T) { @@ -166,8 +164,7 @@ func TestEventList(t *testing.T) { }, Response: Response{StatusCode: 200, Body: eventList}, } - response, err := c.Setup(t).Events(ns).List(labels.Everything(), - fields.Everything(), unversioned.ListOptions{}) + response, err := c.Setup(t).Events(ns).List(unversioned.ListOptions{}) if err != nil { t.Errorf("%#v should be nil.", err) diff --git a/pkg/client/unversioned/horizontalpodautoscaler.go b/pkg/client/unversioned/horizontalpodautoscaler.go index 89a5e25a2db..6c87f6a780b 100644 --- a/pkg/client/unversioned/horizontalpodautoscaler.go +++ b/pkg/client/unversioned/horizontalpodautoscaler.go @@ -20,8 +20,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -32,7 +30,7 @@ type HorizontalPodAutoscalersNamespacer interface { // HorizontalPodAutoscalerInterface has methods to work with HorizontalPodAutoscaler resources. type HorizontalPodAutoscalerInterface interface { - List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*extensions.HorizontalPodAutoscalerList, error) + List(opts unversioned.ListOptions) (*extensions.HorizontalPodAutoscalerList, error) Get(name string) (*extensions.HorizontalPodAutoscaler, error) Delete(name string, options *api.DeleteOptions) error Create(horizontalPodAutoscaler *extensions.HorizontalPodAutoscaler) (*extensions.HorizontalPodAutoscaler, error) @@ -56,9 +54,9 @@ func newHorizontalPodAutoscalers(c *ExtensionsClient, namespace string) *horizon } // List takes label and field selectors, and returns the list of horizontalPodAutoscalers that match those selectors. -func (c *horizontalPodAutoscalers) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (result *extensions.HorizontalPodAutoscalerList, err error) { +func (c *horizontalPodAutoscalers) List(opts unversioned.ListOptions) (result *extensions.HorizontalPodAutoscalerList, err error) { result = &extensions.HorizontalPodAutoscalerList{} - err = c.client.Get().Namespace(c.ns).Resource("horizontalPodAutoscalers").VersionedParams(&opts, api.Scheme).LabelsSelectorParam(label).FieldsSelectorParam(field).Do().Into(result) + err = c.client.Get().Namespace(c.ns).Resource("horizontalPodAutoscalers").VersionedParams(&opts, api.Scheme).Do().Into(result) return } diff --git a/pkg/client/unversioned/horizontalpodautoscaler_test.go b/pkg/client/unversioned/horizontalpodautoscaler_test.go index e34d6670d5e..87f59a18b16 100644 --- a/pkg/client/unversioned/horizontalpodautoscaler_test.go +++ b/pkg/client/unversioned/horizontalpodautoscaler_test.go @@ -24,8 +24,6 @@ import ( "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" ) func getHorizontalPodAutoscalersResoureName() string { @@ -100,7 +98,7 @@ func TestHorizontalPodAutoscalerList(t *testing.T) { }, Response: Response{StatusCode: 200, Body: horizontalPodAutoscalerList}, } - response, err := c.Setup(t).Extensions().HorizontalPodAutoscalers(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + response, err := c.Setup(t).Extensions().HorizontalPodAutoscalers(ns).List(unversioned.ListOptions{}) c.Validate(t, response, err) } diff --git a/pkg/client/unversioned/ingress.go b/pkg/client/unversioned/ingress.go index e874d044141..af83a037d7d 100644 --- a/pkg/client/unversioned/ingress.go +++ b/pkg/client/unversioned/ingress.go @@ -20,8 +20,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -32,7 +30,7 @@ type IngressNamespacer interface { // IngressInterface exposes methods to work on Ingress resources. type IngressInterface interface { - List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*extensions.IngressList, error) + List(opts unversioned.ListOptions) (*extensions.IngressList, error) Get(name string) (*extensions.Ingress, error) Create(ingress *extensions.Ingress) (*extensions.Ingress, error) Update(ingress *extensions.Ingress) (*extensions.Ingress, error) @@ -53,9 +51,9 @@ func newIngress(c *ExtensionsClient, namespace string) *ingress { } // List returns a list of ingress that match the label and field selectors. -func (c *ingress) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (result *extensions.IngressList, err error) { +func (c *ingress) List(opts unversioned.ListOptions) (result *extensions.IngressList, err error) { result = &extensions.IngressList{} - err = c.r.Get().Namespace(c.ns).Resource("ingresses").VersionedParams(&opts, api.Scheme).LabelsSelectorParam(label).FieldsSelectorParam(field).Do().Into(result) + err = c.r.Get().Namespace(c.ns).Resource("ingresses").VersionedParams(&opts, api.Scheme).Do().Into(result) return } diff --git a/pkg/client/unversioned/ingress_test.go b/pkg/client/unversioned/ingress_test.go index d67bee7ead8..ae681e0a9e4 100644 --- a/pkg/client/unversioned/ingress_test.go +++ b/pkg/client/unversioned/ingress_test.go @@ -23,8 +23,6 @@ import ( "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" ) func getIngressResourceName() string { @@ -57,7 +55,7 @@ func TestListIngress(t *testing.T) { }, }, } - receivedIngressList, err := c.Setup(t).Extensions().Ingress(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + receivedIngressList, err := c.Setup(t).Extensions().Ingress(ns).List(unversioned.ListOptions{}) c.Validate(t, receivedIngressList, err) } diff --git a/pkg/client/unversioned/jobs.go b/pkg/client/unversioned/jobs.go index 2181eee8cfa..4840c7766c7 100644 --- a/pkg/client/unversioned/jobs.go +++ b/pkg/client/unversioned/jobs.go @@ -21,8 +21,6 @@ import ( "k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -33,7 +31,7 @@ type JobsNamespacer interface { // JobInterface exposes methods to work on Job resources. type JobInterface interface { - List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*extensions.JobList, error) + List(opts unversioned.ListOptions) (*extensions.JobList, error) Get(name string) (*extensions.Job, error) Create(job *extensions.Job) (*extensions.Job, error) Update(job *extensions.Job) (*extensions.Job, error) @@ -57,9 +55,9 @@ func newJobs(c *ExtensionsClient, namespace string) *jobs { var _ JobInterface = &jobs{} // List returns a list of jobs that match the label and field selectors. -func (c *jobs) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (result *extensions.JobList, err error) { +func (c *jobs) List(opts unversioned.ListOptions) (result *extensions.JobList, err error) { result = &extensions.JobList{} - err = c.r.Get().Namespace(c.ns).Resource("jobs").VersionedParams(&opts, api.Scheme).LabelsSelectorParam(label).FieldsSelectorParam(field).Do().Into(result) + err = c.r.Get().Namespace(c.ns).Resource("jobs").VersionedParams(&opts, api.Scheme).Do().Into(result) return } diff --git a/pkg/client/unversioned/jobs_test.go b/pkg/client/unversioned/jobs_test.go index 30312fb6f91..10706237a60 100644 --- a/pkg/client/unversioned/jobs_test.go +++ b/pkg/client/unversioned/jobs_test.go @@ -23,8 +23,6 @@ import ( "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" ) func getJobResourceName() string { @@ -57,7 +55,7 @@ func TestListJobs(t *testing.T) { }, }, } - receivedJobList, err := c.Setup(t).Extensions().Jobs(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + receivedJobList, err := c.Setup(t).Extensions().Jobs(ns).List(unversioned.ListOptions{}) c.Validate(t, receivedJobList, err) } diff --git a/pkg/client/unversioned/limit_ranges.go b/pkg/client/unversioned/limit_ranges.go index 5ab4959baec..38b8b1db28b 100644 --- a/pkg/client/unversioned/limit_ranges.go +++ b/pkg/client/unversioned/limit_ranges.go @@ -21,8 +21,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -33,7 +31,7 @@ type LimitRangesNamespacer interface { // LimitRangeInterface has methods to work with LimitRange resources. type LimitRangeInterface interface { - List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.LimitRangeList, error) + List(opts unversioned.ListOptions) (*api.LimitRangeList, error) Get(name string) (*api.LimitRange, error) Delete(name string) error Create(limitRange *api.LimitRange) (*api.LimitRange, error) @@ -56,9 +54,9 @@ func newLimitRanges(c *Client, namespace string) *limitRanges { } // List takes a selector, and returns the list of limitRanges that match that selector. -func (c *limitRanges) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (result *api.LimitRangeList, err error) { +func (c *limitRanges) List(opts unversioned.ListOptions) (result *api.LimitRangeList, err error) { result = &api.LimitRangeList{} - err = c.r.Get().Namespace(c.ns).Resource("limitRanges").VersionedParams(&opts, api.Scheme).LabelsSelectorParam(label).FieldsSelectorParam(field).Do().Into(result) + err = c.r.Get().Namespace(c.ns).Resource("limitRanges").VersionedParams(&opts, api.Scheme).Do().Into(result) return } diff --git a/pkg/client/unversioned/limit_ranges_test.go b/pkg/client/unversioned/limit_ranges_test.go index d872101da4d..9440dd35c3a 100644 --- a/pkg/client/unversioned/limit_ranges_test.go +++ b/pkg/client/unversioned/limit_ranges_test.go @@ -24,8 +24,6 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" ) func getLimitRangesResourceName() string { @@ -123,7 +121,7 @@ func TestLimitRangeList(t *testing.T) { }, Response: Response{StatusCode: 200, Body: limitRangeList}, } - response, err := c.Setup(t).LimitRanges(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + response, err := c.Setup(t).LimitRanges(ns).List(unversioned.ListOptions{}) c.Validate(t, response, err) } diff --git a/pkg/client/unversioned/namespaces.go b/pkg/client/unversioned/namespaces.go index 2bedd5dc92c..fe9b3e5420e 100644 --- a/pkg/client/unversioned/namespaces.go +++ b/pkg/client/unversioned/namespaces.go @@ -21,8 +21,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -33,7 +31,7 @@ type NamespacesInterface interface { type NamespaceInterface interface { Create(item *api.Namespace) (*api.Namespace, error) Get(name string) (result *api.Namespace, err error) - List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.NamespaceList, error) + List(opts unversioned.ListOptions) (*api.NamespaceList, error) Delete(name string) error Update(item *api.Namespace) (*api.Namespace, error) Watch(opts unversioned.ListOptions) (watch.Interface, error) @@ -59,13 +57,11 @@ func (c *namespaces) Create(namespace *api.Namespace) (*api.Namespace, error) { } // List lists all the namespaces in the cluster. -func (c *namespaces) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.NamespaceList, error) { +func (c *namespaces) List(opts unversioned.ListOptions) (*api.NamespaceList, error) { result := &api.NamespaceList{} err := c.r.Get(). Resource("namespaces"). VersionedParams(&opts, api.Scheme). - LabelsSelectorParam(label). - FieldsSelectorParam(field). Do().Into(result) return result, err } diff --git a/pkg/client/unversioned/namespaces_test.go b/pkg/client/unversioned/namespaces_test.go index 3297e7190a2..52daff793d5 100644 --- a/pkg/client/unversioned/namespaces_test.go +++ b/pkg/client/unversioned/namespaces_test.go @@ -23,8 +23,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" ) func TestNamespaceCreate(t *testing.T) { @@ -93,7 +91,7 @@ func TestNamespaceList(t *testing.T) { }, Response: Response{StatusCode: 200, Body: namespaceList}, } - response, err := c.Setup(t).Namespaces().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + response, err := c.Setup(t).Namespaces().List(unversioned.ListOptions{}) if err != nil { t.Errorf("%#v should be nil.", err) diff --git a/pkg/client/unversioned/nodes.go b/pkg/client/unversioned/nodes.go index 57590f47eef..dde08078290 100644 --- a/pkg/client/unversioned/nodes.go +++ b/pkg/client/unversioned/nodes.go @@ -21,8 +21,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -33,7 +31,7 @@ type NodesInterface interface { type NodeInterface interface { Get(name string) (result *api.Node, err error) Create(node *api.Node) (*api.Node, error) - List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.NodeList, error) + List(opts unversioned.ListOptions) (*api.NodeList, error) Delete(name string) error Update(*api.Node) (*api.Node, error) UpdateStatus(*api.Node) (*api.Node, error) @@ -63,9 +61,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(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.NodeList, error) { +func (c *nodes) List(opts unversioned.ListOptions) (*api.NodeList, error) { result := &api.NodeList{} - err := c.r.Get().Resource(c.resourceName()).VersionedParams(&opts, api.Scheme).LabelsSelectorParam(label).FieldsSelectorParam(field).Do().Into(result) + err := c.r.Get().Resource(c.resourceName()).VersionedParams(&opts, api.Scheme).Do().Into(result) return result, err } diff --git a/pkg/client/unversioned/nodes_test.go b/pkg/client/unversioned/nodes_test.go index 72d480f3211..b9f2d211ad2 100644 --- a/pkg/client/unversioned/nodes_test.go +++ b/pkg/client/unversioned/nodes_test.go @@ -24,7 +24,6 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" ) @@ -40,7 +39,7 @@ func TestListNodes(t *testing.T) { }, Response: Response{StatusCode: 200, Body: &api.NodeList{ListMeta: unversioned.ListMeta{ResourceVersion: "1"}}}, } - response, err := c.Setup(t).Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + response, err := c.Setup(t).Nodes().List(unversioned.ListOptions{}) c.Validate(t, response, err) } @@ -70,7 +69,8 @@ func TestListNodesLabels(t *testing.T) { c.Setup(t) c.QueryValidator[labelSelectorQueryParamName] = validateLabels selector := labels.Set{"foo": "bar", "name": "baz"}.AsSelector() - receivedNodeList, err := c.Nodes().List(selector, fields.Everything(), unversioned.ListOptions{}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + receivedNodeList, err := c.Nodes().List(options) c.Validate(t, receivedNodeList, err) } diff --git a/pkg/client/unversioned/persistentvolume_test.go b/pkg/client/unversioned/persistentvolume_test.go index fb394ea7911..7614b184444 100644 --- a/pkg/client/unversioned/persistentvolume_test.go +++ b/pkg/client/unversioned/persistentvolume_test.go @@ -24,8 +24,6 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" ) func getPersistentVolumesResoureName() string { @@ -107,7 +105,7 @@ func TestPersistentVolumeList(t *testing.T) { }, Response: Response{StatusCode: 200, Body: persistentVolumeList}, } - response, err := c.Setup(t).PersistentVolumes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + response, err := c.Setup(t).PersistentVolumes().List(unversioned.ListOptions{}) c.Validate(t, response, err) } diff --git a/pkg/client/unversioned/persistentvolumeclaim.go b/pkg/client/unversioned/persistentvolumeclaim.go index 3b2061d34d1..38f9b38afb8 100644 --- a/pkg/client/unversioned/persistentvolumeclaim.go +++ b/pkg/client/unversioned/persistentvolumeclaim.go @@ -21,8 +21,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -33,7 +31,7 @@ type PersistentVolumeClaimsNamespacer interface { // PersistentVolumeClaimInterface has methods to work with PersistentVolumeClaim resources. type PersistentVolumeClaimInterface interface { - List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.PersistentVolumeClaimList, error) + List(opts unversioned.ListOptions) (*api.PersistentVolumeClaimList, error) Get(name string) (*api.PersistentVolumeClaim, error) Create(claim *api.PersistentVolumeClaim) (*api.PersistentVolumeClaim, error) Update(claim *api.PersistentVolumeClaim) (*api.PersistentVolumeClaim, error) @@ -53,15 +51,13 @@ func newPersistentVolumeClaims(c *Client, namespace string) *persistentVolumeCla return &persistentVolumeClaims{c, namespace} } -func (c *persistentVolumeClaims) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (result *api.PersistentVolumeClaimList, err error) { +func (c *persistentVolumeClaims) List(opts unversioned.ListOptions) (result *api.PersistentVolumeClaimList, err error) { result = &api.PersistentVolumeClaimList{} err = c.client.Get(). Namespace(c.namespace). Resource("persistentVolumeClaims"). VersionedParams(&opts, api.Scheme). - LabelsSelectorParam(label). - FieldsSelectorParam(field). Do(). Into(result) diff --git a/pkg/client/unversioned/persistentvolumeclaim_test.go b/pkg/client/unversioned/persistentvolumeclaim_test.go index 8afb843e367..1d17343275d 100644 --- a/pkg/client/unversioned/persistentvolumeclaim_test.go +++ b/pkg/client/unversioned/persistentvolumeclaim_test.go @@ -24,8 +24,6 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" ) func getPersistentVolumeClaimsResoureName() string { @@ -116,7 +114,7 @@ func TestPersistentVolumeClaimList(t *testing.T) { }, Response: Response{StatusCode: 200, Body: persistentVolumeList}, } - response, err := c.Setup(t).PersistentVolumeClaims(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + response, err := c.Setup(t).PersistentVolumeClaims(ns).List(unversioned.ListOptions{}) c.Validate(t, response, err) } diff --git a/pkg/client/unversioned/persistentvolumes.go b/pkg/client/unversioned/persistentvolumes.go index 5f6e578a478..71371c942fc 100644 --- a/pkg/client/unversioned/persistentvolumes.go +++ b/pkg/client/unversioned/persistentvolumes.go @@ -21,8 +21,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -32,7 +30,7 @@ type PersistentVolumesInterface interface { // PersistentVolumeInterface has methods to work with PersistentVolume resources. type PersistentVolumeInterface interface { - List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.PersistentVolumeList, error) + List(opts unversioned.ListOptions) (*api.PersistentVolumeList, error) Get(name string) (*api.PersistentVolume, error) Create(volume *api.PersistentVolume) (*api.PersistentVolume, error) Update(volume *api.PersistentVolume) (*api.PersistentVolume, error) @@ -50,13 +48,11 @@ func newPersistentVolumes(c *Client) *persistentVolumes { return &persistentVolumes{c} } -func (c *persistentVolumes) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (result *api.PersistentVolumeList, err error) { +func (c *persistentVolumes) List(opts unversioned.ListOptions) (result *api.PersistentVolumeList, err error) { result = &api.PersistentVolumeList{} err = c.client.Get(). Resource("persistentVolumes"). VersionedParams(&opts, api.Scheme). - LabelsSelectorParam(label). - FieldsSelectorParam(field). Do(). Into(result) diff --git a/pkg/client/unversioned/pod_templates.go b/pkg/client/unversioned/pod_templates.go index d90769baaca..3ce25e0c83c 100644 --- a/pkg/client/unversioned/pod_templates.go +++ b/pkg/client/unversioned/pod_templates.go @@ -19,8 +19,6 @@ package unversioned import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -31,7 +29,7 @@ type PodTemplatesNamespacer interface { // PodTemplateInterface has methods to work with PodTemplate resources. type PodTemplateInterface interface { - List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.PodTemplateList, error) + List(opts unversioned.ListOptions) (*api.PodTemplateList, error) Get(name string) (*api.PodTemplate, error) Delete(name string, options *api.DeleteOptions) error Create(podTemplate *api.PodTemplate) (*api.PodTemplate, error) @@ -54,9 +52,9 @@ func newPodTemplates(c *Client, namespace string) *podTemplates { } // List takes label and field selectors, and returns the list of podTemplates that match those selectors. -func (c *podTemplates) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (result *api.PodTemplateList, err error) { +func (c *podTemplates) List(opts unversioned.ListOptions) (result *api.PodTemplateList, err error) { result = &api.PodTemplateList{} - err = c.r.Get().Namespace(c.ns).Resource("podTemplates").VersionedParams(&opts, api.Scheme).LabelsSelectorParam(label).FieldsSelectorParam(field).Do().Into(result) + err = c.r.Get().Namespace(c.ns).Resource("podTemplates").VersionedParams(&opts, api.Scheme).Do().Into(result) return } diff --git a/pkg/client/unversioned/pod_templates_test.go b/pkg/client/unversioned/pod_templates_test.go index c6c143e5b62..4fb1356e0e1 100644 --- a/pkg/client/unversioned/pod_templates_test.go +++ b/pkg/client/unversioned/pod_templates_test.go @@ -23,8 +23,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" ) func getPodTemplatesResoureName() string { @@ -98,7 +96,7 @@ func TestPodTemplateList(t *testing.T) { }, Response: Response{StatusCode: 200, Body: podTemplateList}, } - response, err := c.Setup(t).PodTemplates(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + response, err := c.Setup(t).PodTemplates(ns).List(unversioned.ListOptions{}) c.Validate(t, response, err) } diff --git a/pkg/client/unversioned/pods.go b/pkg/client/unversioned/pods.go index d093b991b4c..49cb2221a8d 100644 --- a/pkg/client/unversioned/pods.go +++ b/pkg/client/unversioned/pods.go @@ -19,8 +19,6 @@ package unversioned import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -31,7 +29,7 @@ type PodsNamespacer interface { // PodInterface has methods to work with Pod resources. type PodInterface interface { - List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.PodList, error) + List(opts unversioned.ListOptions) (*api.PodList, error) Get(name string) (*api.Pod, error) Delete(name string, options *api.DeleteOptions) error Create(pod *api.Pod) (*api.Pod, error) @@ -57,9 +55,9 @@ func newPods(c *Client, namespace string) *pods { } // List takes label and field selectors, and returns the list of pods that match those selectors. -func (c *pods) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (result *api.PodList, err error) { +func (c *pods) List(opts unversioned.ListOptions) (result *api.PodList, err error) { result = &api.PodList{} - err = c.r.Get().Namespace(c.ns).Resource("pods").VersionedParams(&opts, api.Scheme).LabelsSelectorParam(label).FieldsSelectorParam(field).Do().Into(result) + err = c.r.Get().Namespace(c.ns).Resource("pods").VersionedParams(&opts, api.Scheme).Do().Into(result) return } diff --git a/pkg/client/unversioned/pods_test.go b/pkg/client/unversioned/pods_test.go index 419b94a5d50..31e36e911c3 100644 --- a/pkg/client/unversioned/pods_test.go +++ b/pkg/client/unversioned/pods_test.go @@ -24,7 +24,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" ) @@ -34,7 +33,7 @@ func TestListEmptyPods(t *testing.T) { Request: testRequest{Method: "GET", Path: testapi.Default.ResourcePath("pods", ns, ""), Query: buildQueryValues(nil)}, Response: Response{StatusCode: http.StatusOK, Body: &api.PodList{}}, } - podList, err := c.Setup(t).Pods(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + podList, err := c.Setup(t).Pods(ns).List(unversioned.ListOptions{}) c.Validate(t, podList, err) } @@ -60,7 +59,7 @@ func TestListPods(t *testing.T) { }, }, } - receivedPodList, err := c.Setup(t).Pods(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + receivedPodList, err := c.Setup(t).Pods(ns).List(unversioned.ListOptions{}) c.Validate(t, receivedPodList, err) } @@ -94,7 +93,8 @@ func TestListPodsLabels(t *testing.T) { c.Setup(t) c.QueryValidator[labelSelectorQueryParamName] = validateLabels selector := labels.Set{"foo": "bar", "name": "baz"}.AsSelector() - receivedPodList, err := c.Pods(ns).List(selector, fields.Everything(), unversioned.ListOptions{}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + receivedPodList, err := c.Pods(ns).List(options) c.Validate(t, receivedPodList, err) } diff --git a/pkg/client/unversioned/replication_controllers.go b/pkg/client/unversioned/replication_controllers.go index b283c8c47b6..b1f923e7ebc 100644 --- a/pkg/client/unversioned/replication_controllers.go +++ b/pkg/client/unversioned/replication_controllers.go @@ -19,8 +19,6 @@ package unversioned import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -31,7 +29,7 @@ type ReplicationControllersNamespacer interface { // ReplicationControllerInterface has methods to work with ReplicationController resources. type ReplicationControllerInterface interface { - List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.ReplicationControllerList, error) + List(opts unversioned.ListOptions) (*api.ReplicationControllerList, error) Get(name string) (*api.ReplicationController, error) Create(ctrl *api.ReplicationController) (*api.ReplicationController, error) Update(ctrl *api.ReplicationController) (*api.ReplicationController, error) @@ -52,9 +50,9 @@ func newReplicationControllers(c *Client, namespace string) *replicationControll } // List takes a selector, and returns the list of replication controllers that match that selector. -func (c *replicationControllers) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (result *api.ReplicationControllerList, err error) { +func (c *replicationControllers) List(opts unversioned.ListOptions) (result *api.ReplicationControllerList, err error) { result = &api.ReplicationControllerList{} - err = c.r.Get().Namespace(c.ns).Resource("replicationControllers").VersionedParams(&opts, api.Scheme).LabelsSelectorParam(label).FieldsSelectorParam(field).Do().Into(result) + err = c.r.Get().Namespace(c.ns).Resource("replicationControllers").VersionedParams(&opts, api.Scheme).Do().Into(result) return } diff --git a/pkg/client/unversioned/replication_controllers_test.go b/pkg/client/unversioned/replication_controllers_test.go index 1c3ca2fa7b8..5a7b7dcdbfd 100644 --- a/pkg/client/unversioned/replication_controllers_test.go +++ b/pkg/client/unversioned/replication_controllers_test.go @@ -22,8 +22,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" ) func getRCResourceName() string { @@ -57,7 +55,7 @@ func TestListControllers(t *testing.T) { }, }, } - receivedControllerList, err := c.Setup(t).ReplicationControllers(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + receivedControllerList, err := c.Setup(t).ReplicationControllers(ns).List(unversioned.ListOptions{}) c.Validate(t, receivedControllerList, err) } diff --git a/pkg/client/unversioned/resource_quotas.go b/pkg/client/unversioned/resource_quotas.go index 22f31d1f4a8..75729d9a03d 100644 --- a/pkg/client/unversioned/resource_quotas.go +++ b/pkg/client/unversioned/resource_quotas.go @@ -19,8 +19,6 @@ package unversioned import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -31,7 +29,7 @@ type ResourceQuotasNamespacer interface { // ResourceQuotaInterface has methods to work with ResourceQuota resources. type ResourceQuotaInterface interface { - List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.ResourceQuotaList, error) + List(opts unversioned.ListOptions) (*api.ResourceQuotaList, error) Get(name string) (*api.ResourceQuota, error) Delete(name string) error Create(resourceQuota *api.ResourceQuota) (*api.ResourceQuota, error) @@ -55,9 +53,9 @@ func newResourceQuotas(c *Client, namespace string) *resourceQuotas { } // List takes a selector, and returns the list of resourceQuotas that match that selector. -func (c *resourceQuotas) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (result *api.ResourceQuotaList, err error) { +func (c *resourceQuotas) List(opts unversioned.ListOptions) (result *api.ResourceQuotaList, err error) { result = &api.ResourceQuotaList{} - err = c.r.Get().Namespace(c.ns).Resource("resourceQuotas").VersionedParams(&opts, api.Scheme).LabelsSelectorParam(label).FieldsSelectorParam(field).Do().Into(result) + err = c.r.Get().Namespace(c.ns).Resource("resourceQuotas").VersionedParams(&opts, api.Scheme).Do().Into(result) return } diff --git a/pkg/client/unversioned/resource_quotas_test.go b/pkg/client/unversioned/resource_quotas_test.go index 8dfd5f6ef25..b2a477ae02a 100644 --- a/pkg/client/unversioned/resource_quotas_test.go +++ b/pkg/client/unversioned/resource_quotas_test.go @@ -24,8 +24,6 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" ) func getResourceQuotasResoureName() string { @@ -115,7 +113,7 @@ func TestResourceQuotaList(t *testing.T) { }, Response: Response{StatusCode: 200, Body: resourceQuotaList}, } - response, err := c.Setup(t).ResourceQuotas(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + response, err := c.Setup(t).ResourceQuotas(ns).List(unversioned.ListOptions{}) c.Validate(t, response, err) } diff --git a/pkg/client/unversioned/secrets.go b/pkg/client/unversioned/secrets.go index 362caf51971..a20b0fb3bc7 100644 --- a/pkg/client/unversioned/secrets.go +++ b/pkg/client/unversioned/secrets.go @@ -19,8 +19,6 @@ package unversioned import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -32,7 +30,7 @@ type SecretsInterface interface { Create(secret *api.Secret) (*api.Secret, error) Update(secret *api.Secret) (*api.Secret, error) Delete(name string) error - List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.SecretList, error) + List(opts unversioned.ListOptions) (*api.SecretList, error) Get(name string) (*api.Secret, error) Watch(opts unversioned.ListOptions) (watch.Interface, error) } @@ -64,15 +62,13 @@ func (s *secrets) Create(secret *api.Secret) (*api.Secret, error) { } // List returns a list of secrets matching the selectors. -func (s *secrets) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.SecretList, error) { +func (s *secrets) List(opts unversioned.ListOptions) (*api.SecretList, error) { result := &api.SecretList{} err := s.client.Get(). Namespace(s.namespace). Resource("secrets"). VersionedParams(&opts, api.Scheme). - LabelsSelectorParam(label). - FieldsSelectorParam(field). Do(). Into(result) diff --git a/pkg/client/unversioned/service_accounts.go b/pkg/client/unversioned/service_accounts.go index a17a0f3ef0e..6a2ccc60075 100644 --- a/pkg/client/unversioned/service_accounts.go +++ b/pkg/client/unversioned/service_accounts.go @@ -19,8 +19,6 @@ package unversioned import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -32,7 +30,7 @@ type ServiceAccountsInterface interface { Create(serviceAccount *api.ServiceAccount) (*api.ServiceAccount, error) Update(serviceAccount *api.ServiceAccount) (*api.ServiceAccount, error) Delete(name string) error - List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.ServiceAccountList, error) + List(opts unversioned.ListOptions) (*api.ServiceAccountList, error) Get(name string) (*api.ServiceAccount, error) Watch(opts unversioned.ListOptions) (watch.Interface, error) } @@ -64,15 +62,13 @@ func (s *serviceAccounts) Create(serviceAccount *api.ServiceAccount) (*api.Servi } // List returns a list of serviceAccounts matching the selectors. -func (s *serviceAccounts) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.ServiceAccountList, error) { +func (s *serviceAccounts) List(opts unversioned.ListOptions) (*api.ServiceAccountList, error) { result := &api.ServiceAccountList{} err := s.client.Get(). Namespace(s.namespace). Resource("serviceAccounts"). VersionedParams(&opts, api.Scheme). - LabelsSelectorParam(label). - FieldsSelectorParam(field). Do(). Into(result) diff --git a/pkg/client/unversioned/services.go b/pkg/client/unversioned/services.go index ab9ab501ced..eabe9cad188 100644 --- a/pkg/client/unversioned/services.go +++ b/pkg/client/unversioned/services.go @@ -19,8 +19,6 @@ package unversioned import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/watch" ) @@ -32,7 +30,7 @@ type ServicesNamespacer interface { // ServiceInterface has methods to work with Service resources. type ServiceInterface interface { - List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.ServiceList, error) + List(opts unversioned.ListOptions) (*api.ServiceList, error) Get(name string) (*api.Service, error) Create(srv *api.Service) (*api.Service, error) Update(srv *api.Service) (*api.Service, error) @@ -53,14 +51,12 @@ func newServices(c *Client, namespace string) *services { } // List takes a selector, and returns the list of services that match that selector -func (c *services) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (result *api.ServiceList, err error) { +func (c *services) List(opts unversioned.ListOptions) (result *api.ServiceList, err error) { result = &api.ServiceList{} err = c.r.Get(). Namespace(c.ns). Resource("services"). VersionedParams(&opts, api.Scheme). - LabelsSelectorParam(label). - FieldsSelectorParam(field). Do(). Into(result) return diff --git a/pkg/client/unversioned/services_test.go b/pkg/client/unversioned/services_test.go index 7a58d0fefaa..998dcb1e6f3 100644 --- a/pkg/client/unversioned/services_test.go +++ b/pkg/client/unversioned/services_test.go @@ -23,7 +23,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" ) @@ -55,7 +54,7 @@ func TestListServices(t *testing.T) { }, }, } - receivedServiceList, err := c.Setup(t).Services(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + receivedServiceList, err := c.Setup(t).Services(ns).List(unversioned.ListOptions{}) t.Logf("received services: %v %#v", err, receivedServiceList) c.Validate(t, receivedServiceList, err) } @@ -92,7 +91,8 @@ func TestListServicesLabels(t *testing.T) { c.Setup(t) c.QueryValidator[labelSelectorQueryParamName] = validateLabels selector := labels.Set{"foo": "bar", "name": "baz"}.AsSelector() - receivedServiceList, err := c.Services(ns).List(selector, fields.Everything(), unversioned.ListOptions{}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + receivedServiceList, err := c.Services(ns).List(options) c.Validate(t, receivedServiceList, err) } diff --git a/pkg/client/unversioned/testclient/actions.go b/pkg/client/unversioned/testclient/actions.go index 546780d724b..c5fb9f520e4 100644 --- a/pkg/client/unversioned/testclient/actions.go +++ b/pkg/client/unversioned/testclient/actions.go @@ -44,21 +44,37 @@ func NewGetAction(resource, namespace, name string) GetActionImpl { return action } -func NewRootListAction(resource string, label labels.Selector, field fields.Selector) ListActionImpl { +func NewRootListAction(resource string, opts unversioned.ListOptions) ListActionImpl { action := ListActionImpl{} action.Verb = "list" action.Resource = resource - action.ListRestrictions = ListRestrictions{label, field} + labelSelector := opts.LabelSelector.Selector + if labelSelector == nil { + labelSelector = labels.Everything() + } + fieldSelector := opts.FieldSelector.Selector + if fieldSelector == nil { + fieldSelector = fields.Everything() + } + action.ListRestrictions = ListRestrictions{labelSelector, fieldSelector} return action } -func NewListAction(resource, namespace string, label labels.Selector, field fields.Selector) ListActionImpl { +func NewListAction(resource, namespace string, opts unversioned.ListOptions) ListActionImpl { action := ListActionImpl{} action.Verb = "list" action.Resource = resource action.Namespace = namespace - action.ListRestrictions = ListRestrictions{label, field} + labelSelector := opts.LabelSelector.Selector + if labelSelector == nil { + labelSelector = labels.Everything() + } + fieldSelector := opts.FieldSelector.Selector + if fieldSelector == nil { + fieldSelector = fields.Everything() + } + action.ListRestrictions = ListRestrictions{labelSelector, fieldSelector} return action } diff --git a/pkg/client/unversioned/testclient/fake_componentstatuses.go b/pkg/client/unversioned/testclient/fake_componentstatuses.go index d259948ab8e..535f29d64f0 100644 --- a/pkg/client/unversioned/testclient/fake_componentstatuses.go +++ b/pkg/client/unversioned/testclient/fake_componentstatuses.go @@ -18,8 +18,7 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/api/unversioned" ) // Fake implements ComponentStatusInterface. @@ -36,8 +35,8 @@ func (c *FakeComponentStatuses) Get(name string) (*api.ComponentStatus, error) { return obj.(*api.ComponentStatus), err } -func (c *FakeComponentStatuses) List(label labels.Selector, field fields.Selector) (result *api.ComponentStatusList, err error) { - obj, err := c.Fake.Invokes(NewRootListAction("componentstatuses", label, field), &api.ComponentStatusList{}) +func (c *FakeComponentStatuses) List(opts unversioned.ListOptions) (result *api.ComponentStatusList, err error) { + obj, err := c.Fake.Invokes(NewRootListAction("componentstatuses", opts), &api.ComponentStatusList{}) if obj == nil { return nil, err } diff --git a/pkg/client/unversioned/testclient/fake_daemon_sets.go b/pkg/client/unversioned/testclient/fake_daemon_sets.go index 7c764e34d0f..27483827213 100644 --- a/pkg/client/unversioned/testclient/fake_daemon_sets.go +++ b/pkg/client/unversioned/testclient/fake_daemon_sets.go @@ -20,8 +20,6 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" kclientlib "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -43,8 +41,8 @@ func (c *FakeDaemonSets) Get(name string) (*extensions.DaemonSet, error) { return obj.(*extensions.DaemonSet), err } -func (c *FakeDaemonSets) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*extensions.DaemonSetList, error) { - obj, err := c.Fake.Invokes(NewListAction("daemonsets", c.Namespace, label, field), &extensions.DaemonSetList{}) +func (c *FakeDaemonSets) List(opts unversioned.ListOptions) (*extensions.DaemonSetList, error) { + obj, err := c.Fake.Invokes(NewListAction("daemonsets", c.Namespace, opts), &extensions.DaemonSetList{}) if obj == nil { return nil, err } diff --git a/pkg/client/unversioned/testclient/fake_deployments.go b/pkg/client/unversioned/testclient/fake_deployments.go index f666ac09b8d..3b4a2ecd5e3 100644 --- a/pkg/client/unversioned/testclient/fake_deployments.go +++ b/pkg/client/unversioned/testclient/fake_deployments.go @@ -20,7 +20,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -41,11 +40,15 @@ func (c *FakeDeployments) Get(name string) (*extensions.Deployment, error) { return obj.(*extensions.Deployment), err } -func (c *FakeDeployments) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*extensions.DeploymentList, error) { - obj, err := c.Fake.Invokes(NewListAction("deployments", c.Namespace, label, field), &extensions.DeploymentList{}) +func (c *FakeDeployments) List(opts unversioned.ListOptions) (*extensions.DeploymentList, error) { + obj, err := c.Fake.Invokes(NewListAction("deployments", c.Namespace, opts), &extensions.DeploymentList{}) if obj == nil { return nil, err } + label := opts.LabelSelector.Selector + if label == nil { + label = labels.Everything() + } list := &extensions.DeploymentList{} for _, deployment := range obj.(*extensions.DeploymentList).Items { if label.Matches(labels.Set(deployment.Labels)) { diff --git a/pkg/client/unversioned/testclient/fake_endpoints.go b/pkg/client/unversioned/testclient/fake_endpoints.go index 3617108cdc7..c88effc3a8e 100644 --- a/pkg/client/unversioned/testclient/fake_endpoints.go +++ b/pkg/client/unversioned/testclient/fake_endpoints.go @@ -19,8 +19,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -40,8 +38,8 @@ func (c *FakeEndpoints) Get(name string) (*api.Endpoints, error) { return obj.(*api.Endpoints), err } -func (c *FakeEndpoints) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.EndpointsList, error) { - obj, err := c.Fake.Invokes(NewListAction("endpoints", c.Namespace, label, field), &api.EndpointsList{}) +func (c *FakeEndpoints) List(opts unversioned.ListOptions) (*api.EndpointsList, error) { + obj, err := c.Fake.Invokes(NewListAction("endpoints", c.Namespace, opts), &api.EndpointsList{}) if obj == nil { return nil, err } diff --git a/pkg/client/unversioned/testclient/fake_events.go b/pkg/client/unversioned/testclient/fake_events.go index 7d32386360f..fe11d933b66 100644 --- a/pkg/client/unversioned/testclient/fake_events.go +++ b/pkg/client/unversioned/testclient/fake_events.go @@ -20,7 +20,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/watch" ) @@ -47,10 +46,10 @@ func (c *FakeEvents) Get(name string) (*api.Event, error) { } // List returns a list of events matching the selectors. -func (c *FakeEvents) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.EventList, error) { - action := NewRootListAction("events", label, field) +func (c *FakeEvents) List(opts unversioned.ListOptions) (*api.EventList, error) { + action := NewRootListAction("events", opts) if c.Namespace != "" { - action = NewListAction("events", c.Namespace, label, field) + action = NewListAction("events", c.Namespace, opts) } obj, err := c.Fake.Invokes(action, &api.EventList{}) if obj == nil { @@ -122,9 +121,9 @@ func (c *FakeEvents) Watch(opts unversioned.ListOptions) (watch.Interface, error // Search returns a list of events matching the specified object. func (c *FakeEvents) Search(objOrRef runtime.Object) (*api.EventList, error) { - action := NewRootListAction("events", nil, nil) + action := NewRootListAction("events", unversioned.ListOptions{}) if c.Namespace != "" { - action = NewListAction("events", c.Namespace, nil, nil) + action = NewListAction("events", c.Namespace, unversioned.ListOptions{}) } obj, err := c.Fake.Invokes(action, &api.EventList{}) if obj == nil { diff --git a/pkg/client/unversioned/testclient/fake_horizontal_pod_autoscalers.go b/pkg/client/unversioned/testclient/fake_horizontal_pod_autoscalers.go index 7c481f8fb36..28e1c3c3a18 100644 --- a/pkg/client/unversioned/testclient/fake_horizontal_pod_autoscalers.go +++ b/pkg/client/unversioned/testclient/fake_horizontal_pod_autoscalers.go @@ -20,7 +20,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -41,11 +40,15 @@ func (c *FakeHorizontalPodAutoscalers) Get(name string) (*extensions.HorizontalP return obj.(*extensions.HorizontalPodAutoscaler), err } -func (c *FakeHorizontalPodAutoscalers) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*extensions.HorizontalPodAutoscalerList, error) { - obj, err := c.Fake.Invokes(NewListAction("horizontalpodautoscalers", c.Namespace, label, field), &extensions.HorizontalPodAutoscalerList{}) +func (c *FakeHorizontalPodAutoscalers) List(opts unversioned.ListOptions) (*extensions.HorizontalPodAutoscalerList, error) { + obj, err := c.Fake.Invokes(NewListAction("horizontalpodautoscalers", c.Namespace, opts), &extensions.HorizontalPodAutoscalerList{}) if obj == nil { return nil, err } + label := opts.LabelSelector.Selector + if label == nil { + label = labels.Everything() + } list := &extensions.HorizontalPodAutoscalerList{} for _, a := range obj.(*extensions.HorizontalPodAutoscalerList).Items { if label.Matches(labels.Set(a.Labels)) { diff --git a/pkg/client/unversioned/testclient/fake_ingress.go b/pkg/client/unversioned/testclient/fake_ingress.go index fe7bade567d..f05584513de 100644 --- a/pkg/client/unversioned/testclient/fake_ingress.go +++ b/pkg/client/unversioned/testclient/fake_ingress.go @@ -20,8 +20,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -41,8 +39,8 @@ func (c *FakeIngress) Get(name string) (*extensions.Ingress, error) { return obj.(*extensions.Ingress), err } -func (c *FakeIngress) List(label labels.Selector, fields fields.Selector, opts unversioned.ListOptions) (*extensions.IngressList, error) { - obj, err := c.Fake.Invokes(NewListAction("ingresses", c.Namespace, label, nil), &extensions.IngressList{}) +func (c *FakeIngress) List(opts unversioned.ListOptions) (*extensions.IngressList, error) { + obj, err := c.Fake.Invokes(NewListAction("ingresses", c.Namespace, opts), &extensions.IngressList{}) if obj == nil { return nil, err } diff --git a/pkg/client/unversioned/testclient/fake_jobs.go b/pkg/client/unversioned/testclient/fake_jobs.go index 79b2e5f5ecd..dbacfd4fb8c 100644 --- a/pkg/client/unversioned/testclient/fake_jobs.go +++ b/pkg/client/unversioned/testclient/fake_jobs.go @@ -20,8 +20,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -41,8 +39,8 @@ func (c *FakeJobs) Get(name string) (*extensions.Job, error) { return obj.(*extensions.Job), err } -func (c *FakeJobs) List(label labels.Selector, fields fields.Selector, opts unversioned.ListOptions) (*extensions.JobList, error) { - obj, err := c.Fake.Invokes(NewListAction("jobs", c.Namespace, label, nil), &extensions.JobList{}) +func (c *FakeJobs) List(opts unversioned.ListOptions) (*extensions.JobList, error) { + obj, err := c.Fake.Invokes(NewListAction("jobs", c.Namespace, opts), &extensions.JobList{}) if obj == nil { return nil, err } diff --git a/pkg/client/unversioned/testclient/fake_limit_ranges.go b/pkg/client/unversioned/testclient/fake_limit_ranges.go index 8986d766171..32179700a84 100644 --- a/pkg/client/unversioned/testclient/fake_limit_ranges.go +++ b/pkg/client/unversioned/testclient/fake_limit_ranges.go @@ -19,8 +19,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -40,8 +38,8 @@ func (c *FakeLimitRanges) Get(name string) (*api.LimitRange, error) { return obj.(*api.LimitRange), err } -func (c *FakeLimitRanges) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.LimitRangeList, error) { - obj, err := c.Fake.Invokes(NewListAction("limitranges", c.Namespace, label, field), &api.LimitRangeList{}) +func (c *FakeLimitRanges) List(opts unversioned.ListOptions) (*api.LimitRangeList, error) { + obj, err := c.Fake.Invokes(NewListAction("limitranges", c.Namespace, opts), &api.LimitRangeList{}) if obj == nil { return nil, err } diff --git a/pkg/client/unversioned/testclient/fake_namespaces.go b/pkg/client/unversioned/testclient/fake_namespaces.go index 0a55f796c87..27edc4e3bba 100644 --- a/pkg/client/unversioned/testclient/fake_namespaces.go +++ b/pkg/client/unversioned/testclient/fake_namespaces.go @@ -19,8 +19,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -39,8 +37,8 @@ func (c *FakeNamespaces) Get(name string) (*api.Namespace, error) { return obj.(*api.Namespace), err } -func (c *FakeNamespaces) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.NamespaceList, error) { - obj, err := c.Fake.Invokes(NewRootListAction("namespaces", label, field), &api.NamespaceList{}) +func (c *FakeNamespaces) List(opts unversioned.ListOptions) (*api.NamespaceList, error) { + obj, err := c.Fake.Invokes(NewRootListAction("namespaces", opts), &api.NamespaceList{}) if obj == nil { return nil, err } diff --git a/pkg/client/unversioned/testclient/fake_nodes.go b/pkg/client/unversioned/testclient/fake_nodes.go index eccd5756084..7d59e7fa5b5 100644 --- a/pkg/client/unversioned/testclient/fake_nodes.go +++ b/pkg/client/unversioned/testclient/fake_nodes.go @@ -19,8 +19,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -39,8 +37,8 @@ func (c *FakeNodes) Get(name string) (*api.Node, error) { return obj.(*api.Node), err } -func (c *FakeNodes) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.NodeList, error) { - obj, err := c.Fake.Invokes(NewRootListAction("nodes", label, field), &api.NodeList{}) +func (c *FakeNodes) List(opts unversioned.ListOptions) (*api.NodeList, error) { + obj, err := c.Fake.Invokes(NewRootListAction("nodes", opts), &api.NodeList{}) if obj == nil { return nil, err } diff --git a/pkg/client/unversioned/testclient/fake_persistent_volume_claims.go b/pkg/client/unversioned/testclient/fake_persistent_volume_claims.go index 055a51538e1..d37af71932a 100644 --- a/pkg/client/unversioned/testclient/fake_persistent_volume_claims.go +++ b/pkg/client/unversioned/testclient/fake_persistent_volume_claims.go @@ -19,8 +19,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -38,8 +36,8 @@ func (c *FakePersistentVolumeClaims) Get(name string) (*api.PersistentVolumeClai return obj.(*api.PersistentVolumeClaim), err } -func (c *FakePersistentVolumeClaims) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.PersistentVolumeClaimList, error) { - obj, err := c.Fake.Invokes(NewListAction("persistentvolumeclaims", c.Namespace, label, field), &api.PersistentVolumeClaimList{}) +func (c *FakePersistentVolumeClaims) List(opts unversioned.ListOptions) (*api.PersistentVolumeClaimList, error) { + obj, err := c.Fake.Invokes(NewListAction("persistentvolumeclaims", c.Namespace, opts), &api.PersistentVolumeClaimList{}) if obj == nil { return nil, err } diff --git a/pkg/client/unversioned/testclient/fake_persistent_volumes.go b/pkg/client/unversioned/testclient/fake_persistent_volumes.go index 79f365902d9..65993f9109a 100644 --- a/pkg/client/unversioned/testclient/fake_persistent_volumes.go +++ b/pkg/client/unversioned/testclient/fake_persistent_volumes.go @@ -19,8 +19,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -37,8 +35,8 @@ func (c *FakePersistentVolumes) Get(name string) (*api.PersistentVolume, error) return obj.(*api.PersistentVolume), err } -func (c *FakePersistentVolumes) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.PersistentVolumeList, error) { - obj, err := c.Fake.Invokes(NewRootListAction("persistentvolumes", label, field), &api.PersistentVolumeList{}) +func (c *FakePersistentVolumes) List(opts unversioned.ListOptions) (*api.PersistentVolumeList, error) { + obj, err := c.Fake.Invokes(NewRootListAction("persistentvolumes", opts), &api.PersistentVolumeList{}) if obj == nil { return nil, err } diff --git a/pkg/client/unversioned/testclient/fake_pod_templates.go b/pkg/client/unversioned/testclient/fake_pod_templates.go index 3d6a42d28a7..ef13aa63ad0 100644 --- a/pkg/client/unversioned/testclient/fake_pod_templates.go +++ b/pkg/client/unversioned/testclient/fake_pod_templates.go @@ -19,8 +19,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -40,8 +38,8 @@ func (c *FakePodTemplates) Get(name string) (*api.PodTemplate, error) { return obj.(*api.PodTemplate), err } -func (c *FakePodTemplates) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.PodTemplateList, error) { - obj, err := c.Fake.Invokes(NewListAction("podtemplates", c.Namespace, label, field), &api.PodTemplateList{}) +func (c *FakePodTemplates) List(opts unversioned.ListOptions) (*api.PodTemplateList, error) { + obj, err := c.Fake.Invokes(NewListAction("podtemplates", c.Namespace, opts), &api.PodTemplateList{}) if obj == nil { return nil, err } diff --git a/pkg/client/unversioned/testclient/fake_pods.go b/pkg/client/unversioned/testclient/fake_pods.go index 996ddbe1ae0..2827458f267 100644 --- a/pkg/client/unversioned/testclient/fake_pods.go +++ b/pkg/client/unversioned/testclient/fake_pods.go @@ -20,7 +20,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -41,11 +40,15 @@ func (c *FakePods) Get(name string) (*api.Pod, error) { return obj.(*api.Pod), err } -func (c *FakePods) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.PodList, error) { - obj, err := c.Fake.Invokes(NewListAction("pods", c.Namespace, label, field), &api.PodList{}) +func (c *FakePods) List(opts unversioned.ListOptions) (*api.PodList, error) { + obj, err := c.Fake.Invokes(NewListAction("pods", c.Namespace, opts), &api.PodList{}) if obj == nil { return nil, err } + label := opts.LabelSelector.Selector + if label == nil { + label = labels.Everything() + } list := &api.PodList{} for _, pod := range obj.(*api.PodList).Items { if label.Matches(labels.Set(pod.Labels)) { diff --git a/pkg/client/unversioned/testclient/fake_replication_controllers.go b/pkg/client/unversioned/testclient/fake_replication_controllers.go index c9ceec1d3ff..c87a5f70cdc 100644 --- a/pkg/client/unversioned/testclient/fake_replication_controllers.go +++ b/pkg/client/unversioned/testclient/fake_replication_controllers.go @@ -19,8 +19,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -40,8 +38,8 @@ func (c *FakeReplicationControllers) Get(name string) (*api.ReplicationControlle return obj.(*api.ReplicationController), err } -func (c *FakeReplicationControllers) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.ReplicationControllerList, error) { - obj, err := c.Fake.Invokes(NewListAction("replicationcontrollers", c.Namespace, label, field), &api.ReplicationControllerList{}) +func (c *FakeReplicationControllers) List(opts unversioned.ListOptions) (*api.ReplicationControllerList, error) { + obj, err := c.Fake.Invokes(NewListAction("replicationcontrollers", c.Namespace, opts), &api.ReplicationControllerList{}) if obj == nil { return nil, err } diff --git a/pkg/client/unversioned/testclient/fake_resource_quotas.go b/pkg/client/unversioned/testclient/fake_resource_quotas.go index 405ecdad1fe..fcb75c5cf71 100644 --- a/pkg/client/unversioned/testclient/fake_resource_quotas.go +++ b/pkg/client/unversioned/testclient/fake_resource_quotas.go @@ -19,8 +19,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -40,8 +38,8 @@ func (c *FakeResourceQuotas) Get(name string) (*api.ResourceQuota, error) { return obj.(*api.ResourceQuota), err } -func (c *FakeResourceQuotas) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.ResourceQuotaList, error) { - obj, err := c.Fake.Invokes(NewListAction("resourcequotas", c.Namespace, label, field), &api.ResourceQuotaList{}) +func (c *FakeResourceQuotas) List(opts unversioned.ListOptions) (*api.ResourceQuotaList, error) { + obj, err := c.Fake.Invokes(NewListAction("resourcequotas", c.Namespace, opts), &api.ResourceQuotaList{}) if obj == nil { return nil, err } diff --git a/pkg/client/unversioned/testclient/fake_secrets.go b/pkg/client/unversioned/testclient/fake_secrets.go index afdfc91a9c6..b4349fd6c8e 100644 --- a/pkg/client/unversioned/testclient/fake_secrets.go +++ b/pkg/client/unversioned/testclient/fake_secrets.go @@ -19,8 +19,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -40,8 +38,8 @@ func (c *FakeSecrets) Get(name string) (*api.Secret, error) { return obj.(*api.Secret), err } -func (c *FakeSecrets) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.SecretList, error) { - obj, err := c.Fake.Invokes(NewListAction("secrets", c.Namespace, label, field), &api.SecretList{}) +func (c *FakeSecrets) List(opts unversioned.ListOptions) (*api.SecretList, error) { + obj, err := c.Fake.Invokes(NewListAction("secrets", c.Namespace, opts), &api.SecretList{}) if obj == nil { return nil, err } diff --git a/pkg/client/unversioned/testclient/fake_service_accounts.go b/pkg/client/unversioned/testclient/fake_service_accounts.go index e9e10abeb9d..7e1aa32851f 100644 --- a/pkg/client/unversioned/testclient/fake_service_accounts.go +++ b/pkg/client/unversioned/testclient/fake_service_accounts.go @@ -19,8 +19,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -40,8 +38,8 @@ func (c *FakeServiceAccounts) Get(name string) (*api.ServiceAccount, error) { return obj.(*api.ServiceAccount), err } -func (c *FakeServiceAccounts) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.ServiceAccountList, error) { - obj, err := c.Fake.Invokes(NewListAction("serviceaccounts", c.Namespace, label, field), &api.ServiceAccountList{}) +func (c *FakeServiceAccounts) List(opts unversioned.ListOptions) (*api.ServiceAccountList, error) { + obj, err := c.Fake.Invokes(NewListAction("serviceaccounts", c.Namespace, opts), &api.ServiceAccountList{}) if obj == nil { return nil, err } diff --git a/pkg/client/unversioned/testclient/fake_services.go b/pkg/client/unversioned/testclient/fake_services.go index 373a97baa28..5604f767756 100644 --- a/pkg/client/unversioned/testclient/fake_services.go +++ b/pkg/client/unversioned/testclient/fake_services.go @@ -20,8 +20,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" ) @@ -41,8 +39,8 @@ func (c *FakeServices) Get(name string) (*api.Service, error) { return obj.(*api.Service), err } -func (c *FakeServices) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.ServiceList, error) { - obj, err := c.Fake.Invokes(NewListAction("services", c.Namespace, label, field), &api.ServiceList{}) +func (c *FakeServices) List(opts unversioned.ListOptions) (*api.ServiceList, error) { + obj, err := c.Fake.Invokes(NewListAction("services", c.Namespace, opts), &api.ServiceList{}) if obj == nil { return nil, err } diff --git a/pkg/client/unversioned/testclient/testclient_test.go b/pkg/client/unversioned/testclient/testclient_test.go index 9876d466341..7aabc6cdfb7 100644 --- a/pkg/client/unversioned/testclient/testclient_test.go +++ b/pkg/client/unversioned/testclient/testclient_test.go @@ -23,8 +23,6 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" ) @@ -35,7 +33,7 @@ func TestNewClient(t *testing.T) { } client := &Fake{} client.AddReactor("*", "*", ObjectReaction(o, testapi.Default.RESTMapper())) - list, err := client.Services("test").List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + list, err := client.Services("test").List(unversioned.ListOptions{}) if err != nil { t.Fatal(err) } @@ -44,7 +42,7 @@ func TestNewClient(t *testing.T) { } // When list is invoked a second time, the same results are returned. - list, err = client.Services("test").List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + list, err = client.Services("test").List(unversioned.ListOptions{}) if err != nil { t.Fatal(err) } @@ -66,12 +64,12 @@ func TestErrors(t *testing.T) { }) client := &Fake{} client.AddReactor("*", "*", ObjectReaction(o, testapi.Default.RESTMapper())) - _, err := client.Services("test").List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + _, err := client.Services("test").List(unversioned.ListOptions{}) if !errors.IsNotFound(err) { t.Fatalf("unexpected error: %v", err) } t.Logf("error: %#v", err.(*errors.StatusError).Status()) - _, err = client.Services("test").List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + _, err = client.Services("test").List(unversioned.ListOptions{}) if !errors.IsForbidden(err) { t.Fatalf("unexpected error: %v", err) } diff --git a/pkg/controller/daemon/controller.go b/pkg/controller/daemon/controller.go index 03b64be5c76..6601655b943 100644 --- a/pkg/controller/daemon/controller.go +++ b/pkg/controller/daemon/controller.go @@ -30,7 +30,6 @@ import ( client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/framework" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" @@ -98,7 +97,7 @@ func NewDaemonSetsController(kubeClient client.Interface, resyncPeriod controlle dsc.dsStore.Store, dsc.dsController = framework.NewInformer( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return dsc.kubeClient.Extensions().DaemonSets(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + return dsc.kubeClient.Extensions().DaemonSets(api.NamespaceAll).List(unversioned.ListOptions{}) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { return dsc.kubeClient.Extensions().DaemonSets(api.NamespaceAll).Watch(options) @@ -130,7 +129,7 @@ func NewDaemonSetsController(kubeClient client.Interface, resyncPeriod controlle dsc.podStore.Store, dsc.podController = framework.NewInformer( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return dsc.kubeClient.Pods(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + return dsc.kubeClient.Pods(api.NamespaceAll).List(unversioned.ListOptions{}) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { return dsc.kubeClient.Pods(api.NamespaceAll).Watch(options) @@ -148,7 +147,7 @@ func NewDaemonSetsController(kubeClient client.Interface, resyncPeriod controlle dsc.nodeStore.Store, dsc.nodeController = framework.NewInformer( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return dsc.kubeClient.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + return dsc.kubeClient.Nodes().List(unversioned.ListOptions{}) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { return dsc.kubeClient.Nodes().Watch(options) diff --git a/pkg/controller/deployment/deployment_controller.go b/pkg/controller/deployment/deployment_controller.go index fcdf615c91e..ed0fc96225d 100644 --- a/pkg/controller/deployment/deployment_controller.go +++ b/pkg/controller/deployment/deployment_controller.go @@ -27,8 +27,6 @@ import ( "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/client/record" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" deploymentutil "k8s.io/kubernetes/pkg/util/deployment" ) @@ -61,7 +59,7 @@ func (d *DeploymentController) Run(syncPeriod time.Duration) { } func (d *DeploymentController) reconcileDeployments() []error { - list, err := d.expClient.Deployments(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + list, err := d.expClient.Deployments(api.NamespaceAll).List(unversioned.ListOptions{}) if err != nil { return []error{fmt.Errorf("error listing deployments: %v", err)} } diff --git a/pkg/controller/endpoint/endpoints_controller.go b/pkg/controller/endpoint/endpoints_controller.go index e1437043de7..577c0733c92 100644 --- a/pkg/controller/endpoint/endpoints_controller.go +++ b/pkg/controller/endpoint/endpoints_controller.go @@ -31,7 +31,6 @@ import ( client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/framework" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" @@ -64,7 +63,7 @@ func NewEndpointController(client *client.Client, resyncPeriod controller.Resync e.serviceStore.Store, e.serviceController = framework.NewInformer( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return e.client.Services(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + return e.client.Services(api.NamespaceAll).List(unversioned.ListOptions{}) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { return e.client.Services(api.NamespaceAll).Watch(options) @@ -85,7 +84,7 @@ func NewEndpointController(client *client.Client, resyncPeriod controller.Resync e.podStore.Store, e.podController = framework.NewInformer( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return e.client.Pods(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + return e.client.Pods(api.NamespaceAll).List(unversioned.ListOptions{}) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { return e.client.Pods(api.NamespaceAll).Watch(options) @@ -386,7 +385,7 @@ func (e *EndpointController) syncService(key string) { // some stragglers could have been left behind if the endpoint controller // reboots). func (e *EndpointController) checkLeftoverEndpoints() { - list, err := e.client.Endpoints(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + list, err := e.client.Endpoints(api.NamespaceAll).List(unversioned.ListOptions{}) if err != nil { glog.Errorf("Unable to list endpoints (%v); orphaned endpoints will not be cleaned up. (They're pretty harmless, but you can restart this component if you want another attempt made.)", err) return diff --git a/pkg/controller/gc/gc_controller.go b/pkg/controller/gc/gc_controller.go index 64e38cd6eaf..6409c86ac1d 100644 --- a/pkg/controller/gc/gc_controller.go +++ b/pkg/controller/gc/gc_controller.go @@ -67,7 +67,8 @@ func New(kubeClient client.Interface, resyncPeriod controller.ResyncPeriodFunc, gcc.podStore.Store, gcc.podStoreSyncer = framework.NewInformer( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return gcc.kubeClient.Pods(api.NamespaceAll).List(labels.Everything(), terminatedSelector, unversioned.ListOptions{}) + options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{terminatedSelector}} + return gcc.kubeClient.Pods(api.NamespaceAll).List(options) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { options.FieldSelector.Selector = terminatedSelector diff --git a/pkg/controller/job/controller.go b/pkg/controller/job/controller.go index 7e724d4554b..ba306f8a87e 100644 --- a/pkg/controller/job/controller.go +++ b/pkg/controller/job/controller.go @@ -32,8 +32,6 @@ import ( "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/framework" replicationcontroller "k8s.io/kubernetes/pkg/controller/replication" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/workqueue" @@ -86,7 +84,7 @@ func NewJobController(kubeClient client.Interface, resyncPeriod controller.Resyn jm.jobStore.Store, jm.jobController = framework.NewInformer( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return jm.kubeClient.Extensions().Jobs(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + return jm.kubeClient.Extensions().Jobs(api.NamespaceAll).List(unversioned.ListOptions{}) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { return jm.kubeClient.Extensions().Jobs(api.NamespaceAll).Watch(options) @@ -109,7 +107,7 @@ func NewJobController(kubeClient client.Interface, resyncPeriod controller.Resyn jm.podStore.Store, jm.podController = framework.NewInformer( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return jm.kubeClient.Pods(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + return jm.kubeClient.Pods(api.NamespaceAll).List(unversioned.ListOptions{}) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { return jm.kubeClient.Pods(api.NamespaceAll).Watch(options) diff --git a/pkg/controller/namespace/namespace_controller.go b/pkg/controller/namespace/namespace_controller.go index 8d9fc619baf..4b3856f3a6c 100644 --- a/pkg/controller/namespace/namespace_controller.go +++ b/pkg/controller/namespace/namespace_controller.go @@ -26,8 +26,6 @@ import ( "k8s.io/kubernetes/pkg/client/cache" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/controller/framework" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/sets" @@ -48,7 +46,7 @@ func NewNamespaceController(kubeClient client.Interface, versions *unversioned.A _, controller = framework.NewInformer( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return kubeClient.Namespaces().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + return kubeClient.Namespaces().List(unversioned.ListOptions{}) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { return kubeClient.Namespaces().Watch(options) @@ -339,7 +337,7 @@ func syncNamespace(kubeClient client.Interface, versions *unversioned.APIVersion } func deleteLimitRanges(kubeClient client.Interface, ns string) error { - items, err := kubeClient.LimitRanges(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + items, err := kubeClient.LimitRanges(ns).List(unversioned.ListOptions{}) if err != nil { return err } @@ -353,7 +351,7 @@ func deleteLimitRanges(kubeClient client.Interface, ns string) error { } func deleteResourceQuotas(kubeClient client.Interface, ns string) error { - resourceQuotas, err := kubeClient.ResourceQuotas(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + resourceQuotas, err := kubeClient.ResourceQuotas(ns).List(unversioned.ListOptions{}) if err != nil { return err } @@ -367,7 +365,7 @@ func deleteResourceQuotas(kubeClient client.Interface, ns string) error { } func deleteServiceAccounts(kubeClient client.Interface, ns string) error { - items, err := kubeClient.ServiceAccounts(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + items, err := kubeClient.ServiceAccounts(ns).List(unversioned.ListOptions{}) if err != nil { return err } @@ -381,7 +379,7 @@ func deleteServiceAccounts(kubeClient client.Interface, ns string) error { } func deleteServices(kubeClient client.Interface, ns string) error { - items, err := kubeClient.Services(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + items, err := kubeClient.Services(ns).List(unversioned.ListOptions{}) if err != nil { return err } @@ -395,7 +393,7 @@ func deleteServices(kubeClient client.Interface, ns string) error { } func deleteReplicationControllers(kubeClient client.Interface, ns string) error { - items, err := kubeClient.ReplicationControllers(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + items, err := kubeClient.ReplicationControllers(ns).List(unversioned.ListOptions{}) if err != nil { return err } @@ -409,7 +407,7 @@ func deleteReplicationControllers(kubeClient client.Interface, ns string) error } func deletePods(kubeClient client.Interface, ns string, before unversioned.Time) (int64, error) { - items, err := kubeClient.Pods(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + items, err := kubeClient.Pods(ns).List(unversioned.ListOptions{}) if err != nil { return 0, err } @@ -438,7 +436,7 @@ func deletePods(kubeClient client.Interface, ns string, before unversioned.Time) } func deleteEvents(kubeClient client.Interface, ns string) error { - items, err := kubeClient.Events(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + items, err := kubeClient.Events(ns).List(unversioned.ListOptions{}) if err != nil { return err } @@ -452,7 +450,7 @@ func deleteEvents(kubeClient client.Interface, ns string) error { } func deleteSecrets(kubeClient client.Interface, ns string) error { - items, err := kubeClient.Secrets(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + items, err := kubeClient.Secrets(ns).List(unversioned.ListOptions{}) if err != nil { return err } @@ -466,7 +464,7 @@ func deleteSecrets(kubeClient client.Interface, ns string) error { } func deletePersistentVolumeClaims(kubeClient client.Interface, ns string) error { - items, err := kubeClient.PersistentVolumeClaims(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + items, err := kubeClient.PersistentVolumeClaims(ns).List(unversioned.ListOptions{}) if err != nil { return err } @@ -480,7 +478,7 @@ func deletePersistentVolumeClaims(kubeClient client.Interface, ns string) error } func deleteHorizontalPodAutoscalers(expClient client.ExtensionsInterface, ns string) error { - items, err := expClient.HorizontalPodAutoscalers(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + items, err := expClient.HorizontalPodAutoscalers(ns).List(unversioned.ListOptions{}) if err != nil { return err } @@ -494,7 +492,7 @@ func deleteHorizontalPodAutoscalers(expClient client.ExtensionsInterface, ns str } func deleteDaemonSets(expClient client.ExtensionsInterface, ns string) error { - items, err := expClient.DaemonSets(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + items, err := expClient.DaemonSets(ns).List(unversioned.ListOptions{}) if err != nil { return err } @@ -508,7 +506,7 @@ func deleteDaemonSets(expClient client.ExtensionsInterface, ns string) error { } func deleteJobs(expClient client.ExtensionsInterface, ns string) error { - items, err := expClient.Jobs(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + items, err := expClient.Jobs(ns).List(unversioned.ListOptions{}) if err != nil { return err } @@ -522,7 +520,7 @@ func deleteJobs(expClient client.ExtensionsInterface, ns string) error { } func deleteDeployments(expClient client.ExtensionsInterface, ns string) error { - items, err := expClient.Deployments(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + items, err := expClient.Deployments(ns).List(unversioned.ListOptions{}) if err != nil { return err } @@ -536,7 +534,7 @@ func deleteDeployments(expClient client.ExtensionsInterface, ns string) error { } func deleteIngress(expClient client.ExtensionsInterface, ns string) error { - items, err := expClient.Ingress(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + items, err := expClient.Ingress(ns).List(unversioned.ListOptions{}) if err != nil { return err } diff --git a/pkg/controller/node/nodecontroller.go b/pkg/controller/node/nodecontroller.go index afd6d4b0694..6227f479c7f 100644 --- a/pkg/controller/node/nodecontroller.go +++ b/pkg/controller/node/nodecontroller.go @@ -34,7 +34,6 @@ import ( "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util" @@ -164,7 +163,7 @@ func NewNodeController( nc.podStore.Store, nc.podController = framework.NewInformer( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return nc.kubeClient.Pods(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + return nc.kubeClient.Pods(api.NamespaceAll).List(unversioned.ListOptions{}) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { return nc.kubeClient.Pods(api.NamespaceAll).Watch(options) @@ -180,7 +179,7 @@ func NewNodeController( nc.nodeStore.Store, nc.nodeController = framework.NewInformer( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return nc.kubeClient.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + return nc.kubeClient.Nodes().List(unversioned.ListOptions{}) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { return nc.kubeClient.Nodes().Watch(options) @@ -347,7 +346,7 @@ func forcefullyDeletePod(c client.Interface, pod *api.Pod) { // 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(), fields.Everything(), unversioned.ListOptions{}) + nodes, err := nc.kubeClient.Nodes().List(unversioned.ListOptions{}) if err != nil { return err } @@ -684,7 +683,9 @@ func (nc *NodeController) tryUpdateNodeStatus(node *api.Node) (time.Duration, ap // returns true if the provided node still has pods scheduled to it, or an error if // the server could not be contacted. func (nc *NodeController) hasPods(nodeName string) (bool, error) { - pods, err := nc.kubeClient.Pods(api.NamespaceAll).List(labels.Everything(), fields.OneTermEqualSelector(client.PodHost, nodeName), unversioned.ListOptions{}) + selector := fields.OneTermEqualSelector(client.PodHost, nodeName) + options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}} + pods, err := nc.kubeClient.Pods(api.NamespaceAll).List(options) if err != nil { return false, err } @@ -717,7 +718,9 @@ func (nc *NodeController) cancelPodEviction(nodeName string) bool { // if any pods were deleted. func (nc *NodeController) deletePods(nodeName string) (bool, error) { remaining := false - pods, err := nc.kubeClient.Pods(api.NamespaceAll).List(labels.Everything(), fields.OneTermEqualSelector(client.PodHost, nodeName), unversioned.ListOptions{}) + selector := fields.OneTermEqualSelector(client.PodHost, nodeName) + options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}} + pods, err := nc.kubeClient.Pods(api.NamespaceAll).List(options) if err != nil { return remaining, err } @@ -755,9 +758,9 @@ func (nc *NodeController) terminatePods(nodeName string, since time.Time) (bool, // have we deleted all pods complete := true - pods, err := nc.kubeClient.Pods(api.NamespaceAll).List(labels.Everything(), - fields.OneTermEqualSelector(client.PodHost, nodeName), - unversioned.ListOptions{}) + selector := fields.OneTermEqualSelector(client.PodHost, nodeName) + options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}} + pods, err := nc.kubeClient.Pods(api.NamespaceAll).List(options) if err != nil { return false, nextAttempt, err } diff --git a/pkg/controller/node/nodecontroller_test.go b/pkg/controller/node/nodecontroller_test.go index 0efd188d623..f9e44ca34fd 100644 --- a/pkg/controller/node/nodecontroller_test.go +++ b/pkg/controller/node/nodecontroller_test.go @@ -29,8 +29,6 @@ import ( "k8s.io/kubernetes/pkg/client/cache" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/client/unversioned/testclient" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/watch" ) @@ -91,7 +89,7 @@ func (m *FakeNodeHandler) Get(name string) (*api.Node, error) { return nil, nil } -func (m *FakeNodeHandler) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.NodeList, error) { +func (m *FakeNodeHandler) List(opts unversioned.ListOptions) (*api.NodeList, error) { defer func() { m.RequestCount++ }() var nodes []*api.Node for i := 0; i < len(m.UpdatedNodes); i++ { diff --git a/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller.go b/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller.go index 4bcf9a90a3c..491b0e05ae8 100644 --- a/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller.go +++ b/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller.go @@ -28,8 +28,6 @@ import ( client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/conversion" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/watch" @@ -58,7 +56,7 @@ func NewPersistentVolumeClaimBinder(kubeClient client.Interface, syncPeriod time _, volumeController := framework.NewInformer( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return kubeClient.PersistentVolumes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + return kubeClient.PersistentVolumes().List(unversioned.ListOptions{}) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { return kubeClient.PersistentVolumes().Watch(options) @@ -76,7 +74,7 @@ func NewPersistentVolumeClaimBinder(kubeClient client.Interface, syncPeriod time _, claimController := framework.NewInformer( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return kubeClient.PersistentVolumeClaims(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + return kubeClient.PersistentVolumeClaims(api.NamespaceAll).List(unversioned.ListOptions{}) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { return kubeClient.PersistentVolumeClaims(api.NamespaceAll).Watch(options) diff --git a/pkg/controller/persistentvolume/persistentvolume_recycler_controller.go b/pkg/controller/persistentvolume/persistentvolume_recycler_controller.go index 1e8a5435c8f..b20c5620ce6 100644 --- a/pkg/controller/persistentvolume/persistentvolume_recycler_controller.go +++ b/pkg/controller/persistentvolume/persistentvolume_recycler_controller.go @@ -27,8 +27,6 @@ import ( client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/controller/framework" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/types" ioutil "k8s.io/kubernetes/pkg/util/io" @@ -65,7 +63,7 @@ func NewPersistentVolumeRecycler(kubeClient client.Interface, syncPeriod time.Du _, volumeController := framework.NewInformer( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return kubeClient.PersistentVolumes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + return kubeClient.PersistentVolumes().List(unversioned.ListOptions{}) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { return kubeClient.PersistentVolumes().Watch(options) diff --git a/pkg/controller/podautoscaler/horizontal.go b/pkg/controller/podautoscaler/horizontal.go index 8bbd2c980a5..63219c1c325 100644 --- a/pkg/controller/podautoscaler/horizontal.go +++ b/pkg/controller/podautoscaler/horizontal.go @@ -28,8 +28,6 @@ import ( "k8s.io/kubernetes/pkg/client/record" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" ) @@ -175,7 +173,7 @@ func (a *HorizontalController) reconcileAutoscaler(hpa extensions.HorizontalPodA func (a *HorizontalController) reconcileAutoscalers() error { ns := api.NamespaceAll - list, err := a.client.Extensions().HorizontalPodAutoscalers(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + list, err := a.client.Extensions().HorizontalPodAutoscalers(ns).List(unversioned.ListOptions{}) if err != nil { return fmt.Errorf("error listing nodes: %v", err) } diff --git a/pkg/controller/podautoscaler/metrics/metrics_client.go b/pkg/controller/podautoscaler/metrics/metrics_client.go index ebb21cb4729..cb8ce9c24fe 100644 --- a/pkg/controller/podautoscaler/metrics/metrics_client.go +++ b/pkg/controller/podautoscaler/metrics/metrics_client.go @@ -27,7 +27,6 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" heapster "k8s.io/heapster/api/v1/types" @@ -119,8 +118,9 @@ func (h *HeapsterMetricsClient) GetCPUUtilization(namespace string, selector map } func (h *HeapsterMetricsClient) GetResourceConsumptionAndRequest(resourceName api.ResourceName, namespace string, selector map[string]string) (consumption *ResourceConsumption, request *resource.Quantity, timestamp time.Time, err error) { + labelSelector := labels.SelectorFromSet(labels.Set(selector)) podList, err := h.client.Pods(namespace). - List(labels.SelectorFromSet(labels.Set(selector)), fields.Everything(), unversioned.ListOptions{}) + List(unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{labelSelector}}) if err != nil { return nil, nil, time.Time{}, fmt.Errorf("failed to get pod list: %v", err) diff --git a/pkg/controller/replication/replication_controller.go b/pkg/controller/replication/replication_controller.go index 78374768f4c..3c78da2866d 100644 --- a/pkg/controller/replication/replication_controller.go +++ b/pkg/controller/replication/replication_controller.go @@ -30,7 +30,6 @@ import ( client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/framework" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" @@ -109,7 +108,7 @@ func NewReplicationManager(kubeClient client.Interface, resyncPeriod controller. rm.rcStore.Store, rm.rcController = framework.NewInformer( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return rm.kubeClient.ReplicationControllers(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + return rm.kubeClient.ReplicationControllers(api.NamespaceAll).List(unversioned.ListOptions{}) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { return rm.kubeClient.ReplicationControllers(api.NamespaceAll).Watch(options) @@ -150,7 +149,7 @@ func NewReplicationManager(kubeClient client.Interface, resyncPeriod controller. rm.podStore.Store, rm.podController = framework.NewInformer( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return rm.kubeClient.Pods(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + return rm.kubeClient.Pods(api.NamespaceAll).List(unversioned.ListOptions{}) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { return rm.kubeClient.Pods(api.NamespaceAll).Watch(options) diff --git a/pkg/controller/resourcequota/resource_quota_controller.go b/pkg/controller/resourcequota/resource_quota_controller.go index e375de179f4..c52221b5a4d 100644 --- a/pkg/controller/resourcequota/resource_quota_controller.go +++ b/pkg/controller/resourcequota/resource_quota_controller.go @@ -25,8 +25,6 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" ) @@ -59,7 +57,7 @@ func (rm *ResourceQuotaController) Run(period time.Duration) { func (rm *ResourceQuotaController) synchronize() { var resourceQuotas []api.ResourceQuota - list, err := rm.kubeClient.ResourceQuotas(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + list, err := rm.kubeClient.ResourceQuotas(api.NamespaceAll).List(unversioned.ListOptions{}) if err != nil { glog.Errorf("Synchronization error: %v (%#v)", err, err) } @@ -143,7 +141,7 @@ func (rm *ResourceQuotaController) syncResourceQuota(quota api.ResourceQuota) (e pods := &api.PodList{} if set[api.ResourcePods] || set[api.ResourceMemory] || set[api.ResourceCPU] { - pods, err = rm.kubeClient.Pods(usage.Namespace).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + pods, err = rm.kubeClient.Pods(usage.Namespace).List(unversioned.ListOptions{}) if err != nil { return err } @@ -166,31 +164,31 @@ func (rm *ResourceQuotaController) syncResourceQuota(quota api.ResourceQuota) (e case api.ResourcePods: value = resource.NewQuantity(int64(len(filteredPods)), resource.DecimalSI) case api.ResourceServices: - items, err := rm.kubeClient.Services(usage.Namespace).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + items, err := rm.kubeClient.Services(usage.Namespace).List(unversioned.ListOptions{}) if err != nil { return err } value = resource.NewQuantity(int64(len(items.Items)), resource.DecimalSI) case api.ResourceReplicationControllers: - items, err := rm.kubeClient.ReplicationControllers(usage.Namespace).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + items, err := rm.kubeClient.ReplicationControllers(usage.Namespace).List(unversioned.ListOptions{}) if err != nil { return err } value = resource.NewQuantity(int64(len(items.Items)), resource.DecimalSI) case api.ResourceQuotas: - items, err := rm.kubeClient.ResourceQuotas(usage.Namespace).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + items, err := rm.kubeClient.ResourceQuotas(usage.Namespace).List(unversioned.ListOptions{}) if err != nil { return err } value = resource.NewQuantity(int64(len(items.Items)), resource.DecimalSI) case api.ResourceSecrets: - items, err := rm.kubeClient.Secrets(usage.Namespace).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + items, err := rm.kubeClient.Secrets(usage.Namespace).List(unversioned.ListOptions{}) if err != nil { return err } value = resource.NewQuantity(int64(len(items.Items)), resource.DecimalSI) case api.ResourcePersistentVolumeClaims: - items, err := rm.kubeClient.PersistentVolumeClaims(usage.Namespace).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + items, err := rm.kubeClient.PersistentVolumeClaims(usage.Namespace).List(unversioned.ListOptions{}) if err != nil { return err } diff --git a/pkg/controller/route/routecontroller.go b/pkg/controller/route/routecontroller.go index 6c79300a95a..0d89fbc9de4 100644 --- a/pkg/controller/route/routecontroller.go +++ b/pkg/controller/route/routecontroller.go @@ -26,8 +26,6 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/cloudprovider" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" ) @@ -62,7 +60,7 @@ func (rc *RouteController) reconcileNodeRoutes() error { } // TODO (cjcullen): use pkg/controller/framework.NewInformer to watch this // and reduce the number of lists needed. - nodeList, err := rc.kubeClient.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodeList, err := rc.kubeClient.Nodes().List(unversioned.ListOptions{}) if err != nil { return fmt.Errorf("error listing nodes: %v", err) } diff --git a/pkg/controller/serviceaccount/serviceaccounts_controller.go b/pkg/controller/serviceaccount/serviceaccounts_controller.go index e0f507f6f0d..7ff7d17c8ff 100644 --- a/pkg/controller/serviceaccount/serviceaccounts_controller.go +++ b/pkg/controller/serviceaccount/serviceaccounts_controller.go @@ -29,7 +29,6 @@ import ( client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/watch" @@ -79,7 +78,8 @@ func NewServiceAccountsController(cl client.Interface, options ServiceAccountsCo e.serviceAccounts, e.serviceAccountController = framework.NewIndexerInformer( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return e.client.ServiceAccounts(api.NamespaceAll).List(labels.Everything(), accountSelector, unversioned.ListOptions{}) + options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{accountSelector}} + return e.client.ServiceAccounts(api.NamespaceAll).List(options) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { options.FieldSelector.Selector = accountSelector @@ -97,7 +97,7 @@ func NewServiceAccountsController(cl client.Interface, options ServiceAccountsCo e.namespaces, e.namespaceController = framework.NewIndexerInformer( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return e.client.Namespaces().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + return e.client.Namespaces().List(unversioned.ListOptions{}) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { return e.client.Namespaces().Watch(options) diff --git a/pkg/controller/serviceaccount/tokens_controller.go b/pkg/controller/serviceaccount/tokens_controller.go index a2605210c8a..c5658c54f34 100644 --- a/pkg/controller/serviceaccount/tokens_controller.go +++ b/pkg/controller/serviceaccount/tokens_controller.go @@ -29,7 +29,6 @@ import ( client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/secret" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/sets" @@ -64,7 +63,7 @@ func NewTokensController(cl client.Interface, options TokensControllerOptions) * e.serviceAccounts, e.serviceAccountController = framework.NewIndexerInformer( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return e.client.ServiceAccounts(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + return e.client.ServiceAccounts(api.NamespaceAll).List(unversioned.ListOptions{}) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { return e.client.ServiceAccounts(api.NamespaceAll).Watch(options) @@ -84,7 +83,8 @@ func NewTokensController(cl client.Interface, options TokensControllerOptions) * e.secrets, e.secretController = framework.NewIndexerInformer( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return e.client.Secrets(api.NamespaceAll).List(labels.Everything(), tokenSelector, unversioned.ListOptions{}) + options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{tokenSelector}} + return e.client.Secrets(api.NamespaceAll).List(options) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { options.FieldSelector.Selector = tokenSelector diff --git a/pkg/kubectl/cmd/util/factory.go b/pkg/kubectl/cmd/util/factory.go index 2f381fd9125..5b8376cd382 100644 --- a/pkg/kubectl/cmd/util/factory.go +++ b/pkg/kubectl/cmd/util/factory.go @@ -40,7 +40,6 @@ import ( "k8s.io/kubernetes/pkg/apis/extensions" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubectl/resource" "k8s.io/kubernetes/pkg/labels" @@ -342,7 +341,9 @@ func GetFirstPod(client *client.Client, namespace string, selector map[string]st var pods *api.PodList for pods == nil || len(pods.Items) == 0 { var err error - if pods, err = client.Pods(namespace).List(labels.SelectorFromSet(selector), fields.Everything(), unversioned.ListOptions{}); err != nil { + labelSelector := labels.SelectorFromSet(selector) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{labelSelector}} + if pods, err = client.Pods(namespace).List(options); err != nil { return nil, err } if len(pods.Items) == 0 { diff --git a/pkg/kubectl/describe.go b/pkg/kubectl/describe.go index c99a66f3690..fb675fce0e6 100644 --- a/pkg/kubectl/describe.go +++ b/pkg/kubectl/describe.go @@ -141,11 +141,11 @@ func (d *NamespaceDescriber) Describe(namespace, name string) (string, error) { if err != nil { return "", err } - resourceQuotaList, err := d.ResourceQuotas(name).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + resourceQuotaList, err := d.ResourceQuotas(name).List(unversioned.ListOptions{}) if err != nil { return "", err } - limitRangeList, err := d.LimitRanges(name).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + limitRangeList, err := d.LimitRanges(name).List(unversioned.ListOptions{}) if err != nil { return "", err } @@ -422,10 +422,9 @@ func (d *PodDescriber) Describe(namespace, name string) (string, error) { pod, err := pc.Get(name) if err != nil { eventsInterface := d.Events(namespace) - events, err2 := eventsInterface.List( - labels.Everything(), - eventsInterface.GetFieldSelector(&name, &namespace, nil, nil), - unversioned.ListOptions{}) + selector := eventsInterface.GetFieldSelector(&name, &namespace, nil, nil) + options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}} + events, err2 := eventsInterface.List(options) if err2 == nil && len(events.Items) > 0 { return tabbedString(func(out io.Writer) error { fmt.Fprintf(out, "Pod '%v': error '%v', but found events.\n", name, err) @@ -1191,7 +1190,8 @@ func (d *ServiceAccountDescriber) Describe(namespace, name string) (string, erro tokens := []api.Secret{} tokenSelector := fields.SelectorFromSet(map[string]string{client.SecretType: string(api.SecretTypeServiceAccountToken)}) - secrets, err := d.Secrets(namespace).List(labels.Everything(), tokenSelector, unversioned.ListOptions{}) + options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{tokenSelector}} + secrets, err := d.Secrets(namespace).List(options) if err == nil { for _, s := range secrets.Items { name, _ := s.Annotations[api.ServiceAccountNameKey] @@ -1268,7 +1268,7 @@ func (d *NodeDescriber) Describe(namespace, name string) (string, error) { } var pods []*api.Pod - allPods, err := d.Pods(namespace).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + allPods, err := d.Pods(namespace).List(unversioned.ListOptions{}) if err != nil { return "", err } @@ -1546,7 +1546,7 @@ func (dd *DeploymentDescriber) Describe(namespace, name string) (string, error) func getDaemonSetsForLabels(c client.DaemonSetInterface, labelsToMatch labels.Labels) ([]extensions.DaemonSet, error) { // Get all daemon sets // TODO: this needs a namespace scope as argument - dss, err := c.List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + dss, err := c.List(unversioned.ListOptions{}) if err != nil { return nil, fmt.Errorf("error getting daemon set: %v", err) } @@ -1573,7 +1573,7 @@ func getDaemonSetsForLabels(c client.DaemonSetInterface, labelsToMatch labels.La func getReplicationControllersForLabels(c client.ReplicationControllerInterface, labelsToMatch labels.Labels) ([]api.ReplicationController, error) { // Get all replication controllers. // TODO this needs a namespace scope as argument - rcs, err := c.List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + rcs, err := c.List(unversioned.ListOptions{}) if err != nil { return nil, fmt.Errorf("error getting replication controllers: %v", err) } @@ -1604,7 +1604,8 @@ func printReplicationControllersByLabels(matchingRCs []*api.ReplicationControlle } func getPodStatusForController(c client.PodInterface, selector labels.Selector) (running, waiting, succeeded, failed int, err error) { - rcPods, err := c.List(selector, fields.Everything(), unversioned.ListOptions{}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + rcPods, err := c.List(options) if err != nil { return } diff --git a/pkg/kubectl/rolling_updater.go b/pkg/kubectl/rolling_updater.go index 75093701994..dbc097218ad 100644 --- a/pkg/kubectl/rolling_updater.go +++ b/pkg/kubectl/rolling_updater.go @@ -29,7 +29,6 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/pkg/util/wait" @@ -364,7 +363,8 @@ func (r *RollingUpdater) pollForReadyPods(interval, timeout time.Duration, oldRc anyReady := false for _, controller := range controllers { selector := labels.Set(controller.Spec.Selector).AsSelector() - pods, err := r.c.Pods(controller.Namespace).List(selector, fields.Everything(), unversioned.ListOptions{}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + pods, err := r.c.Pods(controller.Namespace).List(options) if err != nil { return false, err } @@ -628,7 +628,9 @@ func AddDeploymentKeyToReplicationController(oldRc *api.ReplicationController, c // Update all pods managed by the rc to have the new hash label, so they are correctly adopted // TODO: extract the code from the label command and re-use it here. - podList, err := client.Pods(namespace).List(labels.SelectorFromSet(oldRc.Spec.Selector), fields.Everything(), unversioned.ListOptions{}) + selector := labels.SelectorFromSet(oldRc.Spec.Selector) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + podList, err := client.Pods(namespace).List(options) if err != nil { return nil, err } @@ -678,7 +680,9 @@ func AddDeploymentKeyToReplicationController(oldRc *api.ReplicationController, c // Clean up any orphaned pods that don't have the new label, this can happen if the rc manager // doesn't see the update to its pod template and creates a new pod with the old labels after // we've finished re-adopting existing pods to the rc. - podList, err = client.Pods(namespace).List(labels.SelectorFromSet(selectorCopy), fields.Everything(), unversioned.ListOptions{}) + selector = labels.SelectorFromSet(selectorCopy) + options = unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + podList, err = client.Pods(namespace).List(options) for ix := range podList.Items { pod := &podList.Items[ix] if value, found := pod.Labels[deploymentKey]; !found || value != deploymentValue { @@ -719,7 +723,7 @@ func updateWithRetries(rcClient client.ReplicationControllerInterface, rc *api.R } func FindSourceController(r client.ReplicationControllersNamespacer, namespace, name string) (*api.ReplicationController, error) { - list, err := r.ReplicationControllers(namespace).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + list, err := r.ReplicationControllers(namespace).List(unversioned.ListOptions{}) if err != nil { return nil, err } diff --git a/pkg/kubectl/stop.go b/pkg/kubectl/stop.go index f52388bd249..66c0938d303 100644 --- a/pkg/kubectl/stop.go +++ b/pkg/kubectl/stop.go @@ -26,7 +26,6 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" utilerrors "k8s.io/kubernetes/pkg/util/errors" @@ -109,7 +108,7 @@ type objInterface interface { // getOverlappingControllers finds rcs that this controller overlaps, as well as rcs overlapping this controller. func getOverlappingControllers(c client.ReplicationControllerInterface, rc *api.ReplicationController) ([]api.ReplicationController, error) { - rcs, err := c.List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + rcs, err := c.List(unversioned.ListOptions{}) if err != nil { return nil, fmt.Errorf("error getting replication controllers: %v", err) } @@ -252,7 +251,8 @@ func (reaper *JobReaper) Stop(namespace, name string, timeout time.Duration, gra } // at this point only dead pods are left, that should be removed selector, _ := extensions.PodSelectorAsSelector(job.Spec.Selector) - podList, err := pods.List(selector, fields.Everything(), unversioned.ListOptions{}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + podList, err := pods.List(options) if err != nil { return err } diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 4f9a11ca698..fc17d8288eb 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -65,7 +65,6 @@ import ( kubetypes "k8s.io/kubernetes/pkg/kubelet/types" kubeletutil "k8s.io/kubernetes/pkg/kubelet/util" "k8s.io/kubernetes/pkg/kubelet/util/queue" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/securitycontext" "k8s.io/kubernetes/pkg/types" @@ -237,7 +236,7 @@ func NewMainKubelet( // than an interface. There is no way to construct a list+watcher using resource name. listWatch := &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return kubeClient.Services(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + return kubeClient.Services(api.NamespaceAll).List(unversioned.ListOptions{}) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { return kubeClient.Services(api.NamespaceAll).Watch(options) @@ -254,7 +253,8 @@ func NewMainKubelet( fieldSelector := fields.Set{client.ObjectNameField: nodeName}.AsSelector() listWatch := &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return kubeClient.Nodes().List(labels.Everything(), fieldSelector, unversioned.ListOptions{}) + options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{fieldSelector}} + return kubeClient.Nodes().List(options) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { options.FieldSelector.Selector = fieldSelector diff --git a/pkg/util/deployment/deployment.go b/pkg/util/deployment/deployment.go index e87382f90d7..bcc0057f44b 100644 --- a/pkg/util/deployment/deployment.go +++ b/pkg/util/deployment/deployment.go @@ -24,7 +24,6 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" ) @@ -33,14 +32,16 @@ import ( func GetOldRCs(deployment extensions.Deployment, c client.Interface) ([]*api.ReplicationController, error) { namespace := deployment.ObjectMeta.Namespace // 1. Find all pods whose labels match deployment.Spec.Selector - podList, err := c.Pods(namespace).List(labels.SelectorFromSet(deployment.Spec.Selector), fields.Everything(), unversioned.ListOptions{}) + selector := labels.SelectorFromSet(deployment.Spec.Selector) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + podList, err := c.Pods(namespace).List(options) if err != nil { return nil, fmt.Errorf("error listing pods: %v", err) } // 2. Find the corresponding RCs for pods in podList. // TODO: Right now we list all RCs and then filter. We should add an API for this. oldRCs := map[string]api.ReplicationController{} - rcList, err := c.ReplicationControllers(namespace).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + rcList, err := c.ReplicationControllers(namespace).List(unversioned.ListOptions{}) if err != nil { return nil, fmt.Errorf("error listing replication controllers: %v", err) } @@ -69,7 +70,7 @@ func GetOldRCs(deployment extensions.Deployment, c client.Interface) ([]*api.Rep // Returns nil if the new RC doesnt exist yet. func GetNewRC(deployment extensions.Deployment, c client.Interface) (*api.ReplicationController, error) { namespace := deployment.ObjectMeta.Namespace - rcList, err := c.ReplicationControllers(namespace).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + rcList, err := c.ReplicationControllers(namespace).List(unversioned.ListOptions{}) if err != nil { return nil, fmt.Errorf("error listing replication controllers: %v", err) } @@ -149,7 +150,9 @@ func GetAvailablePodsForRCs(c client.Interface, rcs []*api.ReplicationController func getPodsForRCs(c client.Interface, replicationControllers []*api.ReplicationController) ([]api.Pod, error) { allPods := []api.Pod{} for _, rc := range replicationControllers { - podList, err := c.Pods(rc.ObjectMeta.Namespace).List(labels.SelectorFromSet(rc.Spec.Selector), fields.Everything(), unversioned.ListOptions{}) + selector := labels.SelectorFromSet(rc.Spec.Selector) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + podList, err := c.Pods(rc.ObjectMeta.Namespace).List(options) if err != nil { return allPods, fmt.Errorf("error listing pods: %v", err) } diff --git a/pkg/volume/util.go b/pkg/volume/util.go index 4d04a6d702a..63e9c0c7de9 100644 --- a/pkg/volume/util.go +++ b/pkg/volume/util.go @@ -25,7 +25,6 @@ import ( "k8s.io/kubernetes/pkg/client/cache" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/watch" @@ -110,7 +109,8 @@ func (c *realRecyclerClient) WatchPod(name, namespace, resourceVersion string, s podLW := &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return c.client.Pods(namespace).List(labels.Everything(), fieldSelector, unversioned.ListOptions{}) + options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{fieldSelector}} + return c.client.Pods(namespace).List(options) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { options.FieldSelector.Selector = fieldSelector diff --git a/plugin/pkg/admission/limitranger/admission.go b/plugin/pkg/admission/limitranger/admission.go index c9df30fef39..baa8e3b9e20 100644 --- a/plugin/pkg/admission/limitranger/admission.go +++ b/plugin/pkg/admission/limitranger/admission.go @@ -29,8 +29,6 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" utilerrors "k8s.io/kubernetes/pkg/util/errors" "k8s.io/kubernetes/pkg/watch" @@ -101,7 +99,7 @@ func (l *limitRanger) Admit(a admission.Attributes) (err error) { func NewLimitRanger(client client.Interface, limitFunc LimitFunc) admission.Interface { lw := &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return client.LimitRanges(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + return client.LimitRanges(api.NamespaceAll).List(unversioned.ListOptions{}) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { return client.LimitRanges(api.NamespaceAll).Watch(options) diff --git a/plugin/pkg/admission/namespace/autoprovision/admission.go b/plugin/pkg/admission/namespace/autoprovision/admission.go index c99fc931784..820ac0fdc7f 100644 --- a/plugin/pkg/admission/namespace/autoprovision/admission.go +++ b/plugin/pkg/admission/namespace/autoprovision/admission.go @@ -26,8 +26,6 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/watch" ) @@ -86,7 +84,7 @@ func NewProvision(c client.Interface) admission.Interface { reflector := cache.NewReflector( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return c.Namespaces().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + return c.Namespaces().List(unversioned.ListOptions{}) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { return c.Namespaces().Watch(options) diff --git a/plugin/pkg/admission/namespace/exists/admission.go b/plugin/pkg/admission/namespace/exists/admission.go index 7098d0b3d95..83310d88fc0 100644 --- a/plugin/pkg/admission/namespace/exists/admission.go +++ b/plugin/pkg/admission/namespace/exists/admission.go @@ -27,8 +27,6 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/watch" ) @@ -93,7 +91,7 @@ func NewExists(c client.Interface) admission.Interface { reflector := cache.NewReflector( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return c.Namespaces().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + return c.Namespaces().List(unversioned.ListOptions{}) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { return c.Namespaces().Watch(options) diff --git a/plugin/pkg/admission/namespace/lifecycle/admission.go b/plugin/pkg/admission/namespace/lifecycle/admission.go index be20ce96436..6f0a6aced7c 100644 --- a/plugin/pkg/admission/namespace/lifecycle/admission.go +++ b/plugin/pkg/admission/namespace/lifecycle/admission.go @@ -28,8 +28,6 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/watch" @@ -110,7 +108,7 @@ func NewLifecycle(c client.Interface) admission.Interface { reflector := cache.NewReflector( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return c.Namespaces().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + return c.Namespaces().List(unversioned.ListOptions{}) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { return c.Namespaces().Watch(options) diff --git a/plugin/pkg/admission/resourcequota/admission.go b/plugin/pkg/admission/resourcequota/admission.go index cf1e53a51f1..c665ff713f4 100644 --- a/plugin/pkg/admission/resourcequota/admission.go +++ b/plugin/pkg/admission/resourcequota/admission.go @@ -29,8 +29,6 @@ import ( "k8s.io/kubernetes/pkg/client/cache" client "k8s.io/kubernetes/pkg/client/unversioned" resourcequotacontroller "k8s.io/kubernetes/pkg/controller/resourcequota" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" utilerrors "k8s.io/kubernetes/pkg/util/errors" "k8s.io/kubernetes/pkg/watch" @@ -52,7 +50,7 @@ type quota struct { func NewResourceQuota(client client.Interface) admission.Interface { lw := &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return client.ResourceQuotas(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + return client.ResourceQuotas(api.NamespaceAll).List(unversioned.ListOptions{}) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { return client.ResourceQuotas(api.NamespaceAll).Watch(options) diff --git a/plugin/pkg/admission/serviceaccount/admission.go b/plugin/pkg/admission/serviceaccount/admission.go index 459cc8e67f1..3998a01c42a 100644 --- a/plugin/pkg/admission/serviceaccount/admission.go +++ b/plugin/pkg/admission/serviceaccount/admission.go @@ -31,7 +31,6 @@ import ( "k8s.io/kubernetes/pkg/controller/serviceaccount" "k8s.io/kubernetes/pkg/fields" kubelet "k8s.io/kubernetes/pkg/kubelet/types" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/watch" @@ -84,7 +83,7 @@ func NewServiceAccount(cl client.Interface) *serviceAccount { serviceAccountsIndexer, serviceAccountsReflector := cache.NewNamespaceKeyedIndexerAndReflector( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return cl.ServiceAccounts(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + return cl.ServiceAccounts(api.NamespaceAll).List(unversioned.ListOptions{}) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { return cl.ServiceAccounts(api.NamespaceAll).Watch(options) @@ -98,7 +97,8 @@ func NewServiceAccount(cl client.Interface) *serviceAccount { secretsIndexer, secretsReflector := cache.NewNamespaceKeyedIndexerAndReflector( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return cl.Secrets(api.NamespaceAll).List(labels.Everything(), tokenSelector, unversioned.ListOptions{}) + options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{tokenSelector}} + return cl.Secrets(api.NamespaceAll).List(options) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { options.FieldSelector.Selector = tokenSelector diff --git a/test/e2e/cadvisor.go b/test/e2e/cadvisor.go index 8f9dd08d718..14a11cbacef 100644 --- a/test/e2e/cadvisor.go +++ b/test/e2e/cadvisor.go @@ -22,8 +22,6 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" . "github.com/onsi/ginkgo" ) @@ -50,7 +48,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(), fields.Everything(), unversioned.ListOptions{}) + nodeList, err := c.Nodes().List(unversioned.ListOptions{}) expectNoError(err) var errors []error retries := maxRetries diff --git a/test/e2e/cluster_size_autoscaling.go b/test/e2e/cluster_size_autoscaling.go index 32d9fdd8411..fa1f11803f1 100644 --- a/test/e2e/cluster_size_autoscaling.go +++ b/test/e2e/cluster_size_autoscaling.go @@ -23,8 +23,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -44,7 +42,7 @@ var _ = Describe("[Autoscaling] [Skipped]", func() { BeforeEach(func() { SkipUnlessProviderIs("gce") - nodes, err := f.Client.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodes, err := f.Client.Nodes().List(unversioned.ListOptions{}) expectNoError(err) nodeCount = len(nodes.Items) Expect(nodeCount).NotTo(BeZero()) diff --git a/test/e2e/cluster_upgrade.go b/test/e2e/cluster_upgrade.go index ac9b60e4854..2d856f1569b 100644 --- a/test/e2e/cluster_upgrade.go +++ b/test/e2e/cluster_upgrade.go @@ -413,7 +413,7 @@ func runCmd(command string, args ...string) (string, string, error) { func validate(f *Framework, svcNameWant, rcNameWant string, ingress api.LoadBalancerIngress, podsWant int) error { Logf("Beginning cluster validation") // Verify RC. - rcs, err := f.Client.ReplicationControllers(f.Namespace.Name).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + rcs, err := f.Client.ReplicationControllers(f.Namespace.Name).List(unversioned.ListOptions{}) if err != nil { return fmt.Errorf("error listing RCs: %v", err) } diff --git a/test/e2e/daemon_restart.go b/test/e2e/daemon_restart.go index 4e99936d328..721be0cc6e7 100644 --- a/test/e2e/daemon_restart.go +++ b/test/e2e/daemon_restart.go @@ -26,7 +26,6 @@ import ( "k8s.io/kubernetes/pkg/client/cache" client "k8s.io/kubernetes/pkg/client/unversioned" controllerframework "k8s.io/kubernetes/pkg/controller/framework" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/master/ports" "k8s.io/kubernetes/pkg/runtime" @@ -171,7 +170,8 @@ func replacePods(pods []*api.Pod, store cache.Store) { // getContainerRestarts returns the count of container restarts across all pods matching the given labelSelector, // and a list of nodenames across which these containers restarted. func getContainerRestarts(c *client.Client, ns string, labelSelector labels.Selector) (int, []string) { - pods, err := c.Pods(ns).List(labelSelector, fields.Everything(), unversioned.ListOptions{}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{labelSelector}} + pods, err := c.Pods(ns).List(options) expectNoError(err) failedContainers := 0 containerRestartNodes := sets.NewString() @@ -221,7 +221,8 @@ var _ = Describe("DaemonRestart", func() { newPods, controller = controllerframework.NewInformer( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return framework.Client.Pods(ns).List(labelSelector, fields.Everything(), unversioned.ListOptions{}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{labelSelector}} + return framework.Client.Pods(ns).List(options) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { options.LabelSelector.Selector = labelSelector diff --git a/test/e2e/daemon_set.go b/test/e2e/daemon_set.go index 07c8845f624..f010698dcdb 100644 --- a/test/e2e/daemon_set.go +++ b/test/e2e/daemon_set.go @@ -27,7 +27,6 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/wait" @@ -114,7 +113,9 @@ var _ = Describe("Daemon set", func() { By("Stop a daemon pod, check that the daemon pod is revived.") podClient := c.Pods(ns) - podList, err := podClient.List(labels.Set(label).AsSelector(), fields.Everything(), unversioned.ListOptions{}) + selector := labels.Set(label).AsSelector() + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + podList, err := podClient.List(options) Expect(err).NotTo(HaveOccurred()) Expect(len(podList.Items)).To(BeNumerically(">", 0)) pod := podList.Items[0] @@ -160,7 +161,7 @@ var _ = Describe("Daemon set", func() { By("Change label of node, check that daemon pod is launched.") nodeClient := c.Nodes() - nodeList, err := nodeClient.List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodeList, err := nodeClient.List(unversioned.ListOptions{}) Expect(len(nodeList.Items)).To(BeNumerically(">", 0)) newNode, err := setDaemonSetNodeLabels(c, nodeList.Items[0].Name, nodeSelector) Expect(err).NotTo(HaveOccurred(), "error setting labels on node") @@ -196,7 +197,7 @@ func separateDaemonSetNodeLabels(labels map[string]string) (map[string]string, m func clearDaemonSetNodeLabels(c *client.Client) error { nodeClient := c.Nodes() - nodeList, err := nodeClient.List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodeList, err := nodeClient.List(unversioned.ListOptions{}) if err != nil { return err } @@ -251,7 +252,9 @@ func setDaemonSetNodeLabels(c *client.Client, nodeName string, labels map[string func checkDaemonPodOnNodes(f *Framework, selector map[string]string, nodeNames []string) func() (bool, error) { return func() (bool, error) { - podList, err := f.Client.Pods(f.Namespace.Name).List(labels.Set(selector).AsSelector(), fields.Everything(), unversioned.ListOptions{}) + selector := labels.Set(selector).AsSelector() + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + podList, err := f.Client.Pods(f.Namespace.Name).List(options) if err != nil { return false, nil } @@ -279,7 +282,7 @@ func checkDaemonPodOnNodes(f *Framework, selector map[string]string, nodeNames [ func checkRunningOnAllNodes(f *Framework, selector map[string]string) func() (bool, error) { return func() (bool, error) { - nodeList, err := f.Client.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodeList, err := f.Client.Nodes().List(unversioned.ListOptions{}) if err != nil { return false, nil } diff --git a/test/e2e/density.go b/test/e2e/density.go index 680b98a67a4..cfe112c23a4 100644 --- a/test/e2e/density.go +++ b/test/e2e/density.go @@ -156,7 +156,7 @@ var _ = Describe("Density [Skipped]", func() { ns = framework.Namespace.Name var err error - nodes, err := c.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodes, err := c.Nodes().List(unversioned.ListOptions{}) expectNoError(err) nodeCount = len(nodes.Items) Expect(nodeCount).NotTo(BeZero()) @@ -234,7 +234,7 @@ var _ = Describe("Density [Skipped]", func() { _, controller := controllerframework.NewInformer( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return c.Events(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + return c.Events(ns).List(unversioned.ListOptions{}) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { return c.Events(ns).Watch(options) @@ -317,7 +317,9 @@ var _ = Describe("Density [Skipped]", func() { _, controller := controllerframework.NewInformer( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return c.Pods(ns).List(labels.SelectorFromSet(labels.Set{"name": additionalPodsPrefix}), fields.Everything(), unversioned.ListOptions{}) + selector := labels.SelectorFromSet(labels.Set{"name": additionalPodsPrefix}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + return c.Pods(ns).List(options) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { options.LabelSelector.Selector = labels.SelectorFromSet(labels.Set{"name": additionalPodsPrefix}) @@ -364,14 +366,13 @@ var _ = Describe("Density [Skipped]", func() { } close(stopCh) - schedEvents, err := c.Events(ns).List( - labels.Everything(), - fields.Set{ - "involvedObject.kind": "Pod", - "involvedObject.namespace": ns, - "source": "scheduler", - }.AsSelector(), - unversioned.ListOptions{}) + selector := fields.Set{ + "involvedObject.kind": "Pod", + "involvedObject.namespace": ns, + "source": "scheduler", + }.AsSelector() + options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}} + schedEvents, err := c.Events(ns).List(options) expectNoError(err) for k := range createTimes { for _, event := range schedEvents.Items { diff --git a/test/e2e/dns.go b/test/e2e/dns.go index b787513a34a..3f4be7d3123 100644 --- a/test/e2e/dns.go +++ b/test/e2e/dns.go @@ -25,7 +25,6 @@ import ( "k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/wait" @@ -191,7 +190,8 @@ var _ = Describe("DNS", func() { systemClient := f.Client.Pods(api.NamespaceSystem) By("Waiting for DNS Service to be Running") - dnsPods, err := systemClient.List(dnsServiceLableSelector, fields.Everything(), unversioned.ListOptions{}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{dnsServiceLableSelector}} + dnsPods, err := systemClient.List(options) if err != nil { Failf("Failed to list all dns service pods") } @@ -229,7 +229,8 @@ var _ = Describe("DNS", func() { systemClient := f.Client.Pods(api.NamespaceSystem) By("Waiting for DNS Service to be Running") - dnsPods, err := systemClient.List(dnsServiceLableSelector, fields.Everything(), unversioned.ListOptions{}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{dnsServiceLableSelector}} + dnsPods, err := systemClient.List(options) if err != nil { Failf("Failed to list all dns service pods") } diff --git a/test/e2e/es_cluster_logging.go b/test/e2e/es_cluster_logging.go index a4f11a5c421..5a2ca1d2f04 100644 --- a/test/e2e/es_cluster_logging.go +++ b/test/e2e/es_cluster_logging.go @@ -25,7 +25,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" . "github.com/onsi/ginkgo" @@ -86,7 +85,8 @@ func ClusterLevelLoggingWithElasticsearch(f *Framework) { // Wait for the Elasticsearch pods to enter the running state. By("Checking to make sure the Elasticsearch pods are running") label := labels.SelectorFromSet(labels.Set(map[string]string{esKey: esValue})) - pods, err := f.Client.Pods(api.NamespaceSystem).List(label, fields.Everything(), unversioned.ListOptions{}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{label}} + pods, err := f.Client.Pods(api.NamespaceSystem).List(options) Expect(err).NotTo(HaveOccurred()) for _, pod := range pods.Items { err = waitForPodRunningInNamespace(f.Client, pod.Name, api.NamespaceSystem) @@ -172,7 +172,7 @@ func ClusterLevelLoggingWithElasticsearch(f *Framework) { } // Obtain a list of nodes so we can place one synthetic logger on each node. - nodes, err := f.Client.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodes, err := f.Client.Nodes().List(unversioned.ListOptions{}) if err != nil { Failf("Failed to list nodes: %v", err) } @@ -258,7 +258,9 @@ func ClusterLevelLoggingWithElasticsearch(f *Framework) { for start := time.Now(); time.Since(start) < ingestionTimeout; time.Sleep(10 * time.Second) { // Debugging code to report the status of the elasticsearch logging endpoints. - esPods, err := f.Client.Pods(api.NamespaceSystem).List(labels.Set{esKey: esValue}.AsSelector(), fields.Everything(), unversioned.ListOptions{}) + selector := labels.Set{esKey: esValue}.AsSelector() + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + esPods, err := f.Client.Pods(api.NamespaceSystem).List(options) if err != nil { Logf("Attempt to list Elasticsearch nodes encountered a problem -- may retry: %v", err) continue diff --git a/test/e2e/etcd_failure.go b/test/e2e/etcd_failure.go index 6c261584aac..bb576d43502 100644 --- a/test/e2e/etcd_failure.go +++ b/test/e2e/etcd_failure.go @@ -21,7 +21,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/wait" @@ -109,7 +108,8 @@ func checkExistingRCRecovers(f *Framework) { By("deleting pods from existing replication controller") expectNoError(wait.Poll(time.Millisecond*500, time.Second*60, func() (bool, error) { - pods, err := podClient.List(rcSelector, fields.Everything(), unversioned.ListOptions{}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{rcSelector}} + pods, err := podClient.List(options) if err != nil { Logf("apiserver returned error, as expected before recovery: %v", err) return false, nil @@ -127,7 +127,8 @@ func checkExistingRCRecovers(f *Framework) { By("waiting for replication controller to recover") expectNoError(wait.Poll(time.Millisecond*500, time.Second*60, func() (bool, error) { - pods, err := podClient.List(rcSelector, fields.Everything(), unversioned.ListOptions{}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{rcSelector}} + pods, err := podClient.List(options) Expect(err).NotTo(HaveOccurred()) for _, pod := range pods.Items { if pod.DeletionTimestamp == nil && api.IsPodReady(&pod) { diff --git a/test/e2e/events.go b/test/e2e/events.go index a149c3c3f76..26ca4a26015 100644 --- a/test/e2e/events.go +++ b/test/e2e/events.go @@ -73,7 +73,9 @@ var _ = Describe("Events", func() { expectNoError(framework.WaitForPodRunning(pod.Name)) By("verifying the pod is in kubernetes") - pods, err := podClient.List(labels.SelectorFromSet(labels.Set(map[string]string{"time": value})), fields.Everything(), unversioned.ListOptions{}) + selector := labels.SelectorFromSet(labels.Set(map[string]string{"time": value})) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + pods, err := podClient.List(options) Expect(len(pods.Items)).To(Equal(1)) By("retrieving the pod") @@ -86,16 +88,14 @@ var _ = Describe("Events", func() { // Check for scheduler event about the pod. By("checking for scheduler event about the pod") expectNoError(wait.Poll(time.Second*2, time.Second*60, func() (bool, error) { - events, err := framework.Client.Events(framework.Namespace.Name).List( - labels.Everything(), - fields.Set{ - "involvedObject.kind": "Pod", - "involvedObject.uid": string(podWithUid.UID), - "involvedObject.namespace": framework.Namespace.Name, - "source": "scheduler", - }.AsSelector(), - unversioned.ListOptions{}, - ) + selector := fields.Set{ + "involvedObject.kind": "Pod", + "involvedObject.uid": string(podWithUid.UID), + "involvedObject.namespace": framework.Namespace.Name, + "source": "scheduler", + }.AsSelector() + options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}} + events, err := framework.Client.Events(framework.Namespace.Name).List(options) if err != nil { return false, err } @@ -108,16 +108,14 @@ var _ = Describe("Events", func() { // Check for kubelet event about the pod. By("checking for kubelet event about the pod") expectNoError(wait.Poll(time.Second*2, time.Second*60, func() (bool, error) { - events, err = framework.Client.Events(framework.Namespace.Name).List( - labels.Everything(), - fields.Set{ - "involvedObject.uid": string(podWithUid.UID), - "involvedObject.kind": "Pod", - "involvedObject.namespace": framework.Namespace.Name, - "source": "kubelet", - }.AsSelector(), - unversioned.ListOptions{}, - ) + selector := fields.Set{ + "involvedObject.uid": string(podWithUid.UID), + "involvedObject.kind": "Pod", + "involvedObject.namespace": framework.Namespace.Name, + "source": "kubelet", + }.AsSelector() + options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}} + events, err = framework.Client.Events(framework.Namespace.Name).List(options) if err != nil { return false, err } diff --git a/test/e2e/example_cluster_dns.go b/test/e2e/example_cluster_dns.go index 3df8ed208dc..22ed667dc0b 100644 --- a/test/e2e/example_cluster_dns.go +++ b/test/e2e/example_cluster_dns.go @@ -24,7 +24,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" . "github.com/onsi/ginkgo" @@ -105,7 +104,8 @@ var _ = Describe("[Example] ClusterDns", func() { // the application itself may have not been initialized. Just query the application. for _, ns := range namespaces { label := labels.SelectorFromSet(labels.Set(map[string]string{"name": backendRcName})) - pods, err := c.Pods(ns.Name).List(label, fields.Everything(), unversioned.ListOptions{}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{label}} + pods, err := c.Pods(ns.Name).List(options) Expect(err).NotTo(HaveOccurred()) err = podsResponding(c, ns.Name, backendPodName, false, pods) Expect(err).NotTo(HaveOccurred(), "waiting for all pods to respond") @@ -124,7 +124,8 @@ var _ = Describe("[Example] ClusterDns", func() { // dns error or timeout. // This code is probably unnecessary, but let's stay on the safe side. label := labels.SelectorFromSet(labels.Set(map[string]string{"name": backendPodName})) - pods, err := c.Pods(namespaces[0].Name).List(label, fields.Everything(), unversioned.ListOptions{}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{label}} + pods, err := c.Pods(namespaces[0].Name).List(options) if err != nil || pods == nil || len(pods.Items) == 0 { Failf("no running pods found") diff --git a/test/e2e/example_k8petstore.go b/test/e2e/example_k8petstore.go index 6bdd06ff92d..2605aeb59a7 100644 --- a/test/e2e/example_k8petstore.go +++ b/test/e2e/example_k8petstore.go @@ -22,8 +22,6 @@ import ( . "github.com/onsi/gomega" "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "log" "os" "os/exec" @@ -158,7 +156,7 @@ var _ = Describe("[Example] Pet Store [Skipped]", func() { f := NewFramework("petstore") It(fmt.Sprintf("should scale to persist a nominal number ( %v ) of transactions in %v seconds", k8bpsSmokeTestTransactions, k8bpsSmokeTestTimeout), func() { - minions, err := f.Client.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + minions, err := f.Client.Nodes().List(unversioned.ListOptions{}) Expect(err).NotTo(HaveOccurred()) minionCount = len(minions.Items) diff --git a/test/e2e/examples.go b/test/e2e/examples.go index 6da0c2c8c66..6eb35382aeb 100644 --- a/test/e2e/examples.go +++ b/test/e2e/examples.go @@ -27,7 +27,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" . "github.com/onsi/ginkgo" @@ -463,7 +462,9 @@ func prepareResourceWithReplacedString(inputFile, old, new string) string { func forEachPod(c *client.Client, ns, selectorKey, selectorValue string, fn func(api.Pod)) { pods := []*api.Pod{} for t := time.Now(); time.Since(t) < podListTimeout; time.Sleep(poll) { - podList, err := c.Pods(ns).List(labels.SelectorFromSet(labels.Set(map[string]string{selectorKey: selectorValue})), fields.Everything(), unversioned.ListOptions{}) + selector := labels.SelectorFromSet(labels.Set(map[string]string{selectorKey: selectorValue})) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + podList, err := c.Pods(ns).List(options) Expect(err).NotTo(HaveOccurred()) for _, pod := range podList.Items { if pod.Status.Phase == api.PodPending || pod.Status.Phase == api.PodRunning { diff --git a/test/e2e/framework.go b/test/e2e/framework.go index 8d42fac41c8..ee2ec8a2e8f 100644 --- a/test/e2e/framework.go +++ b/test/e2e/framework.go @@ -27,7 +27,6 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -110,7 +109,7 @@ func (f *Framework) afterEach() { // Print events if the test failed. if CurrentGinkgoTestDescription().Failed { By(fmt.Sprintf("Collecting events from namespace %q.", f.Namespace.Name)) - events, err := f.Client.Events(f.Namespace.Name).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + events, err := f.Client.Events(f.Namespace.Name).List(unversioned.ListOptions{}) Expect(err).NotTo(HaveOccurred()) for _, e := range events.Items { @@ -184,7 +183,7 @@ func (f *Framework) WaitForAnEndpoint(serviceName string) error { for { // TODO: Endpoints client should take a field selector so we // don't have to list everything. - list, err := f.Client.Endpoints(f.Namespace.Name).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + list, err := f.Client.Endpoints(f.Namespace.Name).List(unversioned.ListOptions{}) if err != nil { return err } diff --git a/test/e2e/garbage_collector.go b/test/e2e/garbage_collector.go index 7fd0ceb2744..a9e05b71f28 100644 --- a/test/e2e/garbage_collector.go +++ b/test/e2e/garbage_collector.go @@ -24,8 +24,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" ) @@ -57,7 +55,7 @@ var _ = Describe("Garbage collector", func() { // 20 seconds. time.Sleep(30 * time.Second) - pods, err := f.Client.Pods(f.Namespace.Name).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + pods, err := f.Client.Pods(f.Namespace.Name).List(unversioned.ListOptions{}) Expect(err).NotTo(HaveOccurred()) Expect(len(pods.Items)).To(BeNumerically("==", 100)) }) diff --git a/test/e2e/ingress.go b/test/e2e/ingress.go index 3d51d50090f..f57d11ccd7f 100644 --- a/test/e2e/ingress.go +++ b/test/e2e/ingress.go @@ -31,7 +31,6 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/pkg/util/wait" @@ -212,7 +211,8 @@ func gcloudDelete(resource, name string) { // kubectlLogLBController logs kubectl debug output for the L7 controller pod. func kubectlLogLBController(c *client.Client, ns string) { selector := labels.SelectorFromSet(labels.Set(controllerLabels)) - podList, err := c.Pods(api.NamespaceAll).List(selector, fields.Everything(), unversioned.ListOptions{}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + podList, err := c.Pods(api.NamespaceAll).List(options) if err != nil { Logf("Cannot log L7 controller output, error listing pods %v", err) return @@ -424,8 +424,7 @@ var _ = Describe("GCE L7 LoadBalancer Controller", func() { Logf(desc) } // Delete all Ingress, then wait for the controller to cleanup. - ings, err := client.Extensions().Ingress(ns).List( - labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + ings, err := client.Extensions().Ingress(ns).List(unversioned.ListOptions{}) if err != nil { Logf("WARNING: Failed to list ingress: %+v", err) } else { @@ -483,8 +482,7 @@ var _ = Describe("GCE L7 LoadBalancer Controller", func() { createIngress(client, ns, appID, appsPerIngress) } - ings, err := client.Extensions().Ingress(ns).List( - labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + ings, err := client.Extensions().Ingress(ns).List(unversioned.ListOptions{}) Expect(err).NotTo(HaveOccurred()) for _, ing := range ings.Items { diff --git a/test/e2e/job.go b/test/e2e/job.go index f45030d7acd..4f19f8bdfbc 100644 --- a/test/e2e/job.go +++ b/test/e2e/job.go @@ -24,7 +24,6 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/wait" @@ -260,7 +259,8 @@ func deleteJob(c *client.Client, ns, name string) error { func waitForAllPodsRunning(c *client.Client, ns, jobName string, parallelism int) error { label := labels.SelectorFromSet(labels.Set(map[string]string{jobSelectorKey: jobName})) return wait.Poll(poll, jobTimeout, func() (bool, error) { - pods, err := c.Pods(ns).List(label, fields.Everything(), unversioned.ListOptions{}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{label}} + pods, err := c.Pods(ns).List(options) if err != nil { return false, err } diff --git a/test/e2e/kibana_logging.go b/test/e2e/kibana_logging.go index 1f64a01e3b9..3c9c7967fb4 100644 --- a/test/e2e/kibana_logging.go +++ b/test/e2e/kibana_logging.go @@ -21,7 +21,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" . "github.com/onsi/ginkgo" @@ -70,7 +69,8 @@ func ClusterLevelLoggingWithKibana(f *Framework) { // Wait for the Kibana pod(s) to enter the running state. By("Checking to make sure the Kibana pods are running") label := labels.SelectorFromSet(labels.Set(map[string]string{kibanaKey: kibanaValue})) - pods, err := f.Client.Pods(api.NamespaceSystem).List(label, fields.Everything(), unversioned.ListOptions{}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{label}} + pods, err := f.Client.Pods(api.NamespaceSystem).List(options) Expect(err).NotTo(HaveOccurred()) for _, pod := range pods.Items { err = waitForPodRunningInNamespace(f.Client, pod.Name, api.NamespaceSystem) diff --git a/test/e2e/kubectl.go b/test/e2e/kubectl.go index 881045fee0f..5a612450f43 100644 --- a/test/e2e/kubectl.go +++ b/test/e2e/kubectl.go @@ -42,7 +42,6 @@ import ( apierrs "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/labels" @@ -530,7 +529,7 @@ var _ = Describe("Kubectl client", func() { checkOutput(output, requiredStrings) // Node - nodes, err := c.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodes, err := c.Nodes().List(unversioned.ListOptions{}) Expect(err).NotTo(HaveOccurred()) node := nodes.Items[0] output = runKubectlOrDie("describe", "node", node.Name) @@ -1088,7 +1087,9 @@ func forEachReplicationController(c *client.Client, ns, selectorKey, selectorVal var rcs *api.ReplicationControllerList var err error for t := time.Now(); time.Since(t) < podListTimeout; time.Sleep(poll) { - rcs, err = c.ReplicationControllers(ns).List(labels.SelectorFromSet(labels.Set(map[string]string{selectorKey: selectorValue})), fields.Everything(), unversioned.ListOptions{}) + label := labels.SelectorFromSet(labels.Set(map[string]string{selectorKey: selectorValue})) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{label}} + rcs, err = c.ReplicationControllers(ns).List(options) Expect(err).NotTo(HaveOccurred()) if len(rcs.Items) > 0 { break diff --git a/test/e2e/kubelet.go b/test/e2e/kubelet.go index 2c17c7d58bb..594e797c350 100644 --- a/test/e2e/kubelet.go +++ b/test/e2e/kubelet.go @@ -23,8 +23,6 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/util/wait" @@ -96,7 +94,7 @@ var _ = Describe("kubelet", func() { var resourceMonitor *resourceMonitor BeforeEach(func() { - nodes, err := framework.Client.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodes, err := framework.Client.Nodes().List(unversioned.ListOptions{}) expectNoError(err) numNodes = len(nodes.Items) nodeNames = sets.NewString() diff --git a/test/e2e/kubelet_perf.go b/test/e2e/kubelet_perf.go index aa666079faa..8260307e2f5 100644 --- a/test/e2e/kubelet_perf.go +++ b/test/e2e/kubelet_perf.go @@ -22,8 +22,6 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/sets" @@ -105,7 +103,7 @@ var _ = Describe("Kubelet", func() { var resourceMonitor *resourceMonitor BeforeEach(func() { - nodes, err := framework.Client.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodes, err := framework.Client.Nodes().List(unversioned.ListOptions{}) expectNoError(err) nodeNames = sets.NewString() for _, node := range nodes.Items { diff --git a/test/e2e/kubelet_stats.go b/test/e2e/kubelet_stats.go index d554f111fbd..f299a9fa812 100644 --- a/test/e2e/kubelet_stats.go +++ b/test/e2e/kubelet_stats.go @@ -35,10 +35,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/kubelet" "k8s.io/kubernetes/pkg/kubelet/metrics" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/master/ports" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/sets" @@ -273,11 +271,11 @@ func getOneTimeResourceUsageOnNode( } func getKubeSystemContainersResourceUsage(c *client.Client) (resourceUsagePerContainer, error) { - pods, err := c.Pods("kube-system").List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + pods, err := c.Pods("kube-system").List(unversioned.ListOptions{}) if err != nil { return resourceUsagePerContainer{}, err } - nodes, err := c.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodes, err := c.Nodes().List(unversioned.ListOptions{}) if err != nil { return resourceUsagePerContainer{}, err } @@ -688,7 +686,7 @@ func newResourceMonitor(c *client.Client, containerNames []string, pollingInterv } func (r *resourceMonitor) Start() { - nodes, err := r.client.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodes, err := r.client.Nodes().List(unversioned.ListOptions{}) if err != nil { Failf("resourceMonitor: unable to get list of nodes: %v", err) } diff --git a/test/e2e/kubeproxy.go b/test/e2e/kubeproxy.go index 005e9852350..7bae392c980 100644 --- a/test/e2e/kubeproxy.go +++ b/test/e2e/kubeproxy.go @@ -31,7 +31,6 @@ import ( "k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/intstr" @@ -430,7 +429,7 @@ func (config *KubeProxyTestConfig) setup() { } By("Getting node addresses") - nodeList, err := config.f.Client.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodeList, err := config.f.Client.Nodes().List(unversioned.ListOptions{}) Expect(err).NotTo(HaveOccurred(), fmt.Sprintf("Failed to get node list: %v", err)) config.externalAddrs = NodeAddresses(nodeList, api.NodeExternalIP) if len(config.externalAddrs) < 2 { @@ -458,7 +457,7 @@ func (config *KubeProxyTestConfig) setup() { func (config *KubeProxyTestConfig) cleanup() { nsClient := config.getNamespacesClient() - nsList, err := nsClient.List(nil, nil, unversioned.ListOptions{}) + nsList, err := nsClient.List(unversioned.ListOptions{}) if err == nil { for _, ns := range nsList.Items { if strings.Contains(ns.Name, config.f.BaseName) && ns.Name != config.f.Namespace.Name { @@ -469,7 +468,7 @@ func (config *KubeProxyTestConfig) cleanup() { } func (config *KubeProxyTestConfig) createNetProxyPods(podName string, selector map[string]string) []*api.Pod { - nodes, err := config.f.Client.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodes, err := config.f.Client.Nodes().List(unversioned.ListOptions{}) Expect(err).NotTo(HaveOccurred()) // create pods, one for each node diff --git a/test/e2e/latency.go b/test/e2e/latency.go index 4b32e698362..f8dbad0cfcc 100644 --- a/test/e2e/latency.go +++ b/test/e2e/latency.go @@ -69,7 +69,7 @@ var _ = Describe("Latency [Skipped]", func() { ns = framework.Namespace.Name var err error - nodes, err := c.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodes, err := c.Nodes().List(unversioned.ListOptions{}) expectNoError(err) nodeCount = len(nodes.Items) Expect(nodeCount).NotTo(BeZero()) @@ -144,7 +144,9 @@ func runLatencyTest(nodeCount int, c *client.Client, ns string) { _, informer := framework.NewInformer( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return c.Pods(ns).List(labels.SelectorFromSet(labels.Set{"name": additionalPodsPrefix}), fields.Everything(), unversioned.ListOptions{}) + selector := labels.SelectorFromSet(labels.Set{"name": additionalPodsPrefix}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + return c.Pods(ns).List(options) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { options.LabelSelector.Selector = labels.SelectorFromSet(labels.Set{"name": additionalPodsPrefix}) @@ -190,14 +192,13 @@ func runLatencyTest(nodeCount int, c *client.Client, ns string) { close(stopCh) // Read the schedule timestamp by checking the scheduler event for each pod - schedEvents, err := c.Events(ns).List( - labels.Everything(), - fields.Set{ - "involvedObject.kind": "Pod", - "involvedObject.namespace": ns, - "source": "scheduler", - }.AsSelector(), - unversioned.ListOptions{}) + selector := fields.Set{ + "involvedObject.kind": "Pod", + "involvedObject.namespace": ns, + "source": "scheduler", + }.AsSelector() + options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}} + schedEvents, err := c.Events(ns).List(options) expectNoError(err) for k := range createTimestamps { for _, event := range schedEvents.Items { diff --git a/test/e2e/load.go b/test/e2e/load.go index 003a4b51a65..e77ef36ad25 100644 --- a/test/e2e/load.go +++ b/test/e2e/load.go @@ -25,7 +25,6 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" . "github.com/onsi/ginkgo" @@ -71,7 +70,7 @@ var _ = Describe("[Performance] Load capacity [Skipped]", func() { BeforeEach(func() { c = framework.Client ns = framework.Namespace.Name - nodes, err := c.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodes, err := c.Nodes().List(unversioned.ListOptions{}) expectNoError(err) nodeCount = len(nodes.Items) Expect(nodeCount).NotTo(BeZero()) @@ -210,7 +209,8 @@ func scaleRC(wg *sync.WaitGroup, config *RCConfig) { expectNoError(ScaleRC(config.Client, config.Namespace, config.Name, newSize, true), fmt.Sprintf("scaling rc %s for the first time", config.Name)) selector := labels.SelectorFromSet(labels.Set(map[string]string{"name": config.Name})) - _, err := config.Client.Pods(config.Namespace).List(selector, fields.Everything(), unversioned.ListOptions{}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + _, err := config.Client.Pods(config.Namespace).List(options) expectNoError(err, fmt.Sprintf("listing pods from rc %v", config.Name)) } diff --git a/test/e2e/mesos.go b/test/e2e/mesos.go index c0d33441d0e..1863de36b25 100644 --- a/test/e2e/mesos.go +++ b/test/e2e/mesos.go @@ -22,7 +22,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" @@ -45,7 +44,8 @@ var _ = Describe("Mesos", func() { nodeClient := framework.Client.Nodes() rackA := labels.SelectorFromSet(map[string]string{"k8s.mesosphere.io/attribute-rack": "1"}) - nodes, err := nodeClient.List(rackA, fields.Everything(), unversioned.ListOptions{}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{rackA}} + nodes, err := nodeClient.List(options) if err != nil { Failf("Failed to query for node: %v", err) } @@ -64,7 +64,7 @@ var _ = Describe("Mesos", func() { client := framework.Client expectNoError(allNodesReady(client, util.ForeverTestTimeout), "all nodes ready") - nodelist, err := client.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodelist, err := client.Nodes().List(unversioned.ListOptions{}) expectNoError(err, "nodes fetched from apiserver") const ns = "static-pods" @@ -109,7 +109,8 @@ var _ = Describe("Mesos", func() { role1 := labels.SelectorFromSet(map[string]string{ "k8s.mesosphere.io/attribute-role": "role1", }) - nodes, err := nodeClient.List(role1, fields.Everything(), unversioned.ListOptions{}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{role1}} + nodes, err := nodeClient.List(options) expectNoError(err) Expect(nodes.Items[0].Name).To(Equal(pod.Spec.NodeName)) diff --git a/test/e2e/metrics_util.go b/test/e2e/metrics_util.go index 5d40c22e761..a2d85da2343 100644 --- a/test/e2e/metrics_util.go +++ b/test/e2e/metrics_util.go @@ -31,8 +31,6 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/sets" "github.com/prometheus/common/expfmt" @@ -181,7 +179,7 @@ func listPodsLatencyThreshold(numNodes int) time.Duration { // Prints top five summary metrics for request types with latency and returns // number of such request types above threshold. func HighLatencyRequests(c *client.Client) (int, error) { - nodes, err := c.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodes, err := c.Nodes().List(unversioned.ListOptions{}) if err != nil { return 0, err } diff --git a/test/e2e/monitor_resources.go b/test/e2e/monitor_resources.go index 59640667e45..c0dae7b5fad 100644 --- a/test/e2e/monitor_resources.go +++ b/test/e2e/monitor_resources.go @@ -21,8 +21,6 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -89,7 +87,7 @@ var _ = Describe("Resource usage of system containers", func() { It("should not exceed expected amount.", func() { By("Getting ResourceConsumption on all nodes") - nodeList, err := c.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodeList, err := c.Nodes().List(unversioned.ListOptions{}) expectNoError(err) resourceUsagePerNode := make(map[string][]resourceUsagePerContainer) diff --git a/test/e2e/monitoring.go b/test/e2e/monitoring.go index f91060b3ffc..4f96fcf05d6 100644 --- a/test/e2e/monitoring.go +++ b/test/e2e/monitoring.go @@ -25,7 +25,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" . "github.com/onsi/ginkgo" @@ -78,7 +77,9 @@ func verifyExpectedRcsExistAndGetExpectedPods(c *client.Client) ([]string, error // situation when a heapster-monitoring-v1 and heapster-monitoring-v2 replication controller // is running (which would be an error except during a rolling update). for _, rcLabel := range rcLabels { - rcList, err := c.ReplicationControllers(api.NamespaceSystem).List(labels.Set{"k8s-app": rcLabel}.AsSelector(), fields.Everything(), unversioned.ListOptions{}) + selector := labels.Set{"k8s-app": rcLabel}.AsSelector() + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + rcList, err := c.ReplicationControllers(api.NamespaceSystem).List(options) if err != nil { return nil, err } @@ -87,7 +88,9 @@ func verifyExpectedRcsExistAndGetExpectedPods(c *client.Client) ([]string, error rcLabel, len(rcList.Items)) } for _, rc := range rcList.Items { - podList, err := c.Pods(api.NamespaceSystem).List(labels.Set(rc.Spec.Selector).AsSelector(), fields.Everything(), unversioned.ListOptions{}) + selector := labels.Set(rc.Spec.Selector).AsSelector() + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + podList, err := c.Pods(api.NamespaceSystem).List(options) if err != nil { return nil, err } @@ -103,7 +106,7 @@ func verifyExpectedRcsExistAndGetExpectedPods(c *client.Client) ([]string, error } func expectedServicesExist(c *client.Client) error { - serviceList, err := c.Services(api.NamespaceSystem).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + serviceList, err := c.Services(api.NamespaceSystem).List(unversioned.ListOptions{}) if err != nil { return err } @@ -121,7 +124,7 @@ func expectedServicesExist(c *client.Client) error { } func getAllNodesInCluster(c *client.Client) ([]string, error) { - nodeList, err := c.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodeList, err := c.Nodes().List(unversioned.ListOptions{}) if err != nil { return nil, err } diff --git a/test/e2e/namespace.go b/test/e2e/namespace.go index 1db26b3dae0..9aa47b87b46 100644 --- a/test/e2e/namespace.go +++ b/test/e2e/namespace.go @@ -18,15 +18,12 @@ package e2e import ( "fmt" - //"k8s.io/kubernetes/pkg/api" "strings" "sync" "time" "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/wait" . "github.com/onsi/ginkgo" @@ -61,7 +58,7 @@ func extinguish(c *client.Client, totalNS int, maxAllowedAfterDel int, maxSecond expectNoError(wait.Poll(2*time.Second, time.Duration(maxSeconds)*time.Second, func() (bool, error) { var cnt = 0 - nsList, err := c.Namespaces().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nsList, err := c.Namespaces().List(unversioned.ListOptions{}) if err != nil { return false, err } diff --git a/test/e2e/networking.go b/test/e2e/networking.go index 142d192d825..649e605ace5 100644 --- a/test/e2e/networking.go +++ b/test/e2e/networking.go @@ -24,8 +24,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/intstr" . "github.com/onsi/ginkgo" @@ -138,7 +136,7 @@ var _ = Describe("Networking", func() { By("Creating a webserver (pending) pod on each node") - nodes, err := f.Client.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodes, err := f.Client.Nodes().List(unversioned.ListOptions{}) if err != nil { Failf("Failed to list nodes: %v", err) } diff --git a/test/e2e/nodeoutofdisk.go b/test/e2e/nodeoutofdisk.go index 2c567743c6b..5cb5060150f 100644 --- a/test/e2e/nodeoutofdisk.go +++ b/test/e2e/nodeoutofdisk.go @@ -133,16 +133,15 @@ var _ = Describe("NodeOutOfDisk", func() { By(fmt.Sprintf("Finding a failed scheduler event for pod %s", pendingPodName)) wait.Poll(2*time.Second, 5*time.Minute, func() (bool, error) { - schedEvents, err := c.Events(ns).List( - labels.Everything(), - fields.Set{ - "involvedObject.kind": "Pod", - "involvedObject.name": pendingPodName, - "involvedObject.namespace": ns, - "source": "scheduler", - "reason": "FailedScheduling", - }.AsSelector(), - unversioned.ListOptions{}) + selector := fields.Set{ + "involvedObject.kind": "Pod", + "involvedObject.name": pendingPodName, + "involvedObject.namespace": ns, + "source": "scheduler", + "reason": "FailedScheduling", + }.AsSelector() + options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}} + schedEvents, err := c.Events(ns).List(options) expectNoError(err) if len(schedEvents.Items) > 0 { @@ -203,7 +202,9 @@ func createOutOfDiskPod(c *client.Client, ns, name string, milliCPU int64) { func availCpu(c *client.Client, node *api.Node) (int64, error) { podClient := c.Pods(api.NamespaceAll) - pods, err := podClient.List(labels.Everything(), fields.Set{"spec.nodeName": node.Name}.AsSelector(), unversioned.ListOptions{}) + selector := fields.Set{"spec.nodeName": node.Name}.AsSelector() + options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}} + pods, err := podClient.List(options) if err != nil { return 0, fmt.Errorf("failed to retrieve all the pods on node %s: %v", node.Name, err) } diff --git a/test/e2e/pd.go b/test/e2e/pd.go index d2d45383bee..fc928ed0859 100644 --- a/test/e2e/pd.go +++ b/test/e2e/pd.go @@ -32,8 +32,6 @@ import ( client "k8s.io/kubernetes/pkg/client/unversioned" awscloud "k8s.io/kubernetes/pkg/cloudprovider/providers/aws" gcecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/gce" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" ) @@ -55,7 +53,7 @@ var _ = Describe("Pod Disks", func() { podClient = framework.Client.Pods(framework.Namespace.Name) - nodes, err := framework.Client.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodes, err := framework.Client.Nodes().List(unversioned.ListOptions{}) expectNoError(err, "Failed to list nodes for e2e cluster.") Expect(len(nodes.Items)).To(BeNumerically(">=", 2), "Requires at least 2 nodes") diff --git a/test/e2e/pods.go b/test/e2e/pods.go index f12b04a7a26..66f84d4ea23 100644 --- a/test/e2e/pods.go +++ b/test/e2e/pods.go @@ -32,7 +32,6 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/kubelet" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" @@ -300,13 +299,15 @@ var _ = Describe("Pods", func() { } By("setting up watch") - pods, err := podClient.List(labels.SelectorFromSet(labels.Set(map[string]string{"time": value})), fields.Everything(), unversioned.ListOptions{}) + selector := labels.SelectorFromSet(labels.Set(map[string]string{"time": value})) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + pods, err := podClient.List(options) if err != nil { Failf("Failed to query for pods: %v", err) } Expect(len(pods.Items)).To(Equal(0)) - options := unversioned.ListOptions{ - LabelSelector: unversioned.LabelSelector{labels.SelectorFromSet(labels.Set(map[string]string{"time": value}))}, + options = unversioned.ListOptions{ + LabelSelector: unversioned.LabelSelector{selector}, ResourceVersion: pods.ListMeta.ResourceVersion, } w, err := podClient.Watch(options) @@ -325,7 +326,9 @@ var _ = Describe("Pods", func() { } By("verifying the pod is in kubernetes") - pods, err = podClient.List(labels.SelectorFromSet(labels.Set(map[string]string{"time": value})), fields.Everything(), unversioned.ListOptions{}) + selector = labels.SelectorFromSet(labels.Set(map[string]string{"time": value})) + options = unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + pods, err = podClient.List(options) if err != nil { Failf("Failed to query for pods: %v", err) } @@ -369,7 +372,9 @@ var _ = Describe("Pods", func() { Expect(lastPod.DeletionTimestamp).ToNot(BeNil()) Expect(lastPod.Spec.TerminationGracePeriodSeconds).ToNot(BeZero()) - pods, err = podClient.List(labels.SelectorFromSet(labels.Set(map[string]string{"time": value})), fields.Everything(), unversioned.ListOptions{}) + selector = labels.SelectorFromSet(labels.Set(map[string]string{"time": value})) + options = unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + pods, err = podClient.List(options) if err != nil { Fail(fmt.Sprintf("Failed to list pods to verify deletion: %v", err)) } @@ -423,7 +428,9 @@ var _ = Describe("Pods", func() { expectNoError(framework.WaitForPodRunning(pod.Name)) By("verifying the pod is in kubernetes") - pods, err := podClient.List(labels.SelectorFromSet(labels.Set(map[string]string{"time": value})), fields.Everything(), unversioned.ListOptions{}) + selector := labels.SelectorFromSet(labels.Set(map[string]string{"time": value})) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + pods, err := podClient.List(options) Expect(len(pods.Items)).To(Equal(1)) // Standard get, update retry loop @@ -453,7 +460,9 @@ var _ = Describe("Pods", func() { expectNoError(framework.WaitForPodRunning(pod.Name)) By("verifying the updated pod is in kubernetes") - pods, err = podClient.List(labels.SelectorFromSet(labels.Set(map[string]string{"time": value})), fields.Everything(), unversioned.ListOptions{}) + selector = labels.SelectorFromSet(labels.Set(map[string]string{"time": value})) + options = unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + pods, err = podClient.List(options) Expect(len(pods.Items)).To(Equal(1)) Logf("Pod update OK") }) @@ -1039,7 +1048,9 @@ var _ = Describe("Pods", func() { expectNoError(framework.WaitForPodRunning(pod.Name)) By("verifying the pod is in kubernetes") - pods, err := podClient.List(labels.SelectorFromSet(labels.Set(map[string]string{"time": value})), fields.Everything(), unversioned.ListOptions{}) + selector := labels.SelectorFromSet(labels.Set(map[string]string{"time": value})) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + pods, err := podClient.List(options) if err != nil { Failf("Failed to query for pods: %v", err) } @@ -1112,7 +1123,9 @@ var _ = Describe("Pods", func() { expectNoError(framework.WaitForPodRunning(pod.Name)) By("verifying the pod is in kubernetes") - pods, err := podClient.List(labels.SelectorFromSet(labels.Set(map[string]string{"time": value})), fields.Everything(), unversioned.ListOptions{}) + selector := labels.SelectorFromSet(labels.Set(map[string]string{"time": value})) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + pods, err := podClient.List(options) if err != nil { Failf("Failed to query for pods: %v", err) } diff --git a/test/e2e/proxy.go b/test/e2e/proxy.go index b40f0d40888..c597e914a13 100644 --- a/test/e2e/proxy.go +++ b/test/e2e/proxy.go @@ -28,8 +28,6 @@ import ( "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/intstr" @@ -253,7 +251,7 @@ func truncate(b []byte, maxLen int) []byte { } func pickNode(c *client.Client) (string, error) { - nodes, err := c.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodes, err := c.Nodes().List(unversioned.ListOptions{}) if err != nil { return "", err } diff --git a/test/e2e/reboot.go b/test/e2e/reboot.go index 097df3679f8..56b5be880e2 100644 --- a/test/e2e/reboot.go +++ b/test/e2e/reboot.go @@ -62,7 +62,7 @@ var _ = Describe("Reboot", func() { // events for the kube-system namespace on failures namespaceName := api.NamespaceSystem By(fmt.Sprintf("Collecting events from namespace %q.", namespaceName)) - events, err := f.Client.Events(namespaceName).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + events, err := f.Client.Events(namespaceName).List(unversioned.ListOptions{}) Expect(err).NotTo(HaveOccurred()) for _, e := range events.Items { diff --git a/test/e2e/resize_nodes.go b/test/e2e/resize_nodes.go index 0de51b6be02..d889a834ca5 100644 --- a/test/e2e/resize_nodes.go +++ b/test/e2e/resize_nodes.go @@ -27,7 +27,6 @@ import ( "k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/pkg/util/wait" @@ -234,7 +233,8 @@ func podsCreated(c *client.Client, ns, name string, replicas int) (*api.PodList, // List the pods, making sure we observe all the replicas. label := labels.SelectorFromSet(labels.Set(map[string]string{"name": name})) for start := time.Now(); time.Since(start) < timeout; time.Sleep(5 * time.Second) { - pods, err := c.Pods(ns).List(label, fields.Everything(), unversioned.ListOptions{}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{label}} + pods, err := c.Pods(ns).List(options) if err != nil { return nil, err } @@ -397,7 +397,7 @@ var _ = Describe("Nodes", func() { BeforeEach(func() { c = framework.Client ns = framework.Namespace.Name - systemPods, err := c.Pods(api.NamespaceSystem).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + systemPods, err := c.Pods(api.NamespaceSystem).List(unversioned.ListOptions{}) Expect(err).NotTo(HaveOccurred()) systemPodsNo = len(systemPods.Items) }) @@ -511,7 +511,8 @@ var _ = Describe("Nodes", func() { By("choose a node with at least one pod - we will block some network traffic on this node") label := labels.SelectorFromSet(labels.Set(map[string]string{"name": name})) - pods, err := c.Pods(ns).List(label, fields.Everything(), unversioned.ListOptions{}) // list pods after all have been scheduled + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{label}} + pods, err := c.Pods(ns).List(options) // list pods after all have been scheduled Expect(err).NotTo(HaveOccurred()) nodeName := pods.Items[0].Spec.NodeName diff --git a/test/e2e/scheduler_predicates.go b/test/e2e/scheduler_predicates.go index afdd39bd718..16c89b0c8ee 100644 --- a/test/e2e/scheduler_predicates.go +++ b/test/e2e/scheduler_predicates.go @@ -25,7 +25,6 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" . "github.com/onsi/ginkgo" @@ -47,7 +46,7 @@ func getPodsScheduled(pods *api.PodList) (scheduledPods, notScheduledPods []api. // Simplified version of RunRC, that does not create RC, but creates plain Pods and // requires passing whole Pod definition, which is needed to test various Scheduler predicates. func startPods(c *client.Client, replicas int, ns string, podNamePrefix string, pod api.Pod) { - allPods, err := c.Pods(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + allPods, err := c.Pods(api.NamespaceAll).List(unversioned.ListOptions{}) expectNoError(err) podsScheduledBefore, _ := getPodsScheduled(allPods) @@ -68,7 +67,7 @@ func startPods(c *client.Client, replicas int, ns string, podNamePrefix string, startTime := time.Now() currentlyScheduledPods := 0 for len(podsScheduledBefore)+replicas != currentlyScheduledPods { - allPods, err := c.Pods(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + allPods, err := c.Pods(api.NamespaceAll).List(unversioned.ListOptions{}) expectNoError(err) scheduledPods := 0 for _, pod := range allPods.Items { @@ -96,36 +95,34 @@ func getRequestedCPU(pod api.Pod) int64 { } func verifyResult(c *client.Client, podName string, ns string) { - allPods, err := c.Pods(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + allPods, err := c.Pods(api.NamespaceAll).List(unversioned.ListOptions{}) expectNoError(err) scheduledPods, notScheduledPods := getPodsScheduled(allPods) - schedEvents, err := c.Events(ns).List( - labels.Everything(), - fields.Set{ - "involvedObject.kind": "Pod", - "involvedObject.name": podName, - "involvedObject.namespace": ns, - "source": "scheduler", - "reason": "FailedScheduling", - }.AsSelector(), - unversioned.ListOptions{}) + selector := fields.Set{ + "involvedObject.kind": "Pod", + "involvedObject.name": podName, + "involvedObject.namespace": ns, + "source": "scheduler", + "reason": "FailedScheduling", + }.AsSelector() + options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}} + schedEvents, err := c.Events(ns).List(options) expectNoError(err) // If we failed to find event with a capitalized first letter of reason // try looking for one starting with a small one for backward compatibility. // If we don't do it we end up in #15806. // TODO: remove this block when we don't care about supporting v1.0 too much. if len(schedEvents.Items) == 0 { - schedEvents, err = c.Events(ns).List( - labels.Everything(), - fields.Set{ - "involvedObject.kind": "Pod", - "involvedObject.name": podName, - "involvedObject.namespace": ns, - "source": "scheduler", - "reason": "failedScheduling", - }.AsSelector(), - unversioned.ListOptions{}) + selector := fields.Set{ + "involvedObject.kind": "Pod", + "involvedObject.name": podName, + "involvedObject.namespace": ns, + "source": "scheduler", + "reason": "failedScheduling", + }.AsSelector() + options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}} + schedEvents, err = c.Events(ns).List(options) expectNoError(err) } @@ -145,7 +142,7 @@ func verifyResult(c *client.Client, podName string, ns string) { func cleanupPods(c *client.Client, ns string) { By("Removing all pods in namespace " + ns) - pods, err := c.Pods(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + pods, err := c.Pods(ns).List(unversioned.ListOptions{}) expectNoError(err) opt := api.NewDeleteOptions(0) for _, p := range pods.Items { @@ -158,13 +155,13 @@ func waitForStableCluster(c *client.Client) int { timeout := 10 * time.Minute startTime := time.Now() - allPods, err := c.Pods(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + allPods, err := c.Pods(api.NamespaceAll).List(unversioned.ListOptions{}) expectNoError(err) scheduledPods, currentlyNotScheduledPods := getPodsScheduled(allPods) for len(currentlyNotScheduledPods) != 0 { time.Sleep(2 * time.Second) - allPods, err := c.Pods(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + allPods, err := c.Pods(api.NamespaceAll).List(unversioned.ListOptions{}) expectNoError(err) scheduledPods, currentlyNotScheduledPods = getPodsScheduled(allPods) @@ -198,7 +195,7 @@ var _ = Describe("SchedulerPredicates", func() { c = framework.Client ns = framework.Namespace.Name var err error - nodeList, err = c.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodeList, err = c.Nodes().List(unversioned.ListOptions{}) expectNoError(err) }) @@ -278,7 +275,7 @@ var _ = Describe("SchedulerPredicates", func() { } waitForStableCluster(c) - pods, err := c.Pods(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + pods, err := c.Pods(api.NamespaceAll).List(unversioned.ListOptions{}) expectNoError(err) for _, pod := range pods.Items { _, found := nodeToCapacityMap[pod.Spec.NodeName] diff --git a/test/e2e/service.go b/test/e2e/service.go index 265f77324be..ca240c8aadd 100644 --- a/test/e2e/service.go +++ b/test/e2e/service.go @@ -32,8 +32,6 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/intstr" @@ -1044,7 +1042,7 @@ func validateEndpointsOrFail(c *client.Client, namespace, serviceName string, ex i++ } - if pods, err := c.Pods(api.NamespaceAll).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}); err == nil { + if pods, err := c.Pods(api.NamespaceAll).List(unversioned.ListOptions{}); err == nil { for _, pod := range pods.Items { Logf("Pod %s\t%s\t%s\t%s", pod.Namespace, pod.Name, pod.Spec.NodeName, pod.DeletionTimestamp) } @@ -1096,7 +1094,7 @@ func collectAddresses(nodes *api.NodeList, addressType api.NodeAddressType) []st } func getNodePublicIps(c *client.Client) ([]string, error) { - nodes, err := c.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodes, err := c.Nodes().List(unversioned.ListOptions{}) if err != nil { return nil, err } diff --git a/test/e2e/service_accounts.go b/test/e2e/service_accounts.go index a38934a4ffb..d399d27e2db 100644 --- a/test/e2e/service_accounts.go +++ b/test/e2e/service_accounts.go @@ -24,7 +24,6 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/plugin/pkg/admission/serviceaccount" @@ -43,7 +42,8 @@ var _ = Describe("ServiceAccounts", func() { expectNoError(wait.Poll(time.Millisecond*500, time.Second*10, func() (bool, error) { By("getting the auto-created API token") tokenSelector := fields.SelectorFromSet(map[string]string{client.SecretType: string(api.SecretTypeServiceAccountToken)}) - secrets, err := f.Client.Secrets(f.Namespace.Name).List(labels.Everything(), tokenSelector, unversioned.ListOptions{}) + options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{tokenSelector}} + secrets, err := f.Client.Secrets(f.Namespace.Name).List(options) if err != nil { return false, err } diff --git a/test/e2e/service_latency.go b/test/e2e/service_latency.go index 9203ca7a6e7..ecfe8611f35 100644 --- a/test/e2e/service_latency.go +++ b/test/e2e/service_latency.go @@ -26,8 +26,6 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/controller/framework" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/sets" @@ -280,7 +278,7 @@ func startEndpointWatcher(f *Framework, q *endpointQueries) { _, controller := framework.NewInformer( &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return f.Client.Endpoints(f.Namespace.Name).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + return f.Client.Endpoints(f.Namespace.Name).List(unversioned.ListOptions{}) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { return f.Client.Endpoints(f.Namespace.Name).Watch(options) diff --git a/test/e2e/serviceloadbalancers.go b/test/e2e/serviceloadbalancers.go index 519a6766a73..290897a7897 100644 --- a/test/e2e/serviceloadbalancers.go +++ b/test/e2e/serviceloadbalancers.go @@ -25,7 +25,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/wait" utilyaml "k8s.io/kubernetes/pkg/util/yaml" @@ -112,8 +111,8 @@ func (h *haproxyControllerTester) start(namespace string) (err error) { // Find the pods of the rc we just created. labelSelector := labels.SelectorFromSet( labels.Set(map[string]string{"name": h.rcName})) - pods, err := h.client.Pods(h.rcNamespace).List( - labelSelector, fields.Everything(), unversioned.ListOptions{}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{labelSelector}} + pods, err := h.client.Pods(h.rcNamespace).List(options) if err != nil { return err } diff --git a/test/e2e/util.go b/test/e2e/util.go index ca61cd35720..bfa62cdaae1 100644 --- a/test/e2e/util.go +++ b/test/e2e/util.go @@ -162,7 +162,11 @@ type podStore struct { func newPodStore(c *client.Client, namespace string, label labels.Selector, field fields.Selector) *podStore { lw := &cache.ListWatch{ ListFunc: func() (runtime.Object, error) { - return c.Pods(namespace).List(label, field, unversioned.ListOptions{}) + options := unversioned.ListOptions{ + LabelSelector: unversioned.LabelSelector{label}, + FieldSelector: unversioned.FieldSelector{field}, + } + return c.Pods(namespace).List(options) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { options.LabelSelector.Selector = label @@ -366,7 +370,7 @@ func waitForPodsRunningReady(ns string, minPods int, timeout time.Duration) erro // We get the new list of pods and replication controllers in every // iteration because more pods come online during startup and we want to // ensure they are also checked. - rcList, err := c.ReplicationControllers(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + rcList, err := c.ReplicationControllers(ns).List(unversioned.ListOptions{}) if err != nil { Logf("Error getting replication controllers in namespace '%s': %v", ns, err) return false, nil @@ -376,7 +380,7 @@ func waitForPodsRunningReady(ns string, minPods int, timeout time.Duration) erro replicas += rc.Spec.Replicas } - podList, err := c.Pods(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + podList, err := c.Pods(ns).List(unversioned.ListOptions{}) if err != nil { Logf("Error getting pods in namespace '%s': %v", ns, err) return false, nil @@ -420,7 +424,7 @@ func waitForPodsRunningReady(ns string, minPods int, timeout time.Duration) erro // Returns the list of deleted namespaces or an error. func deleteNamespaces(c *client.Client, deleteFilter, skipFilter []string) ([]string, error) { By("Deleting namespaces") - nsList, err := c.Namespaces().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nsList, err := c.Namespaces().List(unversioned.ListOptions{}) Expect(err).NotTo(HaveOccurred()) var deleted []string var wg sync.WaitGroup @@ -467,7 +471,7 @@ func waitForNamespacesDeleted(c *client.Client, namespaces []string, timeout tim //Now POLL until all namespaces have been eradicated. return wait.Poll(2*time.Second, timeout, func() (bool, error) { - nsList, err := c.Namespaces().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nsList, err := c.Namespaces().List(unversioned.ListOptions{}) if err != nil { return false, err } @@ -599,7 +603,7 @@ func checkTestingNSDeletedExcept(c *client.Client, skip string) error { Logf("Waiting for terminating namespaces to be deleted...") for start := time.Now(); time.Since(start) < timeout; time.Sleep(15 * time.Second) { - namespaces, err := c.Namespaces().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + namespaces, err := c.Namespaces().List(unversioned.ListOptions{}) if err != nil { Logf("Listing namespaces failed: %v", err) continue @@ -641,7 +645,7 @@ func deleteNS(c *client.Client, namespace string, timeout time.Duration) error { // check for pods that were not deleted remaining := []string{} missingTimestamp := false - if pods, perr := c.Pods(namespace).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}); perr == nil { + if pods, perr := c.Pods(namespace).List(unversioned.ListOptions{}); perr == nil { for _, pod := range pods.Items { Logf("Pod %s %s on node %s remains, has deletion timestamp %s", namespace, pod.Name, pod.Spec.NodeName, pod.DeletionTimestamp) remaining = append(remaining, pod.Name) @@ -729,7 +733,8 @@ func waitForRCPodOnNode(c *client.Client, ns, rcName, node string) (*api.Pod, er var p *api.Pod = nil err := wait.PollImmediate(10*time.Second, 5*time.Minute, func() (bool, error) { Logf("Waiting for pod %s to appear on node %s", rcName, node) - pods, err := c.Pods(ns).List(label, fields.Everything(), unversioned.ListOptions{}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{label}} + pods, err := c.Pods(ns).List(options) if err != nil { return false, err } @@ -748,7 +753,8 @@ func waitForRCPodOnNode(c *client.Client, ns, rcName, node string) (*api.Pod, er func waitForPodToDisappear(c *client.Client, ns, podName string, label labels.Selector, interval, timeout time.Duration) error { return wait.PollImmediate(interval, timeout, func() (bool, error) { Logf("Waiting for pod %s to disappear", podName) - pods, err := c.Pods(ns).List(label, fields.Everything(), unversioned.ListOptions{}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{label}} + pods, err := c.Pods(ns).List(options) if err != nil { return false, err } @@ -810,7 +816,7 @@ func waitForService(c *client.Client, namespace, name string, exist bool, interv func waitForServiceEndpointsNum(c *client.Client, namespace, serviceName string, expectNum int, interval, timeout time.Duration) error { return wait.Poll(interval, timeout, func() (bool, error) { Logf("Waiting for amount of service:%s endpoints to %d", serviceName, expectNum) - list, err := c.Endpoints(namespace).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + list, err := c.Endpoints(namespace).List(unversioned.ListOptions{}) if err != nil { return false, err } @@ -878,7 +884,8 @@ type podResponseChecker struct { // checkAllResponses issues GETs to all pods in the context and verify they reply with pod name. func (r podResponseChecker) checkAllResponses() (done bool, err error) { successes := 0 - currentPods, err := r.c.Pods(r.ns).List(r.label, fields.Everything(), unversioned.ListOptions{}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{r.label}} + currentPods, err := r.c.Pods(r.ns).List(options) Expect(err).NotTo(HaveOccurred()) for i, pod := range r.pods.Items { // Check that the replica list remains unchanged, otherwise we have problems. @@ -1614,7 +1621,8 @@ func (config *RCConfig) start() error { if oldRunning != config.Replicas { // List only pods from a given replication controller. - if pods, err := config.Client.Pods(api.NamespaceAll).List(label, fields.Everything(), unversioned.ListOptions{}); err == nil { + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{label}} + if pods, err := config.Client.Pods(api.NamespaceAll).List(options); err == nil { for _, pod := range pods.Items { Logf("Pod %s\t%s\t%s\t%s", pod.Name, pod.Spec.NodeName, pod.Status.Phase, pod.DeletionTimestamp) @@ -1643,7 +1651,7 @@ func dumpPodDebugInfo(c *client.Client, pods []*api.Pod) { } func dumpAllPodInfo(c *client.Client) { - pods, err := c.Pods("").List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + pods, err := c.Pods("").List(unversioned.ListOptions{}) if err != nil { Logf("unable to fetch pod debug info: %v", err) } @@ -1651,7 +1659,7 @@ func dumpAllPodInfo(c *client.Client) { } func dumpAllNodeInfo(c *client.Client) { - nodes, err := c.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodes, err := c.Nodes().List(unversioned.ListOptions{}) if err != nil { Logf("unable to fetch node list: %v", err) return @@ -1699,15 +1707,14 @@ func dumpNodeDebugInfo(c *client.Client, nodeNames []string) { // restart and node unhealthy events. Note that listing events like this will mess // with latency metrics, beware of calling it during a test. func getNodeEvents(c *client.Client, nodeName string) []api.Event { - events, err := c.Events(api.NamespaceSystem).List( - labels.Everything(), - fields.Set{ - "involvedObject.kind": "Node", - "involvedObject.name": nodeName, - "involvedObject.namespace": api.NamespaceAll, - "source": "kubelet", - }.AsSelector(), - unversioned.ListOptions{}) + selector := fields.Set{ + "involvedObject.kind": "Node", + "involvedObject.name": nodeName, + "involvedObject.namespace": api.NamespaceAll, + "source": "kubelet", + }.AsSelector() + options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}} + events, err := c.Events(api.NamespaceSystem).List(options) if err != nil { Logf("Unexpected error retrieving node events %v", err) return []api.Event{} @@ -1772,7 +1779,8 @@ waitLoop: // Wait up to 10 minutes for getting pods with certain label func waitForPodsWithLabel(c *client.Client, ns string, label labels.Selector) (pods *api.PodList, err error) { for t := time.Now(); time.Since(t) < podListTimeout; time.Sleep(poll) { - pods, err = c.Pods(ns).List(label, fields.Everything(), unversioned.ListOptions{}) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{label}} + pods, err = c.Pods(ns).List(options) Expect(err).NotTo(HaveOccurred()) if len(pods.Items) > 0 { break @@ -1823,7 +1831,9 @@ func DeleteRC(c *client.Client, ns, name string) error { // have completed termination). func waitForRCPodsGone(c *client.Client, rc *api.ReplicationController) error { return wait.PollImmediate(poll, 2*time.Minute, func() (bool, error) { - if pods, err := c.Pods(rc.Namespace).List(labels.SelectorFromSet(rc.Spec.Selector), fields.Everything(), unversioned.ListOptions{}); err == nil && len(pods.Items) == 0 { + selector := labels.SelectorFromSet(rc.Spec.Selector) + options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + if pods, err := c.Pods(rc.Namespace).List(options); err == nil && len(pods.Items) == 0 { return true, nil } return false, nil @@ -1903,7 +1913,11 @@ func listNodes(c *client.Client, label labels.Selector, field fields.Selector) ( var nodes *api.NodeList var errLast error if wait.PollImmediate(poll, singleCallTimeout, func() (bool, error) { - nodes, errLast = c.Nodes().List(label, field, unversioned.ListOptions{}) + options := unversioned.ListOptions{ + LabelSelector: unversioned.LabelSelector{label}, + FieldSelector: unversioned.FieldSelector{field}, + } + nodes, errLast = c.Nodes().List(options) return errLast == nil, nil }) != nil { return nil, fmt.Errorf("listNodes() failed with last error: %v", errLast) @@ -1992,7 +2006,7 @@ func NodeAddresses(nodelist *api.NodeList, addrType api.NodeAddressType) []strin // if it can't find an external IP for every node, though it still returns all // hosts that it found in that case. func NodeSSHHosts(c *client.Client) ([]string, error) { - nodelist, err := c.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodelist, err := c.Nodes().List(unversioned.ListOptions{}) if err != nil { return nil, fmt.Errorf("error getting nodes: %v", err) } @@ -2240,7 +2254,7 @@ func allNodesReady(c *client.Client, timeout time.Duration) error { var notReady []api.Node err := wait.PollImmediate(poll, timeout, func() (bool, error) { notReady = nil - nodes, err := c.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodes, err := c.Nodes().List(unversioned.ListOptions{}) if err != nil { return false, err } @@ -2359,7 +2373,7 @@ func waitForApiserverUp(c *client.Client) error { // waitForClusterSize waits until the cluster has desired size and there is no not-ready nodes in it. func waitForClusterSize(c *client.Client, size int, timeout time.Duration) error { for start := time.Now(); time.Since(start) < timeout; time.Sleep(20 * time.Second) { - nodes, err := c.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodes, err := c.Nodes().List(unversioned.ListOptions{}) if err != nil { Logf("Failed to list nodes: %v", err) continue @@ -2553,7 +2567,7 @@ func getNodePortURL(client *client.Client, ns, name string, svcPort int) (string if err != nil { return "", err } - nodes, err := client.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + nodes, err := client.Nodes().List(unversioned.ListOptions{}) if err != nil { return "", err } diff --git a/test/integration/client_test.go b/test/integration/client_test.go index c2e45ee0573..f25e63a2c6f 100644 --- a/test/integration/client_test.go +++ b/test/integration/client_test.go @@ -31,7 +31,6 @@ import ( "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/version" @@ -55,7 +54,7 @@ func TestClient(t *testing.T) { t.Errorf("expected %#v, got %#v", e, a) } - pods, err := client.Pods(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + pods, err := client.Pods(ns).List(unversioned.ListOptions{}) if err != nil { t.Fatalf("unexpected error: %v", err) } @@ -93,7 +92,7 @@ func TestClient(t *testing.T) { } // pod is shown, but not scheduled - pods, err = client.Pods(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + pods, err = client.Pods(ns).List(unversioned.ListOptions{}) if err != nil { t.Fatalf("unexpected error: %v", err) } diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go index 3eedbda12a2..cb903a94f3b 100644 --- a/test/integration/framework/master_utils.go +++ b/test/integration/framework/master_utils.go @@ -39,7 +39,6 @@ import ( "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/kubectl" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/master" "k8s.io/kubernetes/pkg/storage/etcd/etcdtest" "k8s.io/kubernetes/plugin/pkg/admission/admit" @@ -256,7 +255,8 @@ func StartPods(numPods int, host string, restClient *client.Client) error { glog.Infof("StartPods took %v with numPods %d", time.Since(start), numPods) }() hostField := fields.OneTermEqualSelector(client.PodHost, host) - pods, err := restClient.Pods(TestNS).List(labels.Everything(), hostField, unversioned.ListOptions{}) + options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{hostField}} + pods, err := restClient.Pods(TestNS).List(options) if err != nil || len(pods.Items) == numPods { return err } diff --git a/test/integration/metrics_test.go b/test/integration/metrics_test.go index 86826b8f1d1..fb58485b8c8 100644 --- a/test/integration/metrics_test.go +++ b/test/integration/metrics_test.go @@ -29,8 +29,6 @@ import ( "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/test/integration/framework" "github.com/golang/glog" @@ -111,7 +109,7 @@ func TestApiserverMetrics(t *testing.T) { // Make a request to the apiserver to ensure there's at least one data point // for the metrics we're expecting -- otherwise, they won't be exported. client := client.NewOrDie(&client.Config{Host: s.URL, GroupVersion: testapi.Default.GroupVersion()}) - if _, err := client.Pods(api.NamespaceDefault).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}); err != nil { + if _, err := client.Pods(api.NamespaceDefault).List(unversioned.ListOptions{}); err != nil { t.Fatalf("unexpected error getting pods: %v", err) } diff --git a/test/integration/service_account_test.go b/test/integration/service_account_test.go index f61914972f1..9c3aaa9b67e 100644 --- a/test/integration/service_account_test.go +++ b/test/integration/service_account_test.go @@ -41,8 +41,6 @@ import ( "k8s.io/kubernetes/pkg/auth/user" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/controller/serviceaccount" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/master" "k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/util/wait" @@ -173,7 +171,7 @@ func TestServiceAccountTokenAutoCreate(t *testing.T) { tokensToCleanup := sets.NewString(token1Name, token2Name, token3Name) err = wait.Poll(time.Second, 10*time.Second, func() (bool, error) { // Get all secrets in the namespace - secrets, err := c.Secrets(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + secrets, err := c.Secrets(ns).List(unversioned.ListOptions{}) // Retrieval errors should fail if err != nil { return false, err @@ -514,11 +512,11 @@ func doServiceAccountAPIRequests(t *testing.T, c *client.Client, ns string, auth readOps := []testOperation{ func() error { - _, err := c.Secrets(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + _, err := c.Secrets(ns).List(unversioned.ListOptions{}) return err }, func() error { - _, err := c.Pods(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + _, err := c.Pods(ns).List(unversioned.ListOptions{}) return err }, } diff --git a/test/soak/cauldron/cauldron.go b/test/soak/cauldron/cauldron.go index f71a483e694..6a0658e7cb4 100644 --- a/test/soak/cauldron/cauldron.go +++ b/test/soak/cauldron/cauldron.go @@ -34,8 +34,6 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/intstr" ) @@ -69,7 +67,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(), fields.Everything(), unversioned.ListOptions{}) + nodes, err = c.Nodes().List(unversioned.ListOptions{}) if err == nil { break } diff --git a/test/soak/serve_hostnames/serve_hostnames.go b/test/soak/serve_hostnames/serve_hostnames.go index 91b619fbdf3..60ea3814d0f 100644 --- a/test/soak/serve_hostnames/serve_hostnames.go +++ b/test/soak/serve_hostnames/serve_hostnames.go @@ -35,8 +35,6 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/intstr" ) @@ -89,7 +87,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(), fields.Everything(), unversioned.ListOptions{}) + nodes, err = c.Nodes().List(unversioned.ListOptions{}) if err == nil { break }