diff --git a/cmd/libs/go2idl/client-gen/generators/generator_for_type.go b/cmd/libs/go2idl/client-gen/generators/generator_for_type.go index 986062da04d..f2781ce595e 100644 --- a/cmd/libs/go2idl/client-gen/generators/generator_for_type.go +++ b/cmd/libs/go2idl/client-gen/generators/generator_for_type.go @@ -322,8 +322,8 @@ func (c *$.type|privatePlural$) UpdateStatus($.type|private$ *$.type|raw$) (resu var watchTemplate = ` // Watch returns a $.watchInterface|raw$ that watches the requested $.type|privatePlural$. func (c *$.type|privatePlural$) Watch(opts $.ListOptions|raw$) ($.watchInterface|raw$, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). $if .namespaced$Namespace(c.ns).$end$ Resource("$.type|allLowercasePlural$"). VersionedParams(&opts, $.schemeParameterCodec|raw$). diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testtype.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testtype.go index ed2d237c329..2193059d862 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testtype.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testtype.go @@ -149,8 +149,8 @@ func (c *testTypes) List(opts v1.ListOptions) (result *testgroup.TestTypeList, e // Watch returns a watch.Interface that watches the requested testTypes. func (c *testTypes) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("testtypes"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/horizontalpodautoscaler.go b/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/horizontalpodautoscaler.go index c34358c23ae..dce52b089dc 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/horizontalpodautoscaler.go +++ b/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/horizontalpodautoscaler.go @@ -149,8 +149,8 @@ func (c *horizontalPodAutoscalers) List(opts meta_v1.ListOptions) (result *v1.Ho // Watch returns a watch.Interface that watches the requested horizontalPodAutoscalers. func (c *horizontalPodAutoscalers) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("horizontalpodautoscalers"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/job.go b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/job.go index ceea2b6fa89..afed6a2f479 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/job.go +++ b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/job.go @@ -149,8 +149,8 @@ func (c *jobs) List(opts meta_v1.ListOptions) (result *v1.JobList, err error) { // Watch returns a watch.Interface that watches the requested jobs. func (c *jobs) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("jobs"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/configmap.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/configmap.go index 3f59b96ae3a..d5c12ead029 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/configmap.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/configmap.go @@ -132,8 +132,8 @@ func (c *configMaps) List(opts meta_v1.ListOptions) (result *v1.ConfigMapList, e // Watch returns a watch.Interface that watches the requested configMaps. func (c *configMaps) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("configmaps"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/event.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/event.go index fc8ec6b8966..27dc38a6241 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/event.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/event.go @@ -132,8 +132,8 @@ func (c *events) List(opts meta_v1.ListOptions) (result *v1.EventList, err error // Watch returns a watch.Interface that watches the requested events. func (c *events) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("events"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/namespace.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/namespace.go index 791b7e70b41..effc233c012 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/namespace.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/namespace.go @@ -140,8 +140,8 @@ func (c *namespaces) List(opts meta_v1.ListOptions) (result *v1.NamespaceList, e // Watch returns a watch.Interface that watches the requested namespaces. func (c *namespaces) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Resource("namespaces"). VersionedParams(&opts, scheme.ParameterCodec). Watch() diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/secret.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/secret.go index 53f4ad7fdd6..e6bf235bbd7 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/secret.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/secret.go @@ -132,8 +132,8 @@ func (c *secrets) List(opts meta_v1.ListOptions) (result *v1.SecretList, err err // Watch returns a watch.Interface that watches the requested secrets. func (c *secrets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("secrets"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/service.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/service.go index 335c359118a..0d80c73537a 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/service.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/service.go @@ -149,8 +149,8 @@ func (c *services) List(opts meta_v1.ListOptions) (result *v1.ServiceList, err e // Watch returns a watch.Interface that watches the requested services. func (c *services) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("services"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/daemonset.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/daemonset.go index 01a53771bf7..ae5522c7731 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/daemonset.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/daemonset.go @@ -149,8 +149,8 @@ func (c *daemonSets) List(opts v1.ListOptions) (result *v1beta1.DaemonSetList, e // Watch returns a watch.Interface that watches the requested daemonSets. func (c *daemonSets) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("daemonsets"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/deployment.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/deployment.go index f1205cf38a9..07f13ff0f5a 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/deployment.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/deployment.go @@ -149,8 +149,8 @@ func (c *deployments) List(opts v1.ListOptions) (result *v1beta1.DeploymentList, // Watch returns a watch.Interface that watches the requested deployments. func (c *deployments) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("deployments"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/ingress.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/ingress.go index 7ab60602edd..997bedb7506 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/ingress.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/ingress.go @@ -149,8 +149,8 @@ func (c *ingresses) List(opts v1.ListOptions) (result *v1beta1.IngressList, err // Watch returns a watch.Interface that watches the requested ingresses. func (c *ingresses) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("ingresses"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/replicaset.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/replicaset.go index 5dc2e1fc9a5..9e7f0fd5e5d 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/replicaset.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/replicaset.go @@ -149,8 +149,8 @@ func (c *replicaSets) List(opts v1.ListOptions) (result *v1beta1.ReplicaSetList, // Watch returns a watch.Interface that watches the requested replicaSets. func (c *replicaSets) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("replicasets"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/cluster.go b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/cluster.go index 9e1f7a7479c..75b29cbc6c2 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/cluster.go +++ b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/cluster.go @@ -140,8 +140,8 @@ func (c *clusters) List(opts v1.ListOptions) (result *v1beta1.ClusterList, err e // Watch returns a watch.Interface that watches the requested clusters. func (c *clusters) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Resource("clusters"). VersionedParams(&opts, scheme.ParameterCodec). Watch() diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/horizontalpodautoscaler.go b/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/horizontalpodautoscaler.go index 5291f3d33f5..424c2738ac0 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/horizontalpodautoscaler.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/horizontalpodautoscaler.go @@ -149,8 +149,8 @@ func (c *horizontalPodAutoscalers) List(opts v1.ListOptions) (result *autoscalin // Watch returns a watch.Interface that watches the requested horizontalPodAutoscalers. func (c *horizontalPodAutoscalers) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("horizontalpodautoscalers"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/job.go b/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/job.go index e33b82fa826..7d688059c09 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/job.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/job.go @@ -149,8 +149,8 @@ func (c *jobs) List(opts v1.ListOptions) (result *batch.JobList, err error) { // Watch returns a watch.Interface that watches the requested jobs. func (c *jobs) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("jobs"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/configmap.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/configmap.go index aa986f5b8fb..5e2cf509b57 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/configmap.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/configmap.go @@ -132,8 +132,8 @@ func (c *configMaps) List(opts v1.ListOptions) (result *api.ConfigMapList, err e // Watch returns a watch.Interface that watches the requested configMaps. func (c *configMaps) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("configmaps"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/event.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/event.go index 29600534c11..442ede8a8aa 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/event.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/event.go @@ -132,8 +132,8 @@ func (c *events) List(opts v1.ListOptions) (result *api.EventList, err error) { // Watch returns a watch.Interface that watches the requested events. func (c *events) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("events"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/namespace.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/namespace.go index 8203d06c8e5..cfa8390157b 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/namespace.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/namespace.go @@ -140,8 +140,8 @@ func (c *namespaces) List(opts v1.ListOptions) (result *api.NamespaceList, err e // Watch returns a watch.Interface that watches the requested namespaces. func (c *namespaces) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Resource("namespaces"). VersionedParams(&opts, scheme.ParameterCodec). Watch() diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/secret.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/secret.go index 80ddce717b0..6e887c011d7 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/secret.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/secret.go @@ -132,8 +132,8 @@ func (c *secrets) List(opts v1.ListOptions) (result *api.SecretList, err error) // Watch returns a watch.Interface that watches the requested secrets. func (c *secrets) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("secrets"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/service.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/service.go index 73af4cbbd5a..dfcf3124bb3 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/service.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/service.go @@ -149,8 +149,8 @@ func (c *services) List(opts v1.ListOptions) (result *api.ServiceList, err error // Watch returns a watch.Interface that watches the requested services. func (c *services) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("services"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/daemonset.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/daemonset.go index 51e77a482f5..c32fe7ea452 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/daemonset.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/daemonset.go @@ -149,8 +149,8 @@ func (c *daemonSets) List(opts v1.ListOptions) (result *extensions.DaemonSetList // Watch returns a watch.Interface that watches the requested daemonSets. func (c *daemonSets) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("daemonsets"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/deployment.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/deployment.go index 8fe0d190fe9..687d992f119 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/deployment.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/deployment.go @@ -149,8 +149,8 @@ func (c *deployments) List(opts v1.ListOptions) (result *extensions.DeploymentLi // Watch returns a watch.Interface that watches the requested deployments. func (c *deployments) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("deployments"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/ingress.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/ingress.go index 26e79034cd0..22bf494c6f7 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/ingress.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/ingress.go @@ -149,8 +149,8 @@ func (c *ingresses) List(opts v1.ListOptions) (result *extensions.IngressList, e // Watch returns a watch.Interface that watches the requested ingresses. func (c *ingresses) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("ingresses"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/replicaset.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/replicaset.go index 8298c5476d6..4f8f487707c 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/replicaset.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/replicaset.go @@ -149,8 +149,8 @@ func (c *replicaSets) List(opts v1.ListOptions) (result *extensions.ReplicaSetLi // Watch returns a watch.Interface that watches the requested replicaSets. func (c *replicaSets) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("replicasets"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/cluster.go b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/cluster.go index 4d319f1e6f3..ac5afda260a 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/cluster.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/cluster.go @@ -140,8 +140,8 @@ func (c *clusters) List(opts v1.ListOptions) (result *federation.ClusterList, er // Watch returns a watch.Interface that watches the requested clusters. func (c *clusters) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Resource("clusters"). VersionedParams(&opts, scheme.ParameterCodec). Watch() diff --git a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/statefulset.go b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/statefulset.go index e579cd4564d..7acff8de044 100644 --- a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/statefulset.go +++ b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/statefulset.go @@ -149,8 +149,8 @@ func (c *statefulSets) List(opts v1.ListOptions) (result *v1beta1.StatefulSetLis // Watch returns a watch.Interface that watches the requested statefulSets. func (c *statefulSets) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("statefulsets"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/horizontalpodautoscaler.go b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/horizontalpodautoscaler.go index 13820b6155b..1651dbf191d 100644 --- a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/horizontalpodautoscaler.go +++ b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/horizontalpodautoscaler.go @@ -149,8 +149,8 @@ func (c *horizontalPodAutoscalers) List(opts meta_v1.ListOptions) (result *v1.Ho // Watch returns a watch.Interface that watches the requested horizontalPodAutoscalers. func (c *horizontalPodAutoscalers) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("horizontalpodautoscalers"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/horizontalpodautoscaler.go b/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/horizontalpodautoscaler.go index c6dcfb8eb61..d359517e9fb 100644 --- a/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/horizontalpodautoscaler.go +++ b/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/horizontalpodautoscaler.go @@ -149,8 +149,8 @@ func (c *horizontalPodAutoscalers) List(opts v1.ListOptions) (result *v2alpha1.H // Watch returns a watch.Interface that watches the requested horizontalPodAutoscalers. func (c *horizontalPodAutoscalers) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("horizontalpodautoscalers"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v1/job.go b/pkg/client/clientset_generated/clientset/typed/batch/v1/job.go index 7b6949c1d0c..63b223ce4be 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v1/job.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v1/job.go @@ -149,8 +149,8 @@ func (c *jobs) List(opts meta_v1.ListOptions) (result *v1.JobList, err error) { // Watch returns a watch.Interface that watches the requested jobs. func (c *jobs) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("jobs"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/cronjob.go b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/cronjob.go index 15bb0cc6e3f..bcf2b75f708 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/cronjob.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/cronjob.go @@ -149,8 +149,8 @@ func (c *cronJobs) List(opts v1.ListOptions) (result *v2alpha1.CronJobList, err // Watch returns a watch.Interface that watches the requested cronJobs. func (c *cronJobs) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("cronjobs"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/job.go b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/job.go index 88061625bd9..ce2f37289aa 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/job.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/job.go @@ -149,8 +149,8 @@ func (c *jobs) List(opts v1.ListOptions) (result *v2alpha1.JobList, err error) { // Watch returns a watch.Interface that watches the requested jobs. func (c *jobs) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("jobs"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificatesigningrequest.go b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificatesigningrequest.go index f506726897b..e30b929eaab 100644 --- a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificatesigningrequest.go +++ b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificatesigningrequest.go @@ -140,8 +140,8 @@ func (c *certificateSigningRequests) List(opts v1.ListOptions) (result *v1beta1. // Watch returns a watch.Interface that watches the requested certificateSigningRequests. func (c *certificateSigningRequests) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Resource("certificatesigningrequests"). VersionedParams(&opts, scheme.ParameterCodec). Watch() diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/componentstatus.go b/pkg/client/clientset_generated/clientset/typed/core/v1/componentstatus.go index 7431932f2a5..1e4d6e0fe87 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/componentstatus.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/componentstatus.go @@ -124,8 +124,8 @@ func (c *componentStatuses) List(opts meta_v1.ListOptions) (result *v1.Component // Watch returns a watch.Interface that watches the requested componentStatuses. func (c *componentStatuses) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Resource("componentstatuses"). VersionedParams(&opts, scheme.ParameterCodec). Watch() diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/configmap.go b/pkg/client/clientset_generated/clientset/typed/core/v1/configmap.go index 989fb00746b..7175491288f 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/configmap.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/configmap.go @@ -132,8 +132,8 @@ func (c *configMaps) List(opts meta_v1.ListOptions) (result *v1.ConfigMapList, e // Watch returns a watch.Interface that watches the requested configMaps. func (c *configMaps) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("configmaps"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/endpoints.go b/pkg/client/clientset_generated/clientset/typed/core/v1/endpoints.go index f7863582528..8b06ed802e2 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/endpoints.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/endpoints.go @@ -132,8 +132,8 @@ func (c *endpoints) List(opts meta_v1.ListOptions) (result *v1.EndpointsList, er // Watch returns a watch.Interface that watches the requested endpoints. func (c *endpoints) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("endpoints"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/event.go b/pkg/client/clientset_generated/clientset/typed/core/v1/event.go index 519e1674689..72544caea8c 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/event.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/event.go @@ -132,8 +132,8 @@ func (c *events) List(opts meta_v1.ListOptions) (result *v1.EventList, err error // Watch returns a watch.Interface that watches the requested events. func (c *events) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("events"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/limitrange.go b/pkg/client/clientset_generated/clientset/typed/core/v1/limitrange.go index 33dd84af5c2..d9d73491358 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/limitrange.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/limitrange.go @@ -132,8 +132,8 @@ func (c *limitRanges) List(opts meta_v1.ListOptions) (result *v1.LimitRangeList, // Watch returns a watch.Interface that watches the requested limitRanges. func (c *limitRanges) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("limitranges"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/namespace.go b/pkg/client/clientset_generated/clientset/typed/core/v1/namespace.go index 6a50519acfb..2b6e1daed7a 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/namespace.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/namespace.go @@ -140,8 +140,8 @@ func (c *namespaces) List(opts meta_v1.ListOptions) (result *v1.NamespaceList, e // Watch returns a watch.Interface that watches the requested namespaces. func (c *namespaces) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Resource("namespaces"). VersionedParams(&opts, scheme.ParameterCodec). Watch() diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/node.go b/pkg/client/clientset_generated/clientset/typed/core/v1/node.go index 2f3e6a0b2be..c3aa1a1ae94 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/node.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/node.go @@ -140,8 +140,8 @@ func (c *nodes) List(opts meta_v1.ListOptions) (result *v1.NodeList, err error) // Watch returns a watch.Interface that watches the requested nodes. func (c *nodes) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Resource("nodes"). VersionedParams(&opts, scheme.ParameterCodec). Watch() diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/persistentvolume.go b/pkg/client/clientset_generated/clientset/typed/core/v1/persistentvolume.go index 8a384454b11..82af0e99fa9 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/persistentvolume.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/persistentvolume.go @@ -140,8 +140,8 @@ func (c *persistentVolumes) List(opts meta_v1.ListOptions) (result *v1.Persisten // Watch returns a watch.Interface that watches the requested persistentVolumes. func (c *persistentVolumes) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Resource("persistentvolumes"). VersionedParams(&opts, scheme.ParameterCodec). Watch() diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/persistentvolumeclaim.go b/pkg/client/clientset_generated/clientset/typed/core/v1/persistentvolumeclaim.go index 75740ac2d00..45f9c160b2c 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/persistentvolumeclaim.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/persistentvolumeclaim.go @@ -149,8 +149,8 @@ func (c *persistentVolumeClaims) List(opts meta_v1.ListOptions) (result *v1.Pers // Watch returns a watch.Interface that watches the requested persistentVolumeClaims. func (c *persistentVolumeClaims) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("persistentvolumeclaims"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/pod.go b/pkg/client/clientset_generated/clientset/typed/core/v1/pod.go index aca57686e8c..68e574e9f4f 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/pod.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/pod.go @@ -149,8 +149,8 @@ func (c *pods) List(opts meta_v1.ListOptions) (result *v1.PodList, err error) { // Watch returns a watch.Interface that watches the requested pods. func (c *pods) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("pods"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/podtemplate.go b/pkg/client/clientset_generated/clientset/typed/core/v1/podtemplate.go index 23b146117f8..133b6706b8c 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/podtemplate.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/podtemplate.go @@ -132,8 +132,8 @@ func (c *podTemplates) List(opts meta_v1.ListOptions) (result *v1.PodTemplateLis // Watch returns a watch.Interface that watches the requested podTemplates. func (c *podTemplates) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("podtemplates"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/replicationcontroller.go b/pkg/client/clientset_generated/clientset/typed/core/v1/replicationcontroller.go index 2858e15255f..7914e4a0d1f 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/replicationcontroller.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/replicationcontroller.go @@ -149,8 +149,8 @@ func (c *replicationControllers) List(opts meta_v1.ListOptions) (result *v1.Repl // Watch returns a watch.Interface that watches the requested replicationControllers. func (c *replicationControllers) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("replicationcontrollers"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/resourcequota.go b/pkg/client/clientset_generated/clientset/typed/core/v1/resourcequota.go index e67c6283898..0e9380fddf9 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/resourcequota.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/resourcequota.go @@ -149,8 +149,8 @@ func (c *resourceQuotas) List(opts meta_v1.ListOptions) (result *v1.ResourceQuot // Watch returns a watch.Interface that watches the requested resourceQuotas. func (c *resourceQuotas) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("resourcequotas"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/secret.go b/pkg/client/clientset_generated/clientset/typed/core/v1/secret.go index afc7f6a28f5..29435d8a5f7 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/secret.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/secret.go @@ -132,8 +132,8 @@ func (c *secrets) List(opts meta_v1.ListOptions) (result *v1.SecretList, err err // Watch returns a watch.Interface that watches the requested secrets. func (c *secrets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("secrets"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/service.go b/pkg/client/clientset_generated/clientset/typed/core/v1/service.go index 32d4f26bf42..41b5573c993 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/service.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/service.go @@ -149,8 +149,8 @@ func (c *services) List(opts meta_v1.ListOptions) (result *v1.ServiceList, err e // Watch returns a watch.Interface that watches the requested services. func (c *services) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("services"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/serviceaccount.go b/pkg/client/clientset_generated/clientset/typed/core/v1/serviceaccount.go index 52e0ac104db..b8e70ed5cbc 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/serviceaccount.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/serviceaccount.go @@ -132,8 +132,8 @@ func (c *serviceAccounts) List(opts meta_v1.ListOptions) (result *v1.ServiceAcco // Watch returns a watch.Interface that watches the requested serviceAccounts. func (c *serviceAccounts) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("serviceaccounts"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/daemonset.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/daemonset.go index 88bcae68dd8..f55eb1e696d 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/daemonset.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/daemonset.go @@ -149,8 +149,8 @@ func (c *daemonSets) List(opts v1.ListOptions) (result *v1beta1.DaemonSetList, e // Watch returns a watch.Interface that watches the requested daemonSets. func (c *daemonSets) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("daemonsets"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/deployment.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/deployment.go index 1d14bf63fa0..a632d8ba5f1 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/deployment.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/deployment.go @@ -149,8 +149,8 @@ func (c *deployments) List(opts v1.ListOptions) (result *v1beta1.DeploymentList, // Watch returns a watch.Interface that watches the requested deployments. func (c *deployments) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("deployments"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/ingress.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/ingress.go index 4fd538e8cd7..8df8772f12d 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/ingress.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/ingress.go @@ -149,8 +149,8 @@ func (c *ingresses) List(opts v1.ListOptions) (result *v1beta1.IngressList, err // Watch returns a watch.Interface that watches the requested ingresses. func (c *ingresses) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("ingresses"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/podsecuritypolicy.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/podsecuritypolicy.go index bac5f3978fd..d8ef5b89a66 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/podsecuritypolicy.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/podsecuritypolicy.go @@ -124,8 +124,8 @@ func (c *podSecurityPolicies) List(opts v1.ListOptions) (result *v1beta1.PodSecu // Watch returns a watch.Interface that watches the requested podSecurityPolicies. func (c *podSecurityPolicies) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Resource("podsecuritypolicies"). VersionedParams(&opts, scheme.ParameterCodec). Watch() diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/replicaset.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/replicaset.go index 55eddb2c67b..f9c61d69871 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/replicaset.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/replicaset.go @@ -149,8 +149,8 @@ func (c *replicaSets) List(opts v1.ListOptions) (result *v1beta1.ReplicaSetList, // Watch returns a watch.Interface that watches the requested replicaSets. func (c *replicaSets) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("replicasets"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/thirdpartyresource.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/thirdpartyresource.go index 6047bc488db..cf1b52864d9 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/thirdpartyresource.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/thirdpartyresource.go @@ -124,8 +124,8 @@ func (c *thirdPartyResources) List(opts v1.ListOptions) (result *v1beta1.ThirdPa // Watch returns a watch.Interface that watches the requested thirdPartyResources. func (c *thirdPartyResources) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Resource("thirdpartyresources"). VersionedParams(&opts, scheme.ParameterCodec). Watch() diff --git a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/poddisruptionbudget.go b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/poddisruptionbudget.go index 7c5a4832ad9..c32f95d42b4 100644 --- a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/poddisruptionbudget.go +++ b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/poddisruptionbudget.go @@ -149,8 +149,8 @@ func (c *podDisruptionBudgets) List(opts v1.ListOptions) (result *v1beta1.PodDis // Watch returns a watch.Interface that watches the requested podDisruptionBudgets. func (c *podDisruptionBudgets) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("poddisruptionbudgets"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrole.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrole.go index 39750c8437d..4e41cad06a4 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrole.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrole.go @@ -124,8 +124,8 @@ func (c *clusterRoles) List(opts v1.ListOptions) (result *v1alpha1.ClusterRoleLi // Watch returns a watch.Interface that watches the requested clusterRoles. func (c *clusterRoles) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Resource("clusterroles"). VersionedParams(&opts, scheme.ParameterCodec). Watch() diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrolebinding.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrolebinding.go index 27d290c3d41..759d57adfd6 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrolebinding.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrolebinding.go @@ -124,8 +124,8 @@ func (c *clusterRoleBindings) List(opts v1.ListOptions) (result *v1alpha1.Cluste // Watch returns a watch.Interface that watches the requested clusterRoleBindings. func (c *clusterRoleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Resource("clusterrolebindings"). VersionedParams(&opts, scheme.ParameterCodec). Watch() diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/role.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/role.go index 6af24abe2b1..900e1cc1e40 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/role.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/role.go @@ -132,8 +132,8 @@ func (c *roles) List(opts v1.ListOptions) (result *v1alpha1.RoleList, err error) // Watch returns a watch.Interface that watches the requested roles. func (c *roles) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("roles"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rolebinding.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rolebinding.go index 12845116b45..63481f0ad74 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rolebinding.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rolebinding.go @@ -132,8 +132,8 @@ func (c *roleBindings) List(opts v1.ListOptions) (result *v1alpha1.RoleBindingLi // Watch returns a watch.Interface that watches the requested roleBindings. func (c *roleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("rolebindings"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrole.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrole.go index 0a8d00e8f95..767f784f7d5 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrole.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrole.go @@ -124,8 +124,8 @@ func (c *clusterRoles) List(opts v1.ListOptions) (result *v1beta1.ClusterRoleLis // Watch returns a watch.Interface that watches the requested clusterRoles. func (c *clusterRoles) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Resource("clusterroles"). VersionedParams(&opts, scheme.ParameterCodec). Watch() diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrolebinding.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrolebinding.go index e9b318ba235..d629b13aff4 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrolebinding.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrolebinding.go @@ -124,8 +124,8 @@ func (c *clusterRoleBindings) List(opts v1.ListOptions) (result *v1beta1.Cluster // Watch returns a watch.Interface that watches the requested clusterRoleBindings. func (c *clusterRoleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Resource("clusterrolebindings"). VersionedParams(&opts, scheme.ParameterCodec). Watch() diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/role.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/role.go index 76cf84e8019..cc6a217e2fd 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/role.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/role.go @@ -132,8 +132,8 @@ func (c *roles) List(opts v1.ListOptions) (result *v1beta1.RoleList, err error) // Watch returns a watch.Interface that watches the requested roles. func (c *roles) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("roles"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rolebinding.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rolebinding.go index 0f1b03fa389..5c87ad1e686 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rolebinding.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rolebinding.go @@ -132,8 +132,8 @@ func (c *roleBindings) List(opts v1.ListOptions) (result *v1beta1.RoleBindingLis // Watch returns a watch.Interface that watches the requested roleBindings. func (c *roleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("rolebindings"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storageclass.go b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storageclass.go index 2d1d549395b..69fb440ee2c 100644 --- a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storageclass.go +++ b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storageclass.go @@ -124,8 +124,8 @@ func (c *storageClasses) List(opts v1.ListOptions) (result *v1beta1.StorageClass // Watch returns a watch.Interface that watches the requested storageClasses. func (c *storageClasses) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Resource("storageclasses"). VersionedParams(&opts, scheme.ParameterCodec). Watch() diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/statefulset.go b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/statefulset.go index a4d959a8468..a7742d27de5 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/statefulset.go +++ b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/statefulset.go @@ -149,8 +149,8 @@ func (c *statefulSets) List(opts v1.ListOptions) (result *apps.StatefulSetList, // Watch returns a watch.Interface that watches the requested statefulSets. func (c *statefulSets) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("statefulsets"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/horizontalpodautoscaler.go b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/horizontalpodautoscaler.go index bada1520f71..662581aad77 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/horizontalpodautoscaler.go +++ b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/horizontalpodautoscaler.go @@ -149,8 +149,8 @@ func (c *horizontalPodAutoscalers) List(opts v1.ListOptions) (result *autoscalin // Watch returns a watch.Interface that watches the requested horizontalPodAutoscalers. func (c *horizontalPodAutoscalers) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("horizontalpodautoscalers"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/cronjob.go b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/cronjob.go index 7df0cf87965..6404040d27e 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/cronjob.go +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/cronjob.go @@ -149,8 +149,8 @@ func (c *cronJobs) List(opts v1.ListOptions) (result *batch.CronJobList, err err // Watch returns a watch.Interface that watches the requested cronJobs. func (c *cronJobs) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("cronjobs"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/job.go b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/job.go index e7da9d7a881..f32eaef8e16 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/job.go +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/job.go @@ -149,8 +149,8 @@ func (c *jobs) List(opts v1.ListOptions) (result *batch.JobList, err error) { // Watch returns a watch.Interface that watches the requested jobs. func (c *jobs) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("jobs"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificatesigningrequest.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificatesigningrequest.go index d5e1cd3bd77..a1069d46308 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificatesigningrequest.go +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificatesigningrequest.go @@ -140,8 +140,8 @@ func (c *certificateSigningRequests) List(opts v1.ListOptions) (result *certific // Watch returns a watch.Interface that watches the requested certificateSigningRequests. func (c *certificateSigningRequests) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Resource("certificatesigningrequests"). VersionedParams(&opts, scheme.ParameterCodec). Watch() diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/componentstatus.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/componentstatus.go index a057c3e49d2..348ff07c52c 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/componentstatus.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/componentstatus.go @@ -124,8 +124,8 @@ func (c *componentStatuses) List(opts v1.ListOptions) (result *api.ComponentStat // Watch returns a watch.Interface that watches the requested componentStatuses. func (c *componentStatuses) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Resource("componentstatuses"). VersionedParams(&opts, scheme.ParameterCodec). Watch() diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/configmap.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/configmap.go index 1bb0b03ac86..d7a0ac2512d 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/configmap.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/configmap.go @@ -132,8 +132,8 @@ func (c *configMaps) List(opts v1.ListOptions) (result *api.ConfigMapList, err e // Watch returns a watch.Interface that watches the requested configMaps. func (c *configMaps) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("configmaps"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/endpoints.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/endpoints.go index 9dc0d6e117c..e759feb5864 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/endpoints.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/endpoints.go @@ -132,8 +132,8 @@ func (c *endpoints) List(opts v1.ListOptions) (result *api.EndpointsList, err er // Watch returns a watch.Interface that watches the requested endpoints. func (c *endpoints) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("endpoints"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/event.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/event.go index 537dcfb46bf..03d0b9dd3bf 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/event.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/event.go @@ -132,8 +132,8 @@ func (c *events) List(opts v1.ListOptions) (result *api.EventList, err error) { // Watch returns a watch.Interface that watches the requested events. func (c *events) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("events"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/limitrange.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/limitrange.go index 6e84744e5c6..0802fe404d3 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/limitrange.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/limitrange.go @@ -132,8 +132,8 @@ func (c *limitRanges) List(opts v1.ListOptions) (result *api.LimitRangeList, err // Watch returns a watch.Interface that watches the requested limitRanges. func (c *limitRanges) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("limitranges"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/namespace.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/namespace.go index 9c9361ef8a0..a6755e699e6 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/namespace.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/namespace.go @@ -140,8 +140,8 @@ func (c *namespaces) List(opts v1.ListOptions) (result *api.NamespaceList, err e // Watch returns a watch.Interface that watches the requested namespaces. func (c *namespaces) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Resource("namespaces"). VersionedParams(&opts, scheme.ParameterCodec). Watch() diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/node.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/node.go index 5cb761a7e2c..0156fcf47a8 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/node.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/node.go @@ -140,8 +140,8 @@ func (c *nodes) List(opts v1.ListOptions) (result *api.NodeList, err error) { // Watch returns a watch.Interface that watches the requested nodes. func (c *nodes) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Resource("nodes"). VersionedParams(&opts, scheme.ParameterCodec). Watch() diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolume.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolume.go index 8d63c730f15..5897fc307b3 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolume.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolume.go @@ -140,8 +140,8 @@ func (c *persistentVolumes) List(opts v1.ListOptions) (result *api.PersistentVol // Watch returns a watch.Interface that watches the requested persistentVolumes. func (c *persistentVolumes) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Resource("persistentvolumes"). VersionedParams(&opts, scheme.ParameterCodec). Watch() diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolumeclaim.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolumeclaim.go index 1138e87fc0f..b4f985c7486 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolumeclaim.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolumeclaim.go @@ -149,8 +149,8 @@ func (c *persistentVolumeClaims) List(opts v1.ListOptions) (result *api.Persiste // Watch returns a watch.Interface that watches the requested persistentVolumeClaims. func (c *persistentVolumeClaims) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("persistentvolumeclaims"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/pod.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/pod.go index 193a02f2eb0..daf3b567c66 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/pod.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/pod.go @@ -149,8 +149,8 @@ func (c *pods) List(opts v1.ListOptions) (result *api.PodList, err error) { // Watch returns a watch.Interface that watches the requested pods. func (c *pods) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("pods"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/podtemplate.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/podtemplate.go index 79bb1572e81..7b48fbdbe6f 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/podtemplate.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/podtemplate.go @@ -132,8 +132,8 @@ func (c *podTemplates) List(opts v1.ListOptions) (result *api.PodTemplateList, e // Watch returns a watch.Interface that watches the requested podTemplates. func (c *podTemplates) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("podtemplates"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/replicationcontroller.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/replicationcontroller.go index 64008ae8b70..c1948939c47 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/replicationcontroller.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/replicationcontroller.go @@ -149,8 +149,8 @@ func (c *replicationControllers) List(opts v1.ListOptions) (result *api.Replicat // Watch returns a watch.Interface that watches the requested replicationControllers. func (c *replicationControllers) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("replicationcontrollers"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/resourcequota.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/resourcequota.go index d2e13b9f715..90ab618f948 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/resourcequota.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/resourcequota.go @@ -149,8 +149,8 @@ func (c *resourceQuotas) List(opts v1.ListOptions) (result *api.ResourceQuotaLis // Watch returns a watch.Interface that watches the requested resourceQuotas. func (c *resourceQuotas) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("resourcequotas"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/secret.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/secret.go index e45b7ec2284..81367372c84 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/secret.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/secret.go @@ -132,8 +132,8 @@ func (c *secrets) List(opts v1.ListOptions) (result *api.SecretList, err error) // Watch returns a watch.Interface that watches the requested secrets. func (c *secrets) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("secrets"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/service.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/service.go index f555eab150c..d0fcc462051 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/service.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/service.go @@ -149,8 +149,8 @@ func (c *services) List(opts v1.ListOptions) (result *api.ServiceList, err error // Watch returns a watch.Interface that watches the requested services. func (c *services) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("services"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/serviceaccount.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/serviceaccount.go index 6ed306e62cb..589a4dbc4ed 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/serviceaccount.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/serviceaccount.go @@ -132,8 +132,8 @@ func (c *serviceAccounts) List(opts v1.ListOptions) (result *api.ServiceAccountL // Watch returns a watch.Interface that watches the requested serviceAccounts. func (c *serviceAccounts) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("serviceaccounts"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/daemonset.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/daemonset.go index 6f272838a19..b328e2526b8 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/daemonset.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/daemonset.go @@ -149,8 +149,8 @@ func (c *daemonSets) List(opts v1.ListOptions) (result *extensions.DaemonSetList // Watch returns a watch.Interface that watches the requested daemonSets. func (c *daemonSets) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("daemonsets"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/deployment.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/deployment.go index eb9d4468221..a83f30cc91f 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/deployment.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/deployment.go @@ -149,8 +149,8 @@ func (c *deployments) List(opts v1.ListOptions) (result *extensions.DeploymentLi // Watch returns a watch.Interface that watches the requested deployments. func (c *deployments) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("deployments"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/ingress.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/ingress.go index 7a6a7bc3638..8d320f2112a 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/ingress.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/ingress.go @@ -149,8 +149,8 @@ func (c *ingresses) List(opts v1.ListOptions) (result *extensions.IngressList, e // Watch returns a watch.Interface that watches the requested ingresses. func (c *ingresses) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("ingresses"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/networkpolicy.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/networkpolicy.go index 2508119114d..3ac6e79d77f 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/networkpolicy.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/networkpolicy.go @@ -132,8 +132,8 @@ func (c *networkPolicies) List(opts v1.ListOptions) (result *extensions.NetworkP // Watch returns a watch.Interface that watches the requested networkPolicies. func (c *networkPolicies) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("networkpolicies"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/podsecuritypolicy.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/podsecuritypolicy.go index 7f30f1cd08b..a29fd32d0cd 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/podsecuritypolicy.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/podsecuritypolicy.go @@ -124,8 +124,8 @@ func (c *podSecurityPolicies) List(opts v1.ListOptions) (result *extensions.PodS // Watch returns a watch.Interface that watches the requested podSecurityPolicies. func (c *podSecurityPolicies) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Resource("podsecuritypolicies"). VersionedParams(&opts, scheme.ParameterCodec). Watch() diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/replicaset.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/replicaset.go index 9161c48e4b6..af87c0431d9 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/replicaset.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/replicaset.go @@ -149,8 +149,8 @@ func (c *replicaSets) List(opts v1.ListOptions) (result *extensions.ReplicaSetLi // Watch returns a watch.Interface that watches the requested replicaSets. func (c *replicaSets) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("replicasets"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/thirdpartyresource.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/thirdpartyresource.go index d7be1820481..dba3ae3f1ef 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/thirdpartyresource.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/thirdpartyresource.go @@ -124,8 +124,8 @@ func (c *thirdPartyResources) List(opts v1.ListOptions) (result *extensions.Thir // Watch returns a watch.Interface that watches the requested thirdPartyResources. func (c *thirdPartyResources) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Resource("thirdpartyresources"). VersionedParams(&opts, scheme.ParameterCodec). Watch() diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/poddisruptionbudget.go b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/poddisruptionbudget.go index 8ae3a7268a5..e558a80e963 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/poddisruptionbudget.go +++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/poddisruptionbudget.go @@ -149,8 +149,8 @@ func (c *podDisruptionBudgets) List(opts v1.ListOptions) (result *policy.PodDisr // Watch returns a watch.Interface that watches the requested podDisruptionBudgets. func (c *podDisruptionBudgets) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("poddisruptionbudgets"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrole.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrole.go index 6099dff445e..b8e98b3d497 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrole.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrole.go @@ -124,8 +124,8 @@ func (c *clusterRoles) List(opts v1.ListOptions) (result *rbac.ClusterRoleList, // Watch returns a watch.Interface that watches the requested clusterRoles. func (c *clusterRoles) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Resource("clusterroles"). VersionedParams(&opts, scheme.ParameterCodec). Watch() diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrolebinding.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrolebinding.go index 467e4131a13..dd0e5dfc7d6 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrolebinding.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrolebinding.go @@ -124,8 +124,8 @@ func (c *clusterRoleBindings) List(opts v1.ListOptions) (result *rbac.ClusterRol // Watch returns a watch.Interface that watches the requested clusterRoleBindings. func (c *clusterRoleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Resource("clusterrolebindings"). VersionedParams(&opts, scheme.ParameterCodec). Watch() diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/role.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/role.go index 09ef7cfb3aa..8c6c12e6451 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/role.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/role.go @@ -132,8 +132,8 @@ func (c *roles) List(opts v1.ListOptions) (result *rbac.RoleList, err error) { // Watch returns a watch.Interface that watches the requested roles. func (c *roles) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("roles"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rolebinding.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rolebinding.go index ac505255a4d..7fb6721fabc 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rolebinding.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rolebinding.go @@ -132,8 +132,8 @@ func (c *roleBindings) List(opts v1.ListOptions) (result *rbac.RoleBindingList, // Watch returns a watch.Interface that watches the requested roleBindings. func (c *roleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Namespace(c.ns). Resource("rolebindings"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storageclass.go b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storageclass.go index f9045115d05..531f1b21862 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storageclass.go +++ b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storageclass.go @@ -124,8 +124,8 @@ func (c *storageClasses) List(opts v1.ListOptions) (result *storage.StorageClass // Watch returns a watch.Interface that watches the requested storageClasses. func (c *storageClasses) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Resource("storageclasses"). VersionedParams(&opts, scheme.ParameterCodec). Watch() diff --git a/pkg/client/tests/listwatch_test.go b/pkg/client/tests/listwatch_test.go index 18ba412f866..03a4e05c49a 100644 --- a/pkg/client/tests/listwatch_test.go +++ b/pkg/client/tests/listwatch_test.go @@ -122,8 +122,8 @@ func TestListWatchesCanWatch(t *testing.T) { // Node { location: buildLocation( - testapi.Default.ResourcePathWithPrefix("watch", "nodes", metav1.NamespaceAll, ""), - buildQueryValues(url.Values{})), + testapi.Default.ResourcePath("nodes", metav1.NamespaceAll, ""), + buildQueryValues(url.Values{"watch": []string{"true"}})), rv: "", resource: "nodes", namespace: metav1.NamespaceAll, @@ -131,8 +131,8 @@ func TestListWatchesCanWatch(t *testing.T) { }, { location: buildLocation( - testapi.Default.ResourcePathWithPrefix("watch", "nodes", metav1.NamespaceAll, ""), - buildQueryValues(url.Values{"resourceVersion": []string{"42"}})), + testapi.Default.ResourcePath("nodes", metav1.NamespaceAll, ""), + buildQueryValues(url.Values{"resourceVersion": []string{"42"}, "watch": []string{"true"}})), rv: "42", resource: "nodes", namespace: metav1.NamespaceAll, @@ -141,8 +141,8 @@ func TestListWatchesCanWatch(t *testing.T) { // pod with "assigned" field selector. { location: buildLocation( - testapi.Default.ResourcePathWithPrefix("watch", "pods", metav1.NamespaceAll, ""), - buildQueryValues(url.Values{fieldSelectorQueryParamName: []string{"spec.host="}, "resourceVersion": []string{"0"}})), + testapi.Default.ResourcePath("pods", metav1.NamespaceAll, ""), + buildQueryValues(url.Values{fieldSelectorQueryParamName: []string{"spec.host="}, "resourceVersion": []string{"0"}, "watch": []string{"true"}})), rv: "0", resource: "pods", namespace: metav1.NamespaceAll, @@ -151,8 +151,8 @@ func TestListWatchesCanWatch(t *testing.T) { // pod with namespace foo and assigned field selector { location: buildLocation( - testapi.Default.ResourcePathWithPrefix("watch", "pods", "foo", ""), - buildQueryValues(url.Values{fieldSelectorQueryParamName: []string{"spec.host="}, "resourceVersion": []string{"0"}})), + testapi.Default.ResourcePath("pods", "foo", ""), + buildQueryValues(url.Values{fieldSelectorQueryParamName: []string{"spec.host="}, "resourceVersion": []string{"0"}, "watch": []string{"true"}})), rv: "0", resource: "pods", namespace: "foo", diff --git a/pkg/controller/garbagecollector/garbagecollector.go b/pkg/controller/garbagecollector/garbagecollector.go index a94d3e37ff8..3e61ce18e83 100644 --- a/pkg/controller/garbagecollector/garbagecollector.go +++ b/pkg/controller/garbagecollector/garbagecollector.go @@ -460,7 +460,7 @@ func gcListWatcher(client *dynamic.Client, resource schema.GroupVersionResource) apiResource := metav1.APIResource{Name: resource.Resource} return client.ParameterCodec(dynamic.VersionedParameterEncoderWithV1Fallback). Resource(&apiResource, metav1.NamespaceAll). - List(&options) + List(options) }, WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { // APIResource.Kind is not used by the dynamic client, so @@ -470,7 +470,7 @@ func gcListWatcher(client *dynamic.Client, resource schema.GroupVersionResource) apiResource := metav1.APIResource{Name: resource.Resource} return client.ParameterCodec(dynamic.VersionedParameterEncoderWithV1Fallback). Resource(&apiResource, metav1.NamespaceAll). - Watch(&options) + Watch(options) }, } } diff --git a/pkg/controller/garbagecollector/garbagecollector_test.go b/pkg/controller/garbagecollector/garbagecollector_test.go index 7f741dddc27..ff658feda4b 100644 --- a/pkg/controller/garbagecollector/garbagecollector_test.go +++ b/pkg/controller/garbagecollector/garbagecollector_test.go @@ -354,7 +354,7 @@ func TestGCListWatcher(t *testing.T) { if e, a := 2, len(testHandler.actions); e != a { t.Errorf("expect %d requests, got %d", e, a) } - if e, a := "resourceVersion=1", testHandler.actions[0].query; e != a { + if e, a := "resourceVersion=1&watch=true", testHandler.actions[0].query; e != a { t.Errorf("expect %s, got %s", e, a) } if e, a := "resourceVersion=1", testHandler.actions[1].query; e != a { diff --git a/pkg/controller/namespace/deletion/namespaced_resources_deleter.go b/pkg/controller/namespace/deletion/namespaced_resources_deleter.go index becfc2d6e7d..2efad6a51e2 100644 --- a/pkg/controller/namespace/deletion/namespaced_resources_deleter.go +++ b/pkg/controller/namespace/deletion/namespaced_resources_deleter.go @@ -341,7 +341,7 @@ func (d *namespacedResourcesDeleter) deleteCollection( // resource deletions generically. it will ensure all resources in the namespace are purged prior to releasing // namespace itself. orphanDependents := false - err := dynamicClient.Resource(&apiResource, namespace).DeleteCollection(&metav1.DeleteOptions{OrphanDependents: &orphanDependents}, &metav1.ListOptions{}) + err := dynamicClient.Resource(&apiResource, namespace).DeleteCollection(&metav1.DeleteOptions{OrphanDependents: &orphanDependents}, metav1.ListOptions{}) if err == nil { return true, nil @@ -379,7 +379,7 @@ func (d *namespacedResourcesDeleter) listCollection( } apiResource := metav1.APIResource{Name: gvr.Resource, Namespaced: true} - obj, err := dynamicClient.Resource(&apiResource, namespace).List(&metav1.ListOptions{}) + obj, err := dynamicClient.Resource(&apiResource, namespace).List(metav1.ListOptions{}) if err == nil { unstructuredList, ok := obj.(*unstructured.UnstructuredList) if !ok { diff --git a/pkg/kubectl/cmd/get_test.go b/pkg/kubectl/cmd/get_test.go index 8bd6e4be479..db24a618151 100644 --- a/pkg/kubectl/cmd/get_test.go +++ b/pkg/kubectl/cmd/get_test.go @@ -767,9 +767,11 @@ func TestWatchSelector(t *testing.T) { } switch req.URL.Path { case "/namespaces/test/pods": - return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: objBody(codec, podList)}, nil - case "/watch/namespaces/test/pods": - return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: watchBody(codec, events[2:])}, nil + if req.URL.Query().Get("watch") == "true" { + return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: watchBody(codec, events[2:])}, nil + } else { + return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: objBody(codec, podList)}, nil + } default: t.Fatalf("unexpected request: %#v\n%#v", req.URL, req) return nil, nil @@ -807,8 +809,12 @@ func TestWatchResource(t *testing.T) { switch req.URL.Path { case "/namespaces/test/pods/foo": return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: objBody(codec, &pods[1])}, nil - case "/watch/namespaces/test/pods/foo": - return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: watchBody(codec, events[1:])}, nil + case "/namespaces/test/pods": + if req.URL.Query().Get("watch") == "true" && req.URL.Query().Get("fieldSelector") == "metadata.name=foo" { + return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: watchBody(codec, events[1:])}, nil + } + t.Fatalf("unexpected request: %#v\n%#v", req.URL, req) + return nil, nil default: t.Fatalf("unexpected request: %#v\n%#v", req.URL, req) return nil, nil @@ -845,8 +851,12 @@ func TestWatchResourceIdentifiedByFile(t *testing.T) { switch req.URL.Path { case "/namespaces/test/replicationcontrollers/cassandra": return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: objBody(codec, &pods[1])}, nil - case "/watch/namespaces/test/replicationcontrollers/cassandra": - return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: watchBody(codec, events[1:])}, nil + case "/namespaces/test/replicationcontrollers": + if req.URL.Query().Get("watch") == "true" && req.URL.Query().Get("fieldSelector") == "metadata.name=cassandra" { + return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: watchBody(codec, events[1:])}, nil + } + t.Fatalf("unexpected request: %#v\n%#v", req.URL, req) + return nil, nil default: t.Fatalf("unexpected request: %#v\n%#v", req.URL, req) return nil, nil @@ -884,8 +894,12 @@ func TestWatchOnlyResource(t *testing.T) { switch req.URL.Path { case "/namespaces/test/pods/foo": return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: objBody(codec, &pods[1])}, nil - case "/watch/namespaces/test/pods/foo": - return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: watchBody(codec, events[1:])}, nil + case "/namespaces/test/pods": + if req.URL.Query().Get("watch") == "true" && req.URL.Query().Get("fieldSelector") == "metadata.name=foo" { + return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: watchBody(codec, events[1:])}, nil + } + t.Fatalf("unexpected request: %#v\n%#v", req.URL, req) + return nil, nil default: t.Fatalf("unexpected request: %#v\n%#v", req.URL, req) return nil, nil @@ -927,9 +941,11 @@ func TestWatchOnlyList(t *testing.T) { Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) { switch req.URL.Path { case "/namespaces/test/pods": - return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: objBody(codec, podList)}, nil - case "/watch/namespaces/test/pods": - return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: watchBody(codec, events[2:])}, nil + if req.URL.Query().Get("watch") == "true" { + return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: watchBody(codec, events[2:])}, nil + } else { + return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: objBody(codec, podList)}, nil + } default: t.Fatalf("unexpected request: %#v\n%#v", req.URL, req) return nil, nil diff --git a/pkg/kubectl/resource/BUILD b/pkg/kubectl/resource/BUILD index 375d3146efc..1bdf515f1bf 100644 --- a/pkg/kubectl/resource/BUILD +++ b/pkg/kubectl/resource/BUILD @@ -31,6 +31,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/api/meta", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", diff --git a/pkg/kubectl/resource/builder_test.go b/pkg/kubectl/resource/builder_test.go index 33cfb68c221..99b832deb33 100644 --- a/pkg/kubectl/resource/builder_test.go +++ b/pkg/kubectl/resource/builder_test.go @@ -1069,7 +1069,7 @@ func TestListObjectWithDifferentVersions(t *testing.T) { func TestWatch(t *testing.T) { _, svc := testData() w, err := NewBuilder(testapi.Default.RESTMapper(), api.Scheme, fakeClientWith("", t, map[string]string{ - "/watch/namespaces/test/services/redis-master?resourceVersion=12": watchBody(watch.Event{ + "/namespaces/test/services?fieldSelector=metadata.name%3Dredis-master&resourceVersion=12&watch=true": watchBody(watch.Event{ Type: watch.Added, Object: &svc.Items[0], }), diff --git a/pkg/kubectl/resource/helper.go b/pkg/kubectl/resource/helper.go index a7aa39eb1bf..5bb68018387 100644 --- a/pkg/kubectl/resource/helper.go +++ b/pkg/kubectl/resource/helper.go @@ -20,6 +20,7 @@ import ( "strconv" "k8s.io/apimachinery/pkg/api/meta" + "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" @@ -75,21 +76,21 @@ func (m *Helper) List(namespace, apiVersion string, selector labels.Selector, ex func (m *Helper) Watch(namespace, resourceVersion, apiVersion string, labelSelector labels.Selector) (watch.Interface, error) { return m.RESTClient.Get(). - Prefix("watch"). NamespaceIfScoped(namespace, m.NamespaceScoped). Resource(m.Resource). Param("resourceVersion", resourceVersion). + Param("watch", "true"). LabelsSelectorParam(labelSelector). Watch() } func (m *Helper) WatchSingle(namespace, name, resourceVersion string) (watch.Interface, error) { return m.RESTClient.Get(). - Prefix("watch"). NamespaceIfScoped(namespace, m.NamespaceScoped). Resource(m.Resource). - Name(name). Param("resourceVersion", resourceVersion). + Param("watch", "true"). + FieldsSelectorParam(fields.OneTermEqualSelector("metadata.name", name)). Watch() } diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go index f52e7daa7da..83e389d4acf 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go @@ -757,6 +757,7 @@ func TestNotFound(t *testing.T) { "groupless namespaced PUT with extra segment": {"PUT", "/" + grouplessPrefix + "/" + grouplessGroupVersion.Version + "/namespaces/ns/simples/bar/baz", http.StatusNotFound}, "groupless namespaced watch missing storage": {"GET", "/" + grouplessPrefix + "/" + grouplessGroupVersion.Version + "/watch/", http.StatusNotFound}, "groupless namespaced watch with bad method": {"POST", "/" + grouplessPrefix + "/" + grouplessGroupVersion.Version + "/watch/namespaces/ns/simples/bar", http.StatusMethodNotAllowed}, + "groupless namespaced watch param with bad method": {"POST", "/" + grouplessPrefix + "/" + grouplessGroupVersion.Version + "/namespaces/ns/simples/bar?watch=true", http.StatusMethodNotAllowed}, // Positive checks to make sure everything is wired correctly "GET root": {"GET", "/" + prefix + "/" + testGroupVersion.Group + "/" + testGroupVersion.Version + "/simpleroots", http.StatusOK}, @@ -788,6 +789,7 @@ func TestNotFound(t *testing.T) { "namespaced PUT with extra segment": {"PUT", "/" + prefix + "/" + testGroupVersion.Group + "/" + testGroupVersion.Version + "/namespaces/ns/simples/bar/baz", http.StatusNotFound}, "namespaced watch missing storage": {"GET", "/" + prefix + "/" + testGroupVersion.Group + "/" + testGroupVersion.Version + "/watch/", http.StatusNotFound}, "namespaced watch with bad method": {"POST", "/" + prefix + "/" + testGroupVersion.Group + "/" + testGroupVersion.Version + "/watch/namespaces/ns/simples/bar", http.StatusMethodNotAllowed}, + "namespaced watch param with bad method": {"POST", "/" + prefix + "/" + testGroupVersion.Group + "/" + testGroupVersion.Version + "/namespaces/ns/simples/bar?watch=true", http.StatusMethodNotAllowed}, } handler := handle(map[string]rest.Storage{ "simples": &SimpleRESTStorage{}, diff --git a/staging/src/k8s.io/client-go/dynamic/client.go b/staging/src/k8s.io/client-go/dynamic/client.go index 1b4f3aa5e13..34ffe5846de 100644 --- a/staging/src/k8s.io/client-go/dynamic/client.go +++ b/staging/src/k8s.io/client-go/dynamic/client.go @@ -112,7 +112,7 @@ type ResourceClient struct { } // List returns a list of objects for this resource. -func (rc *ResourceClient) List(opts runtime.Object) (runtime.Object, error) { +func (rc *ResourceClient) List(opts metav1.ListOptions) (runtime.Object, error) { parameterEncoder := rc.parameterCodec if parameterEncoder == nil { parameterEncoder = defaultParameterEncoder @@ -120,7 +120,7 @@ func (rc *ResourceClient) List(opts runtime.Object) (runtime.Object, error) { return rc.cl.Get(). NamespaceIfScoped(rc.ns, rc.resource.Namespaced). Resource(rc.resource.Name). - VersionedParams(opts, parameterEncoder). + VersionedParams(&opts, parameterEncoder). Do(). Get() } @@ -149,7 +149,7 @@ func (rc *ResourceClient) Delete(name string, opts *metav1.DeleteOptions) error } // DeleteCollection deletes a collection of objects. -func (rc *ResourceClient) DeleteCollection(deleteOptions *metav1.DeleteOptions, listOptions runtime.Object) error { +func (rc *ResourceClient) DeleteCollection(deleteOptions *metav1.DeleteOptions, listOptions metav1.ListOptions) error { parameterEncoder := rc.parameterCodec if parameterEncoder == nil { parameterEncoder = defaultParameterEncoder @@ -157,7 +157,7 @@ func (rc *ResourceClient) DeleteCollection(deleteOptions *metav1.DeleteOptions, return rc.cl.Delete(). NamespaceIfScoped(rc.ns, rc.resource.Namespaced). Resource(rc.resource.Name). - VersionedParams(listOptions, parameterEncoder). + VersionedParams(&listOptions, parameterEncoder). Body(deleteOptions). Do(). Error() @@ -192,16 +192,16 @@ func (rc *ResourceClient) Update(obj *unstructured.Unstructured) (*unstructured. } // Watch returns a watch.Interface that watches the resource. -func (rc *ResourceClient) Watch(opts runtime.Object) (watch.Interface, error) { +func (rc *ResourceClient) Watch(opts metav1.ListOptions) (watch.Interface, error) { parameterEncoder := rc.parameterCodec if parameterEncoder == nil { parameterEncoder = defaultParameterEncoder } + opts.Watch = true return rc.cl.Get(). - Prefix("watch"). NamespaceIfScoped(rc.ns, rc.resource.Namespaced). Resource(rc.resource.Name). - VersionedParams(opts, parameterEncoder). + VersionedParams(&opts, parameterEncoder). Watch() } diff --git a/staging/src/k8s.io/client-go/dynamic/client_test.go b/staging/src/k8s.io/client-go/dynamic/client_test.go index 0426d7b1456..f0bf8b35d9e 100644 --- a/staging/src/k8s.io/client-go/dynamic/client_test.go +++ b/staging/src/k8s.io/client-go/dynamic/client_test.go @@ -136,7 +136,7 @@ func TestList(t *testing.T) { } defer srv.Close() - got, err := cl.Resource(resource, tc.namespace).List(&metav1.ListOptions{}) + got, err := cl.Resource(resource, tc.namespace).List(metav1.ListOptions{}) if err != nil { t.Errorf("unexpected error when listing %q: %v", tc.name, err) continue @@ -293,7 +293,7 @@ func TestDeleteCollection(t *testing.T) { } defer srv.Close() - err = cl.Resource(resource, tc.namespace).DeleteCollection(nil, &metav1.ListOptions{}) + err = cl.Resource(resource, tc.namespace).DeleteCollection(nil, metav1.ListOptions{}) if err != nil { t.Errorf("unexpected error when deleting collection %q: %v", tc.name, err) continue @@ -425,10 +425,12 @@ func TestWatch(t *testing.T) { namespace string events []watch.Event path string + query string }{ { - name: "normal_watch", - path: "/api/gtest/vtest/watch/rtest", + name: "normal_watch", + path: "/api/gtest/vtest/rtest", + query: "watch=true", events: []watch.Event{ {Type: watch.Added, Object: getObject("vTest", "rTest", "normal_watch")}, {Type: watch.Modified, Object: getObject("vTest", "rTest", "normal_watch")}, @@ -438,7 +440,8 @@ func TestWatch(t *testing.T) { { name: "namespaced_watch", namespace: "nstest", - path: "/api/gtest/vtest/watch/namespaces/nstest/rtest", + path: "/api/gtest/vtest/namespaces/nstest/rtest", + query: "watch=true", events: []watch.Event{ {Type: watch.Added, Object: getObject("vTest", "rTest", "namespaced_watch")}, {Type: watch.Modified, Object: getObject("vTest", "rTest", "namespaced_watch")}, @@ -457,6 +460,9 @@ func TestWatch(t *testing.T) { if r.URL.Path != tc.path { t.Errorf("Watch(%q) got path %s. wanted %s", tc.name, r.URL.Path, tc.path) } + if r.URL.RawQuery != tc.query { + t.Errorf("Watch(%q) got query %s. wanted %s", tc.name, r.URL.RawQuery, tc.query) + } enc := restclientwatch.NewEncoder(streaming.NewEncoder(w, dynamicCodec{}), dynamicCodec{}) for _, e := range tc.events { @@ -469,7 +475,7 @@ func TestWatch(t *testing.T) { } defer srv.Close() - watcher, err := cl.Resource(resource, tc.namespace).Watch(&metav1.ListOptions{}) + watcher, err := cl.Resource(resource, tc.namespace).Watch(metav1.ListOptions{}) if err != nil { t.Errorf("unexpected error when watching %q: %v", tc.name, err) continue diff --git a/staging/src/k8s.io/client-go/tools/cache/listwatch.go b/staging/src/k8s.io/client-go/tools/cache/listwatch.go index 1261e758169..af01d474579 100644 --- a/staging/src/k8s.io/client-go/tools/cache/listwatch.go +++ b/staging/src/k8s.io/client-go/tools/cache/listwatch.go @@ -67,8 +67,8 @@ func NewListWatchFromClient(c Getter, resource string, namespace string, fieldSe Get() } watchFunc := func(options metav1.ListOptions) (watch.Interface, error) { + options.Watch = true return c.Get(). - Prefix("watch"). Namespace(namespace). Resource(resource). VersionedParams(&options, metav1.ParameterCodec). diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go index ba5fe8af4d6..fbaa96c9fad 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go @@ -140,8 +140,8 @@ func (c *aPIServices) List(opts v1.ListOptions) (result *v1alpha1.APIServiceList // Watch returns a watch.Interface that watches the requested aPIServices. func (c *aPIServices) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Resource("apiservices"). VersionedParams(&opts, scheme.ParameterCodec). Watch() diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go index 01058969400..60d61d9c5e2 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go @@ -140,8 +140,8 @@ func (c *aPIServices) List(opts v1.ListOptions) (result *apiregistration.APIServ // Watch returns a watch.Interface that watches the requested aPIServices. func (c *aPIServices) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true return c.client.Get(). - Prefix("watch"). Resource("apiservices"). VersionedParams(&opts, scheme.ParameterCodec). Watch() diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index 510d87484c4..cbaaceb795a 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -363,7 +363,7 @@ func SkipIfMissingResource(clientPool dynamic.ClientPool, gvr schema.GroupVersio Failf("Unexpected error getting dynamic client for %v: %v", gvr.GroupVersion(), err) } apiResource := metav1.APIResource{Name: gvr.Resource, Namespaced: true} - _, err = dynamicClient.Resource(&apiResource, namespace).List(&metav1.ListOptions{}) + _, err = dynamicClient.Resource(&apiResource, namespace).List(metav1.ListOptions{}) if err != nil { // not all resources support list, so we ignore those if apierrs.IsMethodNotSupported(err) || apierrs.IsNotFound(err) || apierrs.IsForbidden(err) { @@ -1086,7 +1086,7 @@ func hasRemainingContent(c clientset.Interface, clientPool dynamic.ClientPool, n Logf("namespace: %s, resource: %s, ignored listing per whitelist", namespace, apiResource.Name) continue } - obj, err := dynamicClient.Resource(&apiResource, namespace).List(&metav1.ListOptions{}) + obj, err := dynamicClient.Resource(&apiResource, namespace).List(metav1.ListOptions{}) if err != nil { // not all resources support list, so we ignore those if apierrs.IsMethodNotSupported(err) || apierrs.IsNotFound(err) || apierrs.IsForbidden(err) { diff --git a/test/integration/client/client_test.go b/test/integration/client/client_test.go index 89d1013d7fd..07956ac1a7a 100644 --- a/test/integration/client/client_test.go +++ b/test/integration/client/client_test.go @@ -29,6 +29,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -491,11 +492,11 @@ func TestSingleWatch(t *testing.T) { } w, err := client.Core().RESTClient().Get(). - Prefix("watch"). Namespace(ns.Name). Resource("events"). - Name("event-9"). Param("resourceVersion", rv1). + Param("watch", "true"). + FieldsSelectorParam(fields.OneTermEqualSelector("metadata.name", "event-9")). Watch() if err != nil { diff --git a/test/integration/client/dynamic_client_test.go b/test/integration/client/dynamic_client_test.go index fcd18c5d3fd..9ae98531793 100644 --- a/test/integration/client/dynamic_client_test.go +++ b/test/integration/client/dynamic_client_test.go @@ -93,7 +93,7 @@ func TestDynamicClient(t *testing.T) { } // check dynamic list - obj, err := dynamicClient.Resource(&resource, ns.Name).List(&metav1.ListOptions{}) + obj, err := dynamicClient.Resource(&resource, ns.Name).List(metav1.ListOptions{}) unstructuredList, ok := obj.(*unstructured.UnstructuredList) if !ok { t.Fatalf("expected *unstructured.UnstructuredList, got %#v", obj)