From d2dfc912e607abd5ef77c2e82710079d4998ef6f Mon Sep 17 00:00:00 2001 From: Wojciech Tyczynski Date: Thu, 26 Nov 2015 16:27:45 +0100 Subject: [PATCH] Simplify Watch() signature in clients. --- .../mesos/pkg/service/endpoints_controller.go | 4 ++-- pkg/client/unversioned/daemon_sets.go | 6 ++--- pkg/client/unversioned/deployment.go | 6 ++--- pkg/client/unversioned/deployment_test.go | 2 +- pkg/client/unversioned/endpoints.go | 6 ++--- pkg/client/unversioned/events.go | 6 ++--- .../unversioned/horizontalpodautoscaler.go | 6 ++--- .../horizontalpodautoscaler_test.go | 2 +- pkg/client/unversioned/ingress.go | 6 ++--- pkg/client/unversioned/jobs.go | 6 ++--- pkg/client/unversioned/limit_ranges.go | 6 ++--- pkg/client/unversioned/limit_ranges_test.go | 2 +- pkg/client/unversioned/namespaces.go | 6 ++--- pkg/client/unversioned/namespaces_test.go | 2 +- pkg/client/unversioned/nodes.go | 6 ++--- .../unversioned/persistentvolume_test.go | 2 +- .../unversioned/persistentvolumeclaim.go | 6 ++--- .../unversioned/persistentvolumeclaim_test.go | 2 +- pkg/client/unversioned/persistentvolumes.go | 6 ++--- pkg/client/unversioned/pod_templates.go | 6 ++--- pkg/client/unversioned/pod_templates_test.go | 2 +- pkg/client/unversioned/pods.go | 6 ++--- .../unversioned/replication_controllers.go | 6 ++--- pkg/client/unversioned/resource_quotas.go | 6 ++--- .../unversioned/resource_quotas_test.go | 2 +- pkg/client/unversioned/secrets.go | 6 ++--- pkg/client/unversioned/service_accounts.go | 6 ++--- pkg/client/unversioned/services.go | 6 ++--- pkg/client/unversioned/testclient/actions.go | 24 +++++++++++++++---- .../testclient/fake_daemon_sets.go | 4 ++-- .../testclient/fake_deployments.go | 4 ++-- .../unversioned/testclient/fake_endpoints.go | 4 ++-- .../unversioned/testclient/fake_events.go | 6 ++--- .../fake_horizontal_pod_autoscalers.go | 4 ++-- .../unversioned/testclient/fake_ingress.go | 4 ++-- .../unversioned/testclient/fake_jobs.go | 4 ++-- .../testclient/fake_limit_ranges.go | 4 ++-- .../unversioned/testclient/fake_namespaces.go | 4 ++-- .../unversioned/testclient/fake_nodes.go | 4 ++-- .../fake_persistent_volume_claims.go | 4 ++-- .../testclient/fake_persistent_volumes.go | 4 ++-- .../testclient/fake_pod_templates.go | 4 ++-- .../unversioned/testclient/fake_pods.go | 4 ++-- .../fake_replication_controllers.go | 4 ++-- .../testclient/fake_resource_quotas.go | 4 ++-- .../unversioned/testclient/fake_secrets.go | 4 ++-- .../testclient/fake_service_accounts.go | 4 ++-- .../unversioned/testclient/fake_services.go | 4 ++-- pkg/controller/daemon/controller.go | 6 ++--- .../endpoint/endpoints_controller.go | 4 ++-- pkg/controller/gc/gc_controller.go | 3 ++- pkg/controller/job/controller.go | 4 ++-- .../namespace/namespace_controller.go | 2 +- pkg/controller/node/nodecontroller.go | 4 ++-- pkg/controller/node/nodecontroller_test.go | 2 +- ...ersistentvolume_claim_binder_controller.go | 4 ++-- .../persistentvolume_recycler_controller.go | 2 +- .../replication/replication_controller.go | 4 ++-- .../serviceaccounts_controller.go | 5 ++-- .../serviceaccount/tokens_controller.go | 5 ++-- pkg/kubelet/kubelet.go | 5 ++-- pkg/volume/util.go | 3 ++- plugin/pkg/admission/limitranger/admission.go | 2 +- .../namespace/autoprovision/admission.go | 2 +- .../admission/namespace/exists/admission.go | 2 +- .../namespace/lifecycle/admission.go | 2 +- .../pkg/admission/resourcequota/admission.go | 2 +- .../pkg/admission/serviceaccount/admission.go | 5 ++-- test/e2e/daemon_restart.go | 3 ++- test/e2e/density.go | 5 ++-- test/e2e/framework.go | 10 ++++---- test/e2e/latency.go | 3 ++- test/e2e/pods.go | 8 ++++--- test/e2e/service_latency.go | 2 +- test/e2e/util.go | 4 +++- test/integration/client_test.go | 10 ++++---- test/integration/persistent_volumes_test.go | 6 ++--- 77 files changed, 172 insertions(+), 183 deletions(-) diff --git a/contrib/mesos/pkg/service/endpoints_controller.go b/contrib/mesos/pkg/service/endpoints_controller.go index ac961e16141..ebdf74b2654 100644 --- a/contrib/mesos/pkg/service/endpoints_controller.go +++ b/contrib/mesos/pkg/service/endpoints_controller.go @@ -63,7 +63,7 @@ func NewEndpointController(client *client.Client) *endpointController { return e.client.Services(api.NamespaceAll).List(labels.Everything(), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return e.client.Services(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), options) + return e.client.Services(api.NamespaceAll).Watch(options) }, }, &api.Service{}, @@ -83,7 +83,7 @@ func NewEndpointController(client *client.Client) *endpointController { return e.client.Pods(api.NamespaceAll).List(labels.Everything(), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return e.client.Pods(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), options) + return e.client.Pods(api.NamespaceAll).Watch(options) }, }, &api.Pod{}, diff --git a/pkg/client/unversioned/daemon_sets.go b/pkg/client/unversioned/daemon_sets.go index 9e319a75cd6..0cb4d418e76 100644 --- a/pkg/client/unversioned/daemon_sets.go +++ b/pkg/client/unversioned/daemon_sets.go @@ -37,7 +37,7 @@ type DaemonSetInterface interface { Update(ctrl *extensions.DaemonSet) (*extensions.DaemonSet, error) UpdateStatus(ctrl *extensions.DaemonSet) (*extensions.DaemonSet, error) Delete(name string) error - Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts unversioned.ListOptions) (watch.Interface, error) } // daemonSets implements DaemonsSetsNamespacer interface @@ -93,13 +93,11 @@ func (c *daemonSets) Delete(name string) error { } // Watch returns a watch.Interface that watches the requested daemon sets. -func (c *daemonSets) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { +func (c *daemonSets) Watch(opts unversioned.ListOptions) (watch.Interface, error) { return c.r.Get(). Prefix("watch"). Namespace(c.ns). Resource("daemonsets"). VersionedParams(&opts, api.Scheme). - LabelsSelectorParam(label). - FieldsSelectorParam(field). Watch() } diff --git a/pkg/client/unversioned/deployment.go b/pkg/client/unversioned/deployment.go index 9a15aa71e8b..9fd77644097 100644 --- a/pkg/client/unversioned/deployment.go +++ b/pkg/client/unversioned/deployment.go @@ -38,7 +38,7 @@ type DeploymentInterface interface { Create(*extensions.Deployment) (*extensions.Deployment, error) Update(*extensions.Deployment) (*extensions.Deployment, error) UpdateStatus(*extensions.Deployment) (*extensions.Deployment, error) - Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts unversioned.ListOptions) (watch.Interface, error) } // deployments implements DeploymentInterface @@ -102,13 +102,11 @@ func (c *deployments) UpdateStatus(deployment *extensions.Deployment) (result *e } // Watch returns a watch.Interface that watches the requested deployments. -func (c *deployments) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { +func (c *deployments) Watch(opts unversioned.ListOptions) (watch.Interface, error) { return c.client.Get(). Prefix("watch"). Namespace(c.ns). Resource("deployments"). VersionedParams(&opts, api.Scheme). - LabelsSelectorParam(label). - FieldsSelectorParam(field). Watch() } diff --git a/pkg/client/unversioned/deployment_test.go b/pkg/client/unversioned/deployment_test.go index 5d63f8d9c83..0902cb5f17b 100644 --- a/pkg/client/unversioned/deployment_test.go +++ b/pkg/client/unversioned/deployment_test.go @@ -169,6 +169,6 @@ func TestDeploymentWatch(t *testing.T) { }, Response: Response{StatusCode: 200}, } - _, err := c.Setup(t).Deployments(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + _, err := c.Setup(t).Deployments(api.NamespaceAll).Watch(unversioned.ListOptions{}) c.Validate(t, nil, err) } diff --git a/pkg/client/unversioned/endpoints.go b/pkg/client/unversioned/endpoints.go index 776fe52a6c0..db26b461888 100644 --- a/pkg/client/unversioned/endpoints.go +++ b/pkg/client/unversioned/endpoints.go @@ -38,7 +38,7 @@ type EndpointsInterface interface { Get(name string) (*api.Endpoints, error) Delete(name string) error Update(endpoints *api.Endpoints) (*api.Endpoints, error) - Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts unversioned.ListOptions) (watch.Interface, error) } // endpoints implements EndpointsInterface @@ -85,14 +85,12 @@ func (c *endpoints) Delete(name string) error { } // Watch returns a watch.Interface that watches the requested endpoints for a service. -func (c *endpoints) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { +func (c *endpoints) Watch(opts unversioned.ListOptions) (watch.Interface, error) { return c.r.Get(). Prefix("watch"). Namespace(c.ns). Resource("endpoints"). VersionedParams(&opts, api.Scheme). - LabelsSelectorParam(label). - FieldsSelectorParam(field). Watch() } diff --git a/pkg/client/unversioned/events.go b/pkg/client/unversioned/events.go index 8d52d093c30..72e0ec81fde 100644 --- a/pkg/client/unversioned/events.go +++ b/pkg/client/unversioned/events.go @@ -39,7 +39,7 @@ type EventInterface interface { Patch(event *api.Event, data []byte) (*api.Event, error) List(label labels.Selector, field fields.Selector) (*api.EventList, error) Get(name string) (*api.Event, error) - Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts unversioned.ListOptions) (watch.Interface, error) // Search finds events about the specified object Search(objOrRef runtime.Object) (*api.EventList, error) Delete(name string) error @@ -142,14 +142,12 @@ func (e *events) Get(name string) (*api.Event, error) { } // Watch starts watching for events matching the given selectors. -func (e *events) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { +func (e *events) Watch(opts unversioned.ListOptions) (watch.Interface, error) { return e.client.Get(). Prefix("watch"). NamespaceIfScoped(e.namespace, len(e.namespace) > 0). Resource("events"). VersionedParams(&opts, api.Scheme). - LabelsSelectorParam(label). - FieldsSelectorParam(field). Watch() } diff --git a/pkg/client/unversioned/horizontalpodautoscaler.go b/pkg/client/unversioned/horizontalpodautoscaler.go index 914abfbaebb..1de0b7f71ef 100644 --- a/pkg/client/unversioned/horizontalpodautoscaler.go +++ b/pkg/client/unversioned/horizontalpodautoscaler.go @@ -38,7 +38,7 @@ type HorizontalPodAutoscalerInterface interface { Create(horizontalPodAutoscaler *extensions.HorizontalPodAutoscaler) (*extensions.HorizontalPodAutoscaler, error) Update(horizontalPodAutoscaler *extensions.HorizontalPodAutoscaler) (*extensions.HorizontalPodAutoscaler, error) UpdateStatus(horizontalPodAutoscaler *extensions.HorizontalPodAutoscaler) (*extensions.HorizontalPodAutoscaler, error) - Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts unversioned.ListOptions) (watch.Interface, error) } // horizontalPodAutoscalers implements HorizontalPodAutoscalersNamespacer interface @@ -104,13 +104,11 @@ func (c *horizontalPodAutoscalers) UpdateStatus(horizontalPodAutoscaler *extensi } // Watch returns a watch.Interface that watches the requested horizontalPodAutoscalers. -func (c *horizontalPodAutoscalers) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { +func (c *horizontalPodAutoscalers) Watch(opts unversioned.ListOptions) (watch.Interface, error) { return c.client.Get(). Prefix("watch"). Namespace(c.ns). Resource("horizontalPodAutoscalers"). VersionedParams(&opts, api.Scheme). - LabelsSelectorParam(label). - FieldsSelectorParam(field). Watch() } diff --git a/pkg/client/unversioned/horizontalpodautoscaler_test.go b/pkg/client/unversioned/horizontalpodautoscaler_test.go index 874a4f6157e..5b1c423565c 100644 --- a/pkg/client/unversioned/horizontalpodautoscaler_test.go +++ b/pkg/client/unversioned/horizontalpodautoscaler_test.go @@ -156,6 +156,6 @@ func TestHorizontalPodAutoscalerWatch(t *testing.T) { Query: url.Values{"resourceVersion": []string{}}}, Response: Response{StatusCode: 200}, } - _, err := c.Setup(t).Extensions().HorizontalPodAutoscalers(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + _, err := c.Setup(t).Extensions().HorizontalPodAutoscalers(api.NamespaceAll).Watch(unversioned.ListOptions{}) c.Validate(t, nil, err) } diff --git a/pkg/client/unversioned/ingress.go b/pkg/client/unversioned/ingress.go index 627d6a8a242..0b58eeb983e 100644 --- a/pkg/client/unversioned/ingress.go +++ b/pkg/client/unversioned/ingress.go @@ -37,7 +37,7 @@ type IngressInterface interface { Create(ingress *extensions.Ingress) (*extensions.Ingress, error) Update(ingress *extensions.Ingress) (*extensions.Ingress, error) Delete(name string, options *api.DeleteOptions) error - Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts unversioned.ListOptions) (watch.Interface, error) UpdateStatus(ingress *extensions.Ingress) (*extensions.Ingress, error) } @@ -94,14 +94,12 @@ func (c *ingress) Delete(name string, options *api.DeleteOptions) (err error) { } // Watch returns a watch.Interface that watches the requested ingress. -func (c *ingress) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { +func (c *ingress) Watch(opts unversioned.ListOptions) (watch.Interface, error) { return c.r.Get(). Prefix("watch"). Namespace(c.ns). Resource("ingresses"). VersionedParams(&opts, api.Scheme). - LabelsSelectorParam(label). - FieldsSelectorParam(field). Watch() } diff --git a/pkg/client/unversioned/jobs.go b/pkg/client/unversioned/jobs.go index c59208dbcf1..dd8fdf4bdaa 100644 --- a/pkg/client/unversioned/jobs.go +++ b/pkg/client/unversioned/jobs.go @@ -38,7 +38,7 @@ type JobInterface interface { Create(job *extensions.Job) (*extensions.Job, error) Update(job *extensions.Job) (*extensions.Job, error) Delete(name string, options *api.DeleteOptions) error - Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts unversioned.ListOptions) (watch.Interface, error) UpdateStatus(job *extensions.Job) (*extensions.Job, error) } @@ -98,14 +98,12 @@ func (c *jobs) Delete(name string, options *api.DeleteOptions) (err error) { } // Watch returns a watch.Interface that watches the requested jobs. -func (c *jobs) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { +func (c *jobs) Watch(opts unversioned.ListOptions) (watch.Interface, error) { return c.r.Get(). Prefix("watch"). Namespace(c.ns). Resource("jobs"). VersionedParams(&opts, api.Scheme). - LabelsSelectorParam(label). - FieldsSelectorParam(field). Watch() } diff --git a/pkg/client/unversioned/limit_ranges.go b/pkg/client/unversioned/limit_ranges.go index c28f9d47584..26bf2bf692e 100644 --- a/pkg/client/unversioned/limit_ranges.go +++ b/pkg/client/unversioned/limit_ranges.go @@ -38,7 +38,7 @@ type LimitRangeInterface interface { Delete(name string) error Create(limitRange *api.LimitRange) (*api.LimitRange, error) Update(limitRange *api.LimitRange) (*api.LimitRange, error) - Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts unversioned.ListOptions) (watch.Interface, error) } // limitRanges implements LimitRangesNamespacer interface @@ -93,13 +93,11 @@ func (c *limitRanges) Update(limitRange *api.LimitRange) (result *api.LimitRange } // Watch returns a watch.Interface that watches the requested resource -func (c *limitRanges) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { +func (c *limitRanges) Watch(opts unversioned.ListOptions) (watch.Interface, error) { return c.r.Get(). Prefix("watch"). Namespace(c.ns). Resource("limitRanges"). VersionedParams(&opts, api.Scheme). - LabelsSelectorParam(label). - FieldsSelectorParam(field). Watch() } diff --git a/pkg/client/unversioned/limit_ranges_test.go b/pkg/client/unversioned/limit_ranges_test.go index 63dd8117225..cfc09c5e2f1 100644 --- a/pkg/client/unversioned/limit_ranges_test.go +++ b/pkg/client/unversioned/limit_ranges_test.go @@ -208,6 +208,6 @@ func TestLimitRangeWatch(t *testing.T) { Query: url.Values{"resourceVersion": []string{}}}, Response: Response{StatusCode: 200}, } - _, err := c.Setup(t).LimitRanges(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + _, err := c.Setup(t).LimitRanges(api.NamespaceAll).Watch(unversioned.ListOptions{}) c.Validate(t, nil, err) } diff --git a/pkg/client/unversioned/namespaces.go b/pkg/client/unversioned/namespaces.go index 8fda663900d..289f5b5202f 100644 --- a/pkg/client/unversioned/namespaces.go +++ b/pkg/client/unversioned/namespaces.go @@ -36,7 +36,7 @@ type NamespaceInterface interface { List(label labels.Selector, field fields.Selector) (*api.NamespaceList, error) Delete(name string) error Update(item *api.Namespace) (*api.Namespace, error) - Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts unversioned.ListOptions) (watch.Interface, error) Finalize(item *api.Namespace) (*api.Namespace, error) Status(item *api.Namespace) (*api.Namespace, error) } @@ -115,12 +115,10 @@ func (c *namespaces) Delete(name string) error { } // Watch returns a watch.Interface that watches the requested namespaces. -func (c *namespaces) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { +func (c *namespaces) Watch(opts unversioned.ListOptions) (watch.Interface, error) { return c.r.Get(). Prefix("watch"). Resource("namespaces"). VersionedParams(&opts, api.Scheme). - LabelsSelectorParam(label). - FieldsSelectorParam(field). Watch() } diff --git a/pkg/client/unversioned/namespaces_test.go b/pkg/client/unversioned/namespaces_test.go index e3be7093cbe..55aa758dfa4 100644 --- a/pkg/client/unversioned/namespaces_test.go +++ b/pkg/client/unversioned/namespaces_test.go @@ -175,6 +175,6 @@ func TestNamespaceWatch(t *testing.T) { Query: url.Values{"resourceVersion": []string{}}}, Response: Response{StatusCode: 200}, } - _, err := c.Setup(t).Namespaces().Watch(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + _, err := c.Setup(t).Namespaces().Watch(unversioned.ListOptions{}) c.Validate(t, nil, err) } diff --git a/pkg/client/unversioned/nodes.go b/pkg/client/unversioned/nodes.go index fea00dcd772..9e8a62d7441 100644 --- a/pkg/client/unversioned/nodes.go +++ b/pkg/client/unversioned/nodes.go @@ -37,7 +37,7 @@ type NodeInterface interface { Delete(name string) error Update(*api.Node) (*api.Node, error) UpdateStatus(*api.Node) (*api.Node, error) - Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts unversioned.ListOptions) (watch.Interface, error) } // nodes implements NodesInterface @@ -103,13 +103,11 @@ func (c *nodes) UpdateStatus(node *api.Node) (*api.Node, error) { } // Watch returns a watch.Interface that watches the requested nodes. -func (c *nodes) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { +func (c *nodes) Watch(opts unversioned.ListOptions) (watch.Interface, error) { return c.r.Get(). Prefix("watch"). Namespace(api.NamespaceAll). Resource(c.resourceName()). VersionedParams(&opts, api.Scheme). - LabelsSelectorParam(label). - FieldsSelectorParam(field). Watch() } diff --git a/pkg/client/unversioned/persistentvolume_test.go b/pkg/client/unversioned/persistentvolume_test.go index ef0552911ca..265ad0fe253 100644 --- a/pkg/client/unversioned/persistentvolume_test.go +++ b/pkg/client/unversioned/persistentvolume_test.go @@ -181,6 +181,6 @@ func TestPersistentVolumeWatch(t *testing.T) { Query: url.Values{"resourceVersion": []string{}}}, Response: Response{StatusCode: 200}, } - _, err := c.Setup(t).PersistentVolumes().Watch(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + _, err := c.Setup(t).PersistentVolumes().Watch(unversioned.ListOptions{}) c.Validate(t, nil, err) } diff --git a/pkg/client/unversioned/persistentvolumeclaim.go b/pkg/client/unversioned/persistentvolumeclaim.go index 668899021a0..f06bf48083a 100644 --- a/pkg/client/unversioned/persistentvolumeclaim.go +++ b/pkg/client/unversioned/persistentvolumeclaim.go @@ -39,7 +39,7 @@ type PersistentVolumeClaimInterface interface { Update(claim *api.PersistentVolumeClaim) (*api.PersistentVolumeClaim, error) UpdateStatus(claim *api.PersistentVolumeClaim) (*api.PersistentVolumeClaim, error) Delete(name string) error - Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts unversioned.ListOptions) (watch.Interface, error) } // persistentVolumeClaims implements PersistentVolumeClaimsNamespacer interface @@ -99,13 +99,11 @@ func (c *persistentVolumeClaims) Delete(name string) error { return c.client.Delete().Namespace(c.namespace).Resource("persistentVolumeClaims").Name(name).Do().Error() } -func (c *persistentVolumeClaims) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { +func (c *persistentVolumeClaims) Watch(opts unversioned.ListOptions) (watch.Interface, error) { return c.client.Get(). Prefix("watch"). Namespace(c.namespace). Resource("persistentVolumeClaims"). VersionedParams(&opts, api.Scheme). - LabelsSelectorParam(label). - FieldsSelectorParam(field). Watch() } diff --git a/pkg/client/unversioned/persistentvolumeclaim_test.go b/pkg/client/unversioned/persistentvolumeclaim_test.go index 1a3e4b1176a..ba4e0903405 100644 --- a/pkg/client/unversioned/persistentvolumeclaim_test.go +++ b/pkg/client/unversioned/persistentvolumeclaim_test.go @@ -198,6 +198,6 @@ func TestPersistentVolumeClaimWatch(t *testing.T) { Query: url.Values{"resourceVersion": []string{}}}, Response: Response{StatusCode: 200}, } - _, err := c.Setup(t).PersistentVolumeClaims(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + _, err := c.Setup(t).PersistentVolumeClaims(api.NamespaceAll).Watch(unversioned.ListOptions{}) c.Validate(t, nil, err) } diff --git a/pkg/client/unversioned/persistentvolumes.go b/pkg/client/unversioned/persistentvolumes.go index ea3a3f48f70..580d6dd3387 100644 --- a/pkg/client/unversioned/persistentvolumes.go +++ b/pkg/client/unversioned/persistentvolumes.go @@ -38,7 +38,7 @@ type PersistentVolumeInterface interface { Update(volume *api.PersistentVolume) (*api.PersistentVolume, error) UpdateStatus(persistentVolume *api.PersistentVolume) (*api.PersistentVolume, error) Delete(name string) error - Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts unversioned.ListOptions) (watch.Interface, error) } // persistentVolumes implements PersistentVolumesInterface @@ -94,12 +94,10 @@ func (c *persistentVolumes) Delete(name string) error { return c.client.Delete().Resource("persistentVolumes").Name(name).Do().Error() } -func (c *persistentVolumes) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { +func (c *persistentVolumes) Watch(opts unversioned.ListOptions) (watch.Interface, error) { return c.client.Get(). Prefix("watch"). Resource("persistentVolumes"). VersionedParams(&opts, api.Scheme). - LabelsSelectorParam(label). - FieldsSelectorParam(field). Watch() } diff --git a/pkg/client/unversioned/pod_templates.go b/pkg/client/unversioned/pod_templates.go index d6a6c289764..05367075055 100644 --- a/pkg/client/unversioned/pod_templates.go +++ b/pkg/client/unversioned/pod_templates.go @@ -36,7 +36,7 @@ type PodTemplateInterface interface { Delete(name string, options *api.DeleteOptions) error Create(podTemplate *api.PodTemplate) (*api.PodTemplate, error) Update(podTemplate *api.PodTemplate) (*api.PodTemplate, error) - Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts unversioned.ListOptions) (watch.Interface, error) } // podTemplates implements PodTemplatesNamespacer interface @@ -95,13 +95,11 @@ func (c *podTemplates) Update(podTemplate *api.PodTemplate) (result *api.PodTemp } // Watch returns a watch.Interface that watches the requested podTemplates. -func (c *podTemplates) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { +func (c *podTemplates) Watch(opts unversioned.ListOptions) (watch.Interface, error) { return c.r.Get(). Prefix("watch"). Namespace(c.ns). Resource("podTemplates"). VersionedParams(&opts, api.Scheme). - LabelsSelectorParam(label). - FieldsSelectorParam(field). Watch() } diff --git a/pkg/client/unversioned/pod_templates_test.go b/pkg/client/unversioned/pod_templates_test.go index 633188909c8..0b076337bb1 100644 --- a/pkg/client/unversioned/pod_templates_test.go +++ b/pkg/client/unversioned/pod_templates_test.go @@ -138,6 +138,6 @@ func TestPodTemplateWatch(t *testing.T) { Query: url.Values{"resourceVersion": []string{}}}, Response: Response{StatusCode: 200}, } - _, err := c.Setup(t).PodTemplates(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + _, err := c.Setup(t).PodTemplates(api.NamespaceAll).Watch(unversioned.ListOptions{}) c.Validate(t, nil, err) } diff --git a/pkg/client/unversioned/pods.go b/pkg/client/unversioned/pods.go index 32de8f27ff4..9b9052f58e7 100644 --- a/pkg/client/unversioned/pods.go +++ b/pkg/client/unversioned/pods.go @@ -36,7 +36,7 @@ type PodInterface interface { Delete(name string, options *api.DeleteOptions) error Create(pod *api.Pod) (*api.Pod, error) Update(pod *api.Pod) (*api.Pod, error) - Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts unversioned.ListOptions) (watch.Interface, error) Bind(binding *api.Binding) error UpdateStatus(pod *api.Pod) (*api.Pod, error) GetLogs(name string, opts *api.PodLogOptions) *Request @@ -98,14 +98,12 @@ func (c *pods) Update(pod *api.Pod) (result *api.Pod, err error) { } // Watch returns a watch.Interface that watches the requested pods. -func (c *pods) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { +func (c *pods) Watch(opts unversioned.ListOptions) (watch.Interface, error) { return c.r.Get(). Prefix("watch"). Namespace(c.ns). Resource("pods"). VersionedParams(&opts, api.Scheme). - LabelsSelectorParam(label). - FieldsSelectorParam(field). Watch() } diff --git a/pkg/client/unversioned/replication_controllers.go b/pkg/client/unversioned/replication_controllers.go index 37c63be24fa..7e519896a7b 100644 --- a/pkg/client/unversioned/replication_controllers.go +++ b/pkg/client/unversioned/replication_controllers.go @@ -37,7 +37,7 @@ type ReplicationControllerInterface interface { Update(ctrl *api.ReplicationController) (*api.ReplicationController, error) UpdateStatus(ctrl *api.ReplicationController) (*api.ReplicationController, error) Delete(name string) error - Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts unversioned.ListOptions) (watch.Interface, error) } // replicationControllers implements ReplicationControllersNamespacer interface @@ -92,13 +92,11 @@ func (c *replicationControllers) Delete(name string) error { } // Watch returns a watch.Interface that watches the requested controllers. -func (c *replicationControllers) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { +func (c *replicationControllers) Watch(opts unversioned.ListOptions) (watch.Interface, error) { return c.r.Get(). Prefix("watch"). Namespace(c.ns). Resource("replicationControllers"). VersionedParams(&opts, api.Scheme). - LabelsSelectorParam(label). - FieldsSelectorParam(field). Watch() } diff --git a/pkg/client/unversioned/resource_quotas.go b/pkg/client/unversioned/resource_quotas.go index 0f6cf3e0f54..7372458e2cc 100644 --- a/pkg/client/unversioned/resource_quotas.go +++ b/pkg/client/unversioned/resource_quotas.go @@ -37,7 +37,7 @@ type ResourceQuotaInterface interface { Create(resourceQuota *api.ResourceQuota) (*api.ResourceQuota, error) Update(resourceQuota *api.ResourceQuota) (*api.ResourceQuota, error) UpdateStatus(resourceQuota *api.ResourceQuota) (*api.ResourceQuota, error) - Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts unversioned.ListOptions) (watch.Interface, error) } // resourceQuotas implements ResourceQuotasNamespacer interface @@ -95,13 +95,11 @@ func (c *resourceQuotas) UpdateStatus(resourceQuota *api.ResourceQuota) (result } // Watch returns a watch.Interface that watches the requested resource -func (c *resourceQuotas) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { +func (c *resourceQuotas) Watch(opts unversioned.ListOptions) (watch.Interface, error) { return c.r.Get(). Prefix("watch"). Namespace(c.ns). Resource("resourceQuotas"). VersionedParams(&opts, api.Scheme). - LabelsSelectorParam(label). - FieldsSelectorParam(field). Watch() } diff --git a/pkg/client/unversioned/resource_quotas_test.go b/pkg/client/unversioned/resource_quotas_test.go index c1af6204f2a..93335e4aac9 100644 --- a/pkg/client/unversioned/resource_quotas_test.go +++ b/pkg/client/unversioned/resource_quotas_test.go @@ -194,6 +194,6 @@ func TestResourceQuotaWatch(t *testing.T) { Query: url.Values{"resourceVersion": []string{}}}, Response: Response{StatusCode: 200}, } - _, err := c.Setup(t).ResourceQuotas(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + _, err := c.Setup(t).ResourceQuotas(api.NamespaceAll).Watch(unversioned.ListOptions{}) c.Validate(t, nil, err) } diff --git a/pkg/client/unversioned/secrets.go b/pkg/client/unversioned/secrets.go index e52c0a0b7ed..56f5242575c 100644 --- a/pkg/client/unversioned/secrets.go +++ b/pkg/client/unversioned/secrets.go @@ -34,7 +34,7 @@ type SecretsInterface interface { Delete(name string) error List(label labels.Selector, field fields.Selector) (*api.SecretList, error) Get(name string) (*api.Secret, error) - Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts unversioned.ListOptions) (watch.Interface, error) } // events implements Secrets interface @@ -92,14 +92,12 @@ func (s *secrets) Get(name string) (*api.Secret, error) { } // Watch starts watching for secrets matching the given selectors. -func (s *secrets) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { +func (s *secrets) Watch(opts unversioned.ListOptions) (watch.Interface, error) { return s.client.Get(). Prefix("watch"). Namespace(s.namespace). Resource("secrets"). VersionedParams(&opts, api.Scheme). - LabelsSelectorParam(label). - FieldsSelectorParam(field). Watch() } diff --git a/pkg/client/unversioned/service_accounts.go b/pkg/client/unversioned/service_accounts.go index e10700f79f9..01e3d3c9135 100644 --- a/pkg/client/unversioned/service_accounts.go +++ b/pkg/client/unversioned/service_accounts.go @@ -34,7 +34,7 @@ type ServiceAccountsInterface interface { Delete(name string) error List(label labels.Selector, field fields.Selector) (*api.ServiceAccountList, error) Get(name string) (*api.ServiceAccount, error) - Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts unversioned.ListOptions) (watch.Interface, error) } // serviceAccounts implements ServiceAccounts interface @@ -92,14 +92,12 @@ func (s *serviceAccounts) Get(name string) (*api.ServiceAccount, error) { } // Watch starts watching for serviceAccounts matching the given selectors. -func (s *serviceAccounts) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { +func (s *serviceAccounts) Watch(opts unversioned.ListOptions) (watch.Interface, error) { return s.client.Get(). Prefix("watch"). Namespace(s.namespace). Resource("serviceAccounts"). VersionedParams(&opts, api.Scheme). - LabelsSelectorParam(label). - FieldsSelectorParam(field). Watch() } diff --git a/pkg/client/unversioned/services.go b/pkg/client/unversioned/services.go index 23d8b5fd491..a3c941547c3 100644 --- a/pkg/client/unversioned/services.go +++ b/pkg/client/unversioned/services.go @@ -37,7 +37,7 @@ type ServiceInterface interface { Create(srv *api.Service) (*api.Service, error) Update(srv *api.Service) (*api.Service, error) Delete(name string) error - Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts unversioned.ListOptions) (watch.Interface, error) ProxyGet(scheme, name, port, path string, params map[string]string) ResponseWrapper } @@ -92,14 +92,12 @@ func (c *services) Delete(name string) error { } // Watch returns a watch.Interface that watches the requested services. -func (c *services) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { +func (c *services) Watch(opts unversioned.ListOptions) (watch.Interface, error) { return c.r.Get(). Prefix("watch"). Namespace(c.ns). Resource("services"). VersionedParams(&opts, api.Scheme). - LabelsSelectorParam(label). - FieldsSelectorParam(field). Watch() } diff --git a/pkg/client/unversioned/testclient/actions.go b/pkg/client/unversioned/testclient/actions.go index 38ef9098930..546780d724b 100644 --- a/pkg/client/unversioned/testclient/actions.go +++ b/pkg/client/unversioned/testclient/actions.go @@ -150,21 +150,37 @@ func NewDeleteAction(resource, namespace, name string) DeleteActionImpl { return action } -func NewRootWatchAction(resource string, label labels.Selector, field fields.Selector, opts unversioned.ListOptions) WatchActionImpl { +func NewRootWatchAction(resource string, opts unversioned.ListOptions) WatchActionImpl { action := WatchActionImpl{} action.Verb = "watch" action.Resource = resource - action.WatchRestrictions = WatchRestrictions{label, field, opts.ResourceVersion} + labelSelector := opts.LabelSelector.Selector + if labelSelector == nil { + labelSelector = labels.Everything() + } + fieldSelector := opts.FieldSelector.Selector + if fieldSelector == nil { + fieldSelector = fields.Everything() + } + action.WatchRestrictions = WatchRestrictions{labelSelector, fieldSelector, opts.ResourceVersion} return action } -func NewWatchAction(resource, namespace string, label labels.Selector, field fields.Selector, opts unversioned.ListOptions) WatchActionImpl { +func NewWatchAction(resource, namespace string, opts unversioned.ListOptions) WatchActionImpl { action := WatchActionImpl{} action.Verb = "watch" action.Resource = resource action.Namespace = namespace - action.WatchRestrictions = WatchRestrictions{label, field, opts.ResourceVersion} + labelSelector := opts.LabelSelector.Selector + if labelSelector == nil { + labelSelector = labels.Everything() + } + fieldSelector := opts.FieldSelector.Selector + if fieldSelector == nil { + fieldSelector = fields.Everything() + } + action.WatchRestrictions = WatchRestrictions{labelSelector, fieldSelector, opts.ResourceVersion} return action } diff --git a/pkg/client/unversioned/testclient/fake_daemon_sets.go b/pkg/client/unversioned/testclient/fake_daemon_sets.go index 050a73c0973..4969caa9eae 100644 --- a/pkg/client/unversioned/testclient/fake_daemon_sets.go +++ b/pkg/client/unversioned/testclient/fake_daemon_sets.go @@ -80,6 +80,6 @@ func (c *FakeDaemonSets) Delete(name string) error { return err } -func (c *FakeDaemonSets) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { - return c.Fake.InvokesWatch(NewWatchAction("daemonsets", c.Namespace, label, field, opts)) +func (c *FakeDaemonSets) Watch(opts unversioned.ListOptions) (watch.Interface, error) { + return c.Fake.InvokesWatch(NewWatchAction("daemonsets", c.Namespace, opts)) } diff --git a/pkg/client/unversioned/testclient/fake_deployments.go b/pkg/client/unversioned/testclient/fake_deployments.go index c3d5cb4adc7..dcb61bb21b8 100644 --- a/pkg/client/unversioned/testclient/fake_deployments.go +++ b/pkg/client/unversioned/testclient/fake_deployments.go @@ -87,6 +87,6 @@ func (c *FakeDeployments) Delete(name string, options *api.DeleteOptions) error return err } -func (c *FakeDeployments) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { - return c.Fake.InvokesWatch(NewWatchAction("deployments", c.Namespace, label, field, opts)) +func (c *FakeDeployments) Watch(opts unversioned.ListOptions) (watch.Interface, error) { + return c.Fake.InvokesWatch(NewWatchAction("deployments", c.Namespace, opts)) } diff --git a/pkg/client/unversioned/testclient/fake_endpoints.go b/pkg/client/unversioned/testclient/fake_endpoints.go index 12957fa18d7..10f2a92041d 100644 --- a/pkg/client/unversioned/testclient/fake_endpoints.go +++ b/pkg/client/unversioned/testclient/fake_endpoints.go @@ -72,6 +72,6 @@ func (c *FakeEndpoints) Delete(name string) error { return err } -func (c *FakeEndpoints) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { - return c.Fake.InvokesWatch(NewWatchAction("endpoints", c.Namespace, label, field, opts)) +func (c *FakeEndpoints) Watch(opts unversioned.ListOptions) (watch.Interface, error) { + return c.Fake.InvokesWatch(NewWatchAction("endpoints", c.Namespace, opts)) } diff --git a/pkg/client/unversioned/testclient/fake_events.go b/pkg/client/unversioned/testclient/fake_events.go index 03171806218..a9279375849 100644 --- a/pkg/client/unversioned/testclient/fake_events.go +++ b/pkg/client/unversioned/testclient/fake_events.go @@ -112,10 +112,10 @@ func (c *FakeEvents) Delete(name string) error { } // Watch starts watching for events matching the given selectors. -func (c *FakeEvents) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { - action := NewRootWatchAction("events", label, field, opts) +func (c *FakeEvents) Watch(opts unversioned.ListOptions) (watch.Interface, error) { + action := NewRootWatchAction("events", opts) if c.Namespace != "" { - action = NewWatchAction("events", c.Namespace, label, field, opts) + action = NewWatchAction("events", c.Namespace, opts) } return c.Fake.InvokesWatch(action) } diff --git a/pkg/client/unversioned/testclient/fake_horizontal_pod_autoscalers.go b/pkg/client/unversioned/testclient/fake_horizontal_pod_autoscalers.go index 90b951c260b..d50508f50f3 100644 --- a/pkg/client/unversioned/testclient/fake_horizontal_pod_autoscalers.go +++ b/pkg/client/unversioned/testclient/fake_horizontal_pod_autoscalers.go @@ -86,6 +86,6 @@ func (c *FakeHorizontalPodAutoscalers) Delete(name string, options *api.DeleteOp return err } -func (c *FakeHorizontalPodAutoscalers) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { - return c.Fake.InvokesWatch(NewWatchAction("horizontalpodautoscalers", c.Namespace, label, field, opts)) +func (c *FakeHorizontalPodAutoscalers) Watch(opts unversioned.ListOptions) (watch.Interface, error) { + return c.Fake.InvokesWatch(NewWatchAction("horizontalpodautoscalers", c.Namespace, opts)) } diff --git a/pkg/client/unversioned/testclient/fake_ingress.go b/pkg/client/unversioned/testclient/fake_ingress.go index 2ef5f74d751..f0bc09c385f 100644 --- a/pkg/client/unversioned/testclient/fake_ingress.go +++ b/pkg/client/unversioned/testclient/fake_ingress.go @@ -73,8 +73,8 @@ func (c *FakeIngress) Delete(name string, options *api.DeleteOptions) error { return err } -func (c *FakeIngress) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { - return c.Fake.InvokesWatch(NewWatchAction("ingresses", c.Namespace, label, field, opts)) +func (c *FakeIngress) Watch(opts unversioned.ListOptions) (watch.Interface, error) { + return c.Fake.InvokesWatch(NewWatchAction("ingresses", c.Namespace, opts)) } func (c *FakeIngress) UpdateStatus(ingress *extensions.Ingress) (result *extensions.Ingress, err error) { diff --git a/pkg/client/unversioned/testclient/fake_jobs.go b/pkg/client/unversioned/testclient/fake_jobs.go index cbaec3b644e..1c40d702af1 100644 --- a/pkg/client/unversioned/testclient/fake_jobs.go +++ b/pkg/client/unversioned/testclient/fake_jobs.go @@ -73,8 +73,8 @@ func (c *FakeJobs) Delete(name string, options *api.DeleteOptions) error { return err } -func (c *FakeJobs) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { - return c.Fake.InvokesWatch(NewWatchAction("jobs", c.Namespace, label, field, opts)) +func (c *FakeJobs) Watch(opts unversioned.ListOptions) (watch.Interface, error) { + return c.Fake.InvokesWatch(NewWatchAction("jobs", c.Namespace, opts)) } func (c *FakeJobs) UpdateStatus(job *extensions.Job) (result *extensions.Job, err error) { diff --git a/pkg/client/unversioned/testclient/fake_limit_ranges.go b/pkg/client/unversioned/testclient/fake_limit_ranges.go index 68143033b8d..20080486466 100644 --- a/pkg/client/unversioned/testclient/fake_limit_ranges.go +++ b/pkg/client/unversioned/testclient/fake_limit_ranges.go @@ -72,6 +72,6 @@ func (c *FakeLimitRanges) Delete(name string) error { return err } -func (c *FakeLimitRanges) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { - return c.Fake.InvokesWatch(NewWatchAction("limitranges", c.Namespace, label, field, opts)) +func (c *FakeLimitRanges) Watch(opts unversioned.ListOptions) (watch.Interface, error) { + return c.Fake.InvokesWatch(NewWatchAction("limitranges", c.Namespace, opts)) } diff --git a/pkg/client/unversioned/testclient/fake_namespaces.go b/pkg/client/unversioned/testclient/fake_namespaces.go index ad07448a9e4..ee1b162fb51 100644 --- a/pkg/client/unversioned/testclient/fake_namespaces.go +++ b/pkg/client/unversioned/testclient/fake_namespaces.go @@ -71,8 +71,8 @@ func (c *FakeNamespaces) Delete(name string) error { return err } -func (c *FakeNamespaces) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { - return c.Fake.InvokesWatch(NewRootWatchAction("namespaces", label, field, opts)) +func (c *FakeNamespaces) Watch(opts unversioned.ListOptions) (watch.Interface, error) { + return c.Fake.InvokesWatch(NewRootWatchAction("namespaces", opts)) } func (c *FakeNamespaces) Finalize(namespace *api.Namespace) (*api.Namespace, error) { diff --git a/pkg/client/unversioned/testclient/fake_nodes.go b/pkg/client/unversioned/testclient/fake_nodes.go index 1f580e03406..40b7e572e7d 100644 --- a/pkg/client/unversioned/testclient/fake_nodes.go +++ b/pkg/client/unversioned/testclient/fake_nodes.go @@ -71,8 +71,8 @@ func (c *FakeNodes) Delete(name string) error { return err } -func (c *FakeNodes) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { - return c.Fake.InvokesWatch(NewRootWatchAction("nodes", label, field, opts)) +func (c *FakeNodes) Watch(opts unversioned.ListOptions) (watch.Interface, error) { + return c.Fake.InvokesWatch(NewRootWatchAction("nodes", opts)) } func (c *FakeNodes) UpdateStatus(node *api.Node) (*api.Node, error) { diff --git a/pkg/client/unversioned/testclient/fake_persistent_volume_claims.go b/pkg/client/unversioned/testclient/fake_persistent_volume_claims.go index a018e74028d..f4065583809 100644 --- a/pkg/client/unversioned/testclient/fake_persistent_volume_claims.go +++ b/pkg/client/unversioned/testclient/fake_persistent_volume_claims.go @@ -70,8 +70,8 @@ func (c *FakePersistentVolumeClaims) Delete(name string) error { return err } -func (c *FakePersistentVolumeClaims) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { - return c.Fake.InvokesWatch(NewWatchAction("persistentvolumeclaims", c.Namespace, label, field, opts)) +func (c *FakePersistentVolumeClaims) Watch(opts unversioned.ListOptions) (watch.Interface, error) { + return c.Fake.InvokesWatch(NewWatchAction("persistentvolumeclaims", c.Namespace, opts)) } func (c *FakePersistentVolumeClaims) UpdateStatus(claim *api.PersistentVolumeClaim) (*api.PersistentVolumeClaim, error) { diff --git a/pkg/client/unversioned/testclient/fake_persistent_volumes.go b/pkg/client/unversioned/testclient/fake_persistent_volumes.go index bb9f00c2260..a67eb15bb0e 100644 --- a/pkg/client/unversioned/testclient/fake_persistent_volumes.go +++ b/pkg/client/unversioned/testclient/fake_persistent_volumes.go @@ -69,8 +69,8 @@ func (c *FakePersistentVolumes) Delete(name string) error { return err } -func (c *FakePersistentVolumes) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { - return c.Fake.InvokesWatch(NewRootWatchAction("persistentvolumes", label, field, opts)) +func (c *FakePersistentVolumes) Watch(opts unversioned.ListOptions) (watch.Interface, error) { + return c.Fake.InvokesWatch(NewRootWatchAction("persistentvolumes", opts)) } func (c *FakePersistentVolumes) UpdateStatus(pv *api.PersistentVolume) (*api.PersistentVolume, error) { diff --git a/pkg/client/unversioned/testclient/fake_pod_templates.go b/pkg/client/unversioned/testclient/fake_pod_templates.go index 98bf5480489..b78ef95964e 100644 --- a/pkg/client/unversioned/testclient/fake_pod_templates.go +++ b/pkg/client/unversioned/testclient/fake_pod_templates.go @@ -72,6 +72,6 @@ func (c *FakePodTemplates) Delete(name string, options *api.DeleteOptions) error return err } -func (c *FakePodTemplates) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { - return c.Fake.InvokesWatch(NewWatchAction("podtemplates", c.Namespace, label, field, opts)) +func (c *FakePodTemplates) Watch(opts unversioned.ListOptions) (watch.Interface, error) { + return c.Fake.InvokesWatch(NewWatchAction("podtemplates", c.Namespace, opts)) } diff --git a/pkg/client/unversioned/testclient/fake_pods.go b/pkg/client/unversioned/testclient/fake_pods.go index 90baefb077c..e2780dc2039 100644 --- a/pkg/client/unversioned/testclient/fake_pods.go +++ b/pkg/client/unversioned/testclient/fake_pods.go @@ -78,8 +78,8 @@ func (c *FakePods) Delete(name string, options *api.DeleteOptions) error { return err } -func (c *FakePods) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { - return c.Fake.InvokesWatch(NewWatchAction("pods", c.Namespace, label, field, opts)) +func (c *FakePods) Watch(opts unversioned.ListOptions) (watch.Interface, error) { + return c.Fake.InvokesWatch(NewWatchAction("pods", c.Namespace, opts)) } func (c *FakePods) Bind(binding *api.Binding) error { diff --git a/pkg/client/unversioned/testclient/fake_replication_controllers.go b/pkg/client/unversioned/testclient/fake_replication_controllers.go index 0eed3309056..ff711ba34e7 100644 --- a/pkg/client/unversioned/testclient/fake_replication_controllers.go +++ b/pkg/client/unversioned/testclient/fake_replication_controllers.go @@ -80,6 +80,6 @@ func (c *FakeReplicationControllers) Delete(name string) error { return err } -func (c *FakeReplicationControllers) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { - return c.Fake.InvokesWatch(NewWatchAction("replicationcontrollers", c.Namespace, label, field, opts)) +func (c *FakeReplicationControllers) Watch(opts unversioned.ListOptions) (watch.Interface, error) { + return c.Fake.InvokesWatch(NewWatchAction("replicationcontrollers", c.Namespace, opts)) } diff --git a/pkg/client/unversioned/testclient/fake_resource_quotas.go b/pkg/client/unversioned/testclient/fake_resource_quotas.go index a38033a1d44..ade064ad5b1 100644 --- a/pkg/client/unversioned/testclient/fake_resource_quotas.go +++ b/pkg/client/unversioned/testclient/fake_resource_quotas.go @@ -72,8 +72,8 @@ func (c *FakeResourceQuotas) Delete(name string) error { return err } -func (c *FakeResourceQuotas) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { - return c.Fake.InvokesWatch(NewWatchAction("resourcequotas", c.Namespace, label, field, opts)) +func (c *FakeResourceQuotas) Watch(opts unversioned.ListOptions) (watch.Interface, error) { + return c.Fake.InvokesWatch(NewWatchAction("resourcequotas", c.Namespace, opts)) } func (c *FakeResourceQuotas) UpdateStatus(resourceQuota *api.ResourceQuota) (*api.ResourceQuota, error) { diff --git a/pkg/client/unversioned/testclient/fake_secrets.go b/pkg/client/unversioned/testclient/fake_secrets.go index 43de4304357..fd0b02d1b5c 100644 --- a/pkg/client/unversioned/testclient/fake_secrets.go +++ b/pkg/client/unversioned/testclient/fake_secrets.go @@ -72,6 +72,6 @@ func (c *FakeSecrets) Delete(name string) error { return err } -func (c *FakeSecrets) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { - return c.Fake.InvokesWatch(NewWatchAction("secrets", c.Namespace, label, field, opts)) +func (c *FakeSecrets) Watch(opts unversioned.ListOptions) (watch.Interface, error) { + return c.Fake.InvokesWatch(NewWatchAction("secrets", c.Namespace, opts)) } diff --git a/pkg/client/unversioned/testclient/fake_service_accounts.go b/pkg/client/unversioned/testclient/fake_service_accounts.go index 8b8c13213a7..366cb056435 100644 --- a/pkg/client/unversioned/testclient/fake_service_accounts.go +++ b/pkg/client/unversioned/testclient/fake_service_accounts.go @@ -72,6 +72,6 @@ func (c *FakeServiceAccounts) Delete(name string) error { return err } -func (c *FakeServiceAccounts) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { - return c.Fake.InvokesWatch(NewWatchAction("serviceaccounts", c.Namespace, label, field, opts)) +func (c *FakeServiceAccounts) Watch(opts unversioned.ListOptions) (watch.Interface, error) { + return c.Fake.InvokesWatch(NewWatchAction("serviceaccounts", c.Namespace, opts)) } diff --git a/pkg/client/unversioned/testclient/fake_services.go b/pkg/client/unversioned/testclient/fake_services.go index 542c23d327f..642f2404783 100644 --- a/pkg/client/unversioned/testclient/fake_services.go +++ b/pkg/client/unversioned/testclient/fake_services.go @@ -73,8 +73,8 @@ func (c *FakeServices) Delete(name string) error { return err } -func (c *FakeServices) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { - return c.Fake.InvokesWatch(NewWatchAction("services", c.Namespace, label, field, opts)) +func (c *FakeServices) Watch(opts unversioned.ListOptions) (watch.Interface, error) { + return c.Fake.InvokesWatch(NewWatchAction("services", c.Namespace, opts)) } func (c *FakeServices) ProxyGet(scheme, name, port, path string, params map[string]string) client.ResponseWrapper { diff --git a/pkg/controller/daemon/controller.go b/pkg/controller/daemon/controller.go index 2ee8c50be58..785879376d6 100644 --- a/pkg/controller/daemon/controller.go +++ b/pkg/controller/daemon/controller.go @@ -101,7 +101,7 @@ func NewDaemonSetsController(kubeClient client.Interface, resyncPeriod controlle return dsc.kubeClient.Extensions().DaemonSets(api.NamespaceAll).List(labels.Everything(), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return dsc.kubeClient.Extensions().DaemonSets(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), options) + return dsc.kubeClient.Extensions().DaemonSets(api.NamespaceAll).Watch(options) }, }, &extensions.DaemonSet{}, @@ -133,7 +133,7 @@ func NewDaemonSetsController(kubeClient client.Interface, resyncPeriod controlle return dsc.kubeClient.Pods(api.NamespaceAll).List(labels.Everything(), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return dsc.kubeClient.Pods(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), options) + return dsc.kubeClient.Pods(api.NamespaceAll).Watch(options) }, }, &api.Pod{}, @@ -151,7 +151,7 @@ func NewDaemonSetsController(kubeClient client.Interface, resyncPeriod controlle return dsc.kubeClient.Nodes().List(labels.Everything(), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return dsc.kubeClient.Nodes().Watch(labels.Everything(), fields.Everything(), options) + return dsc.kubeClient.Nodes().Watch(options) }, }, &api.Node{}, diff --git a/pkg/controller/endpoint/endpoints_controller.go b/pkg/controller/endpoint/endpoints_controller.go index e86353cf6e9..a01d3eb000c 100644 --- a/pkg/controller/endpoint/endpoints_controller.go +++ b/pkg/controller/endpoint/endpoints_controller.go @@ -67,7 +67,7 @@ func NewEndpointController(client *client.Client, resyncPeriod controller.Resync return e.client.Services(api.NamespaceAll).List(labels.Everything(), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return e.client.Services(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), options) + return e.client.Services(api.NamespaceAll).Watch(options) }, }, &api.Service{}, @@ -88,7 +88,7 @@ func NewEndpointController(client *client.Client, resyncPeriod controller.Resync return e.client.Pods(api.NamespaceAll).List(labels.Everything(), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return e.client.Pods(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), options) + return e.client.Pods(api.NamespaceAll).Watch(options) }, }, &api.Pod{}, diff --git a/pkg/controller/gc/gc_controller.go b/pkg/controller/gc/gc_controller.go index 633323fd877..12508634509 100644 --- a/pkg/controller/gc/gc_controller.go +++ b/pkg/controller/gc/gc_controller.go @@ -70,7 +70,8 @@ func New(kubeClient client.Interface, resyncPeriod controller.ResyncPeriodFunc, return gcc.kubeClient.Pods(api.NamespaceAll).List(labels.Everything(), terminatedSelector) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return gcc.kubeClient.Pods(api.NamespaceAll).Watch(labels.Everything(), terminatedSelector, options) + options.FieldSelector.Selector = terminatedSelector + return gcc.kubeClient.Pods(api.NamespaceAll).Watch(options) }, }, &api.Pod{}, diff --git a/pkg/controller/job/controller.go b/pkg/controller/job/controller.go index e5c51599f9c..cd32d440361 100644 --- a/pkg/controller/job/controller.go +++ b/pkg/controller/job/controller.go @@ -89,7 +89,7 @@ func NewJobController(kubeClient client.Interface, resyncPeriod controller.Resyn return jm.kubeClient.Extensions().Jobs(api.NamespaceAll).List(labels.Everything(), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return jm.kubeClient.Extensions().Jobs(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), options) + return jm.kubeClient.Extensions().Jobs(api.NamespaceAll).Watch(options) }, }, &extensions.Job{}, @@ -112,7 +112,7 @@ func NewJobController(kubeClient client.Interface, resyncPeriod controller.Resyn return jm.kubeClient.Pods(api.NamespaceAll).List(labels.Everything(), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return jm.kubeClient.Pods(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), options) + return jm.kubeClient.Pods(api.NamespaceAll).Watch(options) }, }, &api.Pod{}, diff --git a/pkg/controller/namespace/namespace_controller.go b/pkg/controller/namespace/namespace_controller.go index b6331a92a22..2d84472eda8 100644 --- a/pkg/controller/namespace/namespace_controller.go +++ b/pkg/controller/namespace/namespace_controller.go @@ -51,7 +51,7 @@ func NewNamespaceController(kubeClient client.Interface, versions *unversioned.A return kubeClient.Namespaces().List(labels.Everything(), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return kubeClient.Namespaces().Watch(labels.Everything(), fields.Everything(), options) + return kubeClient.Namespaces().Watch(options) }, }, &api.Namespace{}, diff --git a/pkg/controller/node/nodecontroller.go b/pkg/controller/node/nodecontroller.go index 87679d564a6..0a5be484cba 100644 --- a/pkg/controller/node/nodecontroller.go +++ b/pkg/controller/node/nodecontroller.go @@ -167,7 +167,7 @@ func NewNodeController( return nc.kubeClient.Pods(api.NamespaceAll).List(labels.Everything(), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return nc.kubeClient.Pods(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), options) + return nc.kubeClient.Pods(api.NamespaceAll).Watch(options) }, }, &api.Pod{}, @@ -183,7 +183,7 @@ func NewNodeController( return nc.kubeClient.Nodes().List(labels.Everything(), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return nc.kubeClient.Nodes().Watch(labels.Everything(), fields.Everything(), options) + return nc.kubeClient.Nodes().Watch(options) }, }, &api.Node{}, diff --git a/pkg/controller/node/nodecontroller_test.go b/pkg/controller/node/nodecontroller_test.go index 1a15220211e..59ea0fb03e2 100644 --- a/pkg/controller/node/nodecontroller_test.go +++ b/pkg/controller/node/nodecontroller_test.go @@ -136,7 +136,7 @@ func (m *FakeNodeHandler) UpdateStatus(node *api.Node) (*api.Node, error) { return node, nil } -func (m *FakeNodeHandler) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) { +func (m *FakeNodeHandler) Watch(opts unversioned.ListOptions) (watch.Interface, error) { return nil, nil } diff --git a/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller.go b/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller.go index 6d115073ab9..f13c5e1ac54 100644 --- a/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller.go +++ b/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller.go @@ -61,7 +61,7 @@ func NewPersistentVolumeClaimBinder(kubeClient client.Interface, syncPeriod time return kubeClient.PersistentVolumes().List(labels.Everything(), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return kubeClient.PersistentVolumes().Watch(labels.Everything(), fields.Everything(), options) + return kubeClient.PersistentVolumes().Watch(options) }, }, &api.PersistentVolume{}, @@ -79,7 +79,7 @@ func NewPersistentVolumeClaimBinder(kubeClient client.Interface, syncPeriod time return kubeClient.PersistentVolumeClaims(api.NamespaceAll).List(labels.Everything(), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return kubeClient.PersistentVolumeClaims(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), options) + return kubeClient.PersistentVolumeClaims(api.NamespaceAll).Watch(options) }, }, &api.PersistentVolumeClaim{}, diff --git a/pkg/controller/persistentvolume/persistentvolume_recycler_controller.go b/pkg/controller/persistentvolume/persistentvolume_recycler_controller.go index 74f212c88d8..b58b567e6c7 100644 --- a/pkg/controller/persistentvolume/persistentvolume_recycler_controller.go +++ b/pkg/controller/persistentvolume/persistentvolume_recycler_controller.go @@ -68,7 +68,7 @@ func NewPersistentVolumeRecycler(kubeClient client.Interface, syncPeriod time.Du return kubeClient.PersistentVolumes().List(labels.Everything(), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return kubeClient.PersistentVolumes().Watch(labels.Everything(), fields.Everything(), options) + return kubeClient.PersistentVolumes().Watch(options) }, }, &api.PersistentVolume{}, diff --git a/pkg/controller/replication/replication_controller.go b/pkg/controller/replication/replication_controller.go index c8b6b537ab2..e36143142e5 100644 --- a/pkg/controller/replication/replication_controller.go +++ b/pkg/controller/replication/replication_controller.go @@ -112,7 +112,7 @@ func NewReplicationManager(kubeClient client.Interface, resyncPeriod controller. return rm.kubeClient.ReplicationControllers(api.NamespaceAll).List(labels.Everything(), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return rm.kubeClient.ReplicationControllers(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), options) + return rm.kubeClient.ReplicationControllers(api.NamespaceAll).Watch(options) }, }, &api.ReplicationController{}, @@ -153,7 +153,7 @@ func NewReplicationManager(kubeClient client.Interface, resyncPeriod controller. return rm.kubeClient.Pods(api.NamespaceAll).List(labels.Everything(), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return rm.kubeClient.Pods(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), options) + return rm.kubeClient.Pods(api.NamespaceAll).Watch(options) }, }, &api.Pod{}, diff --git a/pkg/controller/serviceaccount/serviceaccounts_controller.go b/pkg/controller/serviceaccount/serviceaccounts_controller.go index 09090bfbf36..57dbe3da442 100644 --- a/pkg/controller/serviceaccount/serviceaccounts_controller.go +++ b/pkg/controller/serviceaccount/serviceaccounts_controller.go @@ -82,7 +82,8 @@ func NewServiceAccountsController(cl client.Interface, options ServiceAccountsCo return e.client.ServiceAccounts(api.NamespaceAll).List(labels.Everything(), accountSelector) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return e.client.ServiceAccounts(api.NamespaceAll).Watch(labels.Everything(), accountSelector, options) + options.FieldSelector.Selector = accountSelector + return e.client.ServiceAccounts(api.NamespaceAll).Watch(options) }, }, &api.ServiceAccount{}, @@ -99,7 +100,7 @@ func NewServiceAccountsController(cl client.Interface, options ServiceAccountsCo return e.client.Namespaces().List(labels.Everything(), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return e.client.Namespaces().Watch(labels.Everything(), fields.Everything(), options) + return e.client.Namespaces().Watch(options) }, }, &api.Namespace{}, diff --git a/pkg/controller/serviceaccount/tokens_controller.go b/pkg/controller/serviceaccount/tokens_controller.go index 62edd521d3e..240060e9b5d 100644 --- a/pkg/controller/serviceaccount/tokens_controller.go +++ b/pkg/controller/serviceaccount/tokens_controller.go @@ -67,7 +67,7 @@ func NewTokensController(cl client.Interface, options TokensControllerOptions) * return e.client.ServiceAccounts(api.NamespaceAll).List(labels.Everything(), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return e.client.ServiceAccounts(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), options) + return e.client.ServiceAccounts(api.NamespaceAll).Watch(options) }, }, &api.ServiceAccount{}, @@ -87,7 +87,8 @@ func NewTokensController(cl client.Interface, options TokensControllerOptions) * return e.client.Secrets(api.NamespaceAll).List(labels.Everything(), tokenSelector) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return e.client.Secrets(api.NamespaceAll).Watch(labels.Everything(), tokenSelector, options) + options.FieldSelector.Selector = tokenSelector + return e.client.Secrets(api.NamespaceAll).Watch(options) }, }, &api.Secret{}, diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 5dab21756c2..d6eda39f6c0 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -240,7 +240,7 @@ func NewMainKubelet( return kubeClient.Services(api.NamespaceAll).List(labels.Everything(), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return kubeClient.Services(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), options) + return kubeClient.Services(api.NamespaceAll).Watch(options) }, } cache.NewReflector(listWatch, &api.Service{}, serviceStore, 0).Run() @@ -257,7 +257,8 @@ func NewMainKubelet( return kubeClient.Nodes().List(labels.Everything(), fieldSelector) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return kubeClient.Nodes().Watch(labels.Everything(), fieldSelector, options) + options.FieldSelector.Selector = fieldSelector + return kubeClient.Nodes().Watch(options) }, } cache.NewReflector(listWatch, &api.Node{}, nodeStore, 0).Run() diff --git a/pkg/volume/util.go b/pkg/volume/util.go index 512bebebe29..06c02e6c7e1 100644 --- a/pkg/volume/util.go +++ b/pkg/volume/util.go @@ -113,7 +113,8 @@ func (c *realRecyclerClient) WatchPod(name, namespace, resourceVersion string, s return c.client.Pods(namespace).List(labels.Everything(), fieldSelector) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return c.client.Pods(namespace).Watch(labels.Everything(), fieldSelector, options) + options.FieldSelector.Selector = fieldSelector + return c.client.Pods(namespace).Watch(options) }, } queue := cache.NewFIFO(cache.MetaNamespaceKeyFunc) diff --git a/plugin/pkg/admission/limitranger/admission.go b/plugin/pkg/admission/limitranger/admission.go index 6e70c487b52..5d115c30413 100644 --- a/plugin/pkg/admission/limitranger/admission.go +++ b/plugin/pkg/admission/limitranger/admission.go @@ -104,7 +104,7 @@ func NewLimitRanger(client client.Interface, limitFunc LimitFunc) admission.Inte return client.LimitRanges(api.NamespaceAll).List(labels.Everything(), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return client.LimitRanges(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), options) + return client.LimitRanges(api.NamespaceAll).Watch(options) }, } indexer, reflector := cache.NewNamespaceKeyedIndexerAndReflector(lw, &api.LimitRange{}, 0) diff --git a/plugin/pkg/admission/namespace/autoprovision/admission.go b/plugin/pkg/admission/namespace/autoprovision/admission.go index 29a8d5a8101..0eaaa293939 100644 --- a/plugin/pkg/admission/namespace/autoprovision/admission.go +++ b/plugin/pkg/admission/namespace/autoprovision/admission.go @@ -89,7 +89,7 @@ func NewProvision(c client.Interface) admission.Interface { return c.Namespaces().List(labels.Everything(), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return c.Namespaces().Watch(labels.Everything(), fields.Everything(), options) + return c.Namespaces().Watch(options) }, }, &api.Namespace{}, diff --git a/plugin/pkg/admission/namespace/exists/admission.go b/plugin/pkg/admission/namespace/exists/admission.go index c509963f953..6efb1a83f27 100644 --- a/plugin/pkg/admission/namespace/exists/admission.go +++ b/plugin/pkg/admission/namespace/exists/admission.go @@ -96,7 +96,7 @@ func NewExists(c client.Interface) admission.Interface { return c.Namespaces().List(labels.Everything(), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return c.Namespaces().Watch(labels.Everything(), fields.Everything(), options) + return c.Namespaces().Watch(options) }, }, &api.Namespace{}, diff --git a/plugin/pkg/admission/namespace/lifecycle/admission.go b/plugin/pkg/admission/namespace/lifecycle/admission.go index d44354b51eb..8c68313ea97 100644 --- a/plugin/pkg/admission/namespace/lifecycle/admission.go +++ b/plugin/pkg/admission/namespace/lifecycle/admission.go @@ -113,7 +113,7 @@ func NewLifecycle(c client.Interface) admission.Interface { return c.Namespaces().List(labels.Everything(), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return c.Namespaces().Watch(labels.Everything(), fields.Everything(), options) + return c.Namespaces().Watch(options) }, }, &api.Namespace{}, diff --git a/plugin/pkg/admission/resourcequota/admission.go b/plugin/pkg/admission/resourcequota/admission.go index 23743370d53..c7454ca75bb 100644 --- a/plugin/pkg/admission/resourcequota/admission.go +++ b/plugin/pkg/admission/resourcequota/admission.go @@ -55,7 +55,7 @@ func NewResourceQuota(client client.Interface) admission.Interface { return client.ResourceQuotas(api.NamespaceAll).List(labels.Everything(), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return client.ResourceQuotas(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), options) + return client.ResourceQuotas(api.NamespaceAll).Watch(options) }, } indexer, reflector := cache.NewNamespaceKeyedIndexerAndReflector(lw, &api.ResourceQuota{}, 0) diff --git a/plugin/pkg/admission/serviceaccount/admission.go b/plugin/pkg/admission/serviceaccount/admission.go index cb3284e658c..56e75760c0a 100644 --- a/plugin/pkg/admission/serviceaccount/admission.go +++ b/plugin/pkg/admission/serviceaccount/admission.go @@ -87,7 +87,7 @@ func NewServiceAccount(cl client.Interface) *serviceAccount { return cl.ServiceAccounts(api.NamespaceAll).List(labels.Everything(), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return cl.ServiceAccounts(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), options) + return cl.ServiceAccounts(api.NamespaceAll).Watch(options) }, }, &api.ServiceAccount{}, @@ -101,7 +101,8 @@ func NewServiceAccount(cl client.Interface) *serviceAccount { return cl.Secrets(api.NamespaceAll).List(labels.Everything(), tokenSelector) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return cl.Secrets(api.NamespaceAll).Watch(labels.Everything(), tokenSelector, options) + options.FieldSelector.Selector = tokenSelector + return cl.Secrets(api.NamespaceAll).Watch(options) }, }, &api.Secret{}, diff --git a/test/e2e/daemon_restart.go b/test/e2e/daemon_restart.go index 20c99ad172e..aeb313b4cc1 100644 --- a/test/e2e/daemon_restart.go +++ b/test/e2e/daemon_restart.go @@ -224,7 +224,8 @@ var _ = Describe("DaemonRestart", func() { return framework.Client.Pods(ns).List(labelSelector, fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return framework.Client.Pods(ns).Watch(labelSelector, fields.Everything(), options) + options.LabelSelector.Selector = labelSelector + return framework.Client.Pods(ns).Watch(options) }, }, &api.Pod{}, diff --git a/test/e2e/density.go b/test/e2e/density.go index 3c7b1205dde..cb803f9f408 100644 --- a/test/e2e/density.go +++ b/test/e2e/density.go @@ -203,7 +203,7 @@ var _ = Describe("Density [Skipped]", func() { return c.Events(ns).List(labels.Everything(), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return c.Events(ns).Watch(labels.Everything(), fields.Everything(), options) + return c.Events(ns).Watch(options) }, }, &api.Event{}, @@ -286,7 +286,8 @@ var _ = Describe("Density [Skipped]", func() { return c.Pods(ns).List(labels.SelectorFromSet(labels.Set{"name": additionalPodsPrefix}), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return c.Pods(ns).Watch(labels.SelectorFromSet(labels.Set{"name": additionalPodsPrefix}), fields.Everything(), options) + options.LabelSelector.Selector = labels.SelectorFromSet(labels.Set{"name": additionalPodsPrefix}) + return c.Pods(ns).Watch(options) }, }, &api.Pod{}, diff --git a/test/e2e/framework.go b/test/e2e/framework.go index d72cf82148b..7bd1bafb61d 100644 --- a/test/e2e/framework.go +++ b/test/e2e/framework.go @@ -194,11 +194,11 @@ func (f *Framework) WaitForAnEndpoint(serviceName string) error { } } - w, err := f.Client.Endpoints(f.Namespace.Name).Watch( - labels.Everything(), - fields.Set{"metadata.name": serviceName}.AsSelector(), - unversioned.ListOptions{ResourceVersion: rv}, - ) + options := unversioned.ListOptions{ + FieldSelector: unversioned.FieldSelector{fields.Set{"metadata.name": serviceName}.AsSelector()}, + ResourceVersion: rv, + } + w, err := f.Client.Endpoints(f.Namespace.Name).Watch(options) if err != nil { return err } diff --git a/test/e2e/latency.go b/test/e2e/latency.go index 59a2ca3bb4f..bc7bed41895 100644 --- a/test/e2e/latency.go +++ b/test/e2e/latency.go @@ -147,7 +147,8 @@ func runLatencyTest(nodeCount int, c *client.Client, ns string) { return c.Pods(ns).List(labels.SelectorFromSet(labels.Set{"name": additionalPodsPrefix}), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return c.Pods(ns).Watch(labels.SelectorFromSet(labels.Set{"name": additionalPodsPrefix}), fields.Everything(), options) + options.LabelSelector.Selector = labels.SelectorFromSet(labels.Set{"name": additionalPodsPrefix}) + return c.Pods(ns).Watch(options) }, }, &api.Pod{}, diff --git a/test/e2e/pods.go b/test/e2e/pods.go index d565f65b1f4..2ff42cac767 100644 --- a/test/e2e/pods.go +++ b/test/e2e/pods.go @@ -305,9 +305,11 @@ var _ = Describe("Pods", func() { Failf("Failed to query for pods: %v", err) } Expect(len(pods.Items)).To(Equal(0)) - w, err := podClient.Watch( - labels.SelectorFromSet(labels.Set(map[string]string{"time": value})), fields.Everything(), - unversioned.ListOptions{ResourceVersion: pods.ListMeta.ResourceVersion}) + options := unversioned.ListOptions{ + LabelSelector: unversioned.LabelSelector{labels.SelectorFromSet(labels.Set(map[string]string{"time": value}))}, + ResourceVersion: pods.ListMeta.ResourceVersion, + } + w, err := podClient.Watch(options) if err != nil { Failf("Failed to set up watch: %v", err) } diff --git a/test/e2e/service_latency.go b/test/e2e/service_latency.go index 43218ddf9a8..70359c14428 100644 --- a/test/e2e/service_latency.go +++ b/test/e2e/service_latency.go @@ -283,7 +283,7 @@ func startEndpointWatcher(f *Framework, q *endpointQueries) { return f.Client.Endpoints(f.Namespace.Name).List(labels.Everything(), fields.Everything()) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return f.Client.Endpoints(f.Namespace.Name).Watch(labels.Everything(), fields.Everything(), options) + return f.Client.Endpoints(f.Namespace.Name).Watch(options) }, }, &api.Endpoints{}, diff --git a/test/e2e/util.go b/test/e2e/util.go index 39329eb4ce9..1c974b455d0 100644 --- a/test/e2e/util.go +++ b/test/e2e/util.go @@ -165,7 +165,9 @@ func newPodStore(c *client.Client, namespace string, label labels.Selector, fiel return c.Pods(namespace).List(label, field) }, WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - return c.Pods(namespace).Watch(label, field, options) + options.LabelSelector.Selector = label + options.FieldSelector.Selector = field + return c.Pods(namespace).Watch(options) }, } store := cache.NewStore(cache.MetaNamespaceKeyFunc) diff --git a/test/integration/client_test.go b/test/integration/client_test.go index 12461ed477a..5c87ffbafaa 100644 --- a/test/integration/client_test.go +++ b/test/integration/client_test.go @@ -245,11 +245,11 @@ func TestMultiWatch(t *testing.T) { t.Fatalf("Couldn't make %v: %v", name, err) } go func(name, rv string) { - w, err := client.Pods(ns).Watch( - labels.Set{"watchlabel": name}.AsSelector(), - fields.Everything(), - unversioned.ListOptions{ResourceVersion: rv}, - ) + options := unversioned.ListOptions{ + LabelSelector: unversioned.LabelSelector{labels.Set{"watchlabel": name}.AsSelector()}, + ResourceVersion: rv, + } + w, err := client.Pods(ns).Watch(options) if err != nil { panic(fmt.Sprintf("watch error for %v: %v", name, err)) } diff --git a/test/integration/persistent_volumes_test.go b/test/integration/persistent_volumes_test.go index a9f1912a033..99dfdd21987 100644 --- a/test/integration/persistent_volumes_test.go +++ b/test/integration/persistent_volumes_test.go @@ -31,8 +31,6 @@ import ( client "k8s.io/kubernetes/pkg/client/unversioned" persistentvolumecontroller "k8s.io/kubernetes/pkg/controller/persistentvolume" "k8s.io/kubernetes/pkg/conversion" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/watch" "k8s.io/kubernetes/test/integration/framework" @@ -78,7 +76,7 @@ func TestPersistentVolumeRecycler(t *testing.T) { }, } - w, _ := testClient.PersistentVolumes().Watch(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + w, _ := testClient.PersistentVolumes().Watch(unversioned.ListOptions{}) defer w.Stop() _, _ = testClient.PersistentVolumes().Create(pv) @@ -104,7 +102,7 @@ func TestPersistentVolumeRecycler(t *testing.T) { // change the reclamation policy of the PV for the next test pv.Spec.PersistentVolumeReclaimPolicy = api.PersistentVolumeReclaimDelete - w, _ = testClient.PersistentVolumes().Watch(labels.Everything(), fields.Everything(), unversioned.ListOptions{}) + w, _ = testClient.PersistentVolumes().Watch(unversioned.ListOptions{}) defer w.Stop() _, _ = testClient.PersistentVolumes().Create(pv)