diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go
index b45e93ebc19..eee4ecd084a 100644
--- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go
+++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go
@@ -38,10 +38,10 @@ type APIServiceInterface interface {
 	Update(*v1alpha1.APIService) (*v1alpha1.APIService, error)
 	UpdateStatus(*v1alpha1.APIService) (*v1alpha1.APIService, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1alpha1.APIService, error)
-	List(opts v1.ListOptions) (*v1alpha1.APIServiceList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1alpha1.APIServiceList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.APIService, err error)
 	APIServiceExpansion
 }
@@ -107,7 +107,7 @@ func (c *aPIServices) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *aPIServices) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *aPIServices) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Resource("apiservices").
 		VersionedParams(&listOptions, api.ParameterCodec).
@@ -129,7 +129,7 @@ func (c *aPIServices) Get(name string, options meta_v1.GetOptions) (result *v1al
 }
 
 // List takes label and field selectors, and returns the list of APIServices that match those selectors.
-func (c *aPIServices) List(opts v1.ListOptions) (result *v1alpha1.APIServiceList, err error) {
+func (c *aPIServices) List(opts meta_v1.ListOptions) (result *v1alpha1.APIServiceList, err error) {
 	result = &v1alpha1.APIServiceList{}
 	err = c.client.Get().
 		Resource("apiservices").
@@ -140,7 +140,7 @@ 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) {
+func (c *aPIServices) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Resource("apiservices").
diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiservice.go b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiservice.go
index 4327d516fd7..74540e8b1da 100644
--- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiservice.go
+++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiservice.go
@@ -67,7 +67,7 @@ func (c *FakeAPIServices) Delete(name string, options *v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeAPIServices) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeAPIServices) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewRootDeleteCollectionAction(apiservicesResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1alpha1.APIServiceList{})
@@ -83,7 +83,7 @@ func (c *FakeAPIServices) Get(name string, options meta_v1.GetOptions) (result *
 	return obj.(*v1alpha1.APIService), err
 }
 
-func (c *FakeAPIServices) List(opts v1.ListOptions) (result *v1alpha1.APIServiceList, err error) {
+func (c *FakeAPIServices) List(opts meta_v1.ListOptions) (result *v1alpha1.APIServiceList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewRootListAction(apiservicesResource, opts), &v1alpha1.APIServiceList{})
 	if obj == nil {
@@ -104,7 +104,7 @@ func (c *FakeAPIServices) List(opts v1.ListOptions) (result *v1alpha1.APIService
 }
 
 // Watch returns a watch.Interface that watches the requested aPIServices.
-func (c *FakeAPIServices) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeAPIServices) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewRootWatchAction(apiservicesResource, opts))
 }
diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go
index db4417e8f56..02a7d675e47 100644
--- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go
+++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go
@@ -37,10 +37,10 @@ type APIServiceInterface interface {
 	Update(*apiregistration.APIService) (*apiregistration.APIService, error)
 	UpdateStatus(*apiregistration.APIService) (*apiregistration.APIService, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*apiregistration.APIService, error)
-	List(opts api.ListOptions) (*apiregistration.APIServiceList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*apiregistration.APIServiceList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *apiregistration.APIService, err error)
 	APIServiceExpansion
 }
@@ -106,7 +106,7 @@ func (c *aPIServices) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *aPIServices) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *aPIServices) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Resource("apiservices").
 		VersionedParams(&listOptions, api.ParameterCodec).
@@ -128,7 +128,7 @@ func (c *aPIServices) Get(name string, options v1.GetOptions) (result *apiregist
 }
 
 // List takes label and field selectors, and returns the list of APIServices that match those selectors.
-func (c *aPIServices) List(opts api.ListOptions) (result *apiregistration.APIServiceList, err error) {
+func (c *aPIServices) List(opts v1.ListOptions) (result *apiregistration.APIServiceList, err error) {
 	result = &apiregistration.APIServiceList{}
 	err = c.client.Get().
 		Resource("apiservices").
@@ -139,7 +139,7 @@ func (c *aPIServices) List(opts api.ListOptions) (result *apiregistration.APISer
 }
 
 // Watch returns a watch.Interface that watches the requested aPIServices.
-func (c *aPIServices) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *aPIServices) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Resource("apiservices").
diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiservice.go b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiservice.go
index 5b601fa25eb..36b0e615ad5 100644
--- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiservice.go
+++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiservice.go
@@ -67,7 +67,7 @@ func (c *FakeAPIServices) Delete(name string, options *api.DeleteOptions) error
 	return err
 }
 
-func (c *FakeAPIServices) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeAPIServices) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewRootDeleteCollectionAction(apiservicesResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &apiregistration.APIServiceList{})
@@ -83,7 +83,7 @@ func (c *FakeAPIServices) Get(name string, options v1.GetOptions) (result *apire
 	return obj.(*apiregistration.APIService), err
 }
 
-func (c *FakeAPIServices) List(opts api.ListOptions) (result *apiregistration.APIServiceList, err error) {
+func (c *FakeAPIServices) List(opts v1.ListOptions) (result *apiregistration.APIServiceList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewRootListAction(apiservicesResource, opts), &apiregistration.APIServiceList{})
 	if obj == nil {
@@ -104,7 +104,7 @@ func (c *FakeAPIServices) List(opts api.ListOptions) (result *apiregistration.AP
 }
 
 // Watch returns a watch.Interface that watches the requested aPIServices.
-func (c *FakeAPIServices) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeAPIServices) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewRootWatchAction(apiservicesResource, opts))
 }
diff --git a/cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion/apiservice.go b/cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion/apiservice.go
index 5cbea4ef619..e25c690cf55 100644
--- a/cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion/apiservice.go
+++ b/cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion/apiservice.go
@@ -19,14 +19,13 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration"
 	internalclientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset"
 	internalinterfaces "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalinterfaces"
 	internalversion "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion"
-	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	time "time"
 )
@@ -46,18 +45,10 @@ func newAPIServiceInformer(client internalclientset.Interface, resyncPeriod time
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Apiregistration().APIServices().List(internalOptions)
+				return client.Apiregistration().APIServices().List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Apiregistration().APIServices().Watch(internalOptions)
+				return client.Apiregistration().APIServices().Watch(options)
 			},
 		},
 		&apiregistration.APIService{},
diff --git a/cmd/kube-aggregator/pkg/client/informers/apiregistration/v1alpha1/apiservice.go b/cmd/kube-aggregator/pkg/client/informers/apiregistration/v1alpha1/apiservice.go
index ca3ddf73be1..3e2fb20bf1c 100644
--- a/cmd/kube-aggregator/pkg/client/informers/apiregistration/v1alpha1/apiservice.go
+++ b/cmd/kube-aggregator/pkg/client/informers/apiregistration/v1alpha1/apiservice.go
@@ -19,13 +19,13 @@ limitations under the License.
 package v1alpha1
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	apiregistration_v1alpha1 "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1"
 	clientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset"
 	internalinterfaces "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalinterfaces"
 	v1alpha1 "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	time "time"
 )
diff --git a/cmd/kubeadm/app/cmd/BUILD b/cmd/kubeadm/app/cmd/BUILD
index c4d6725ca00..9d6208bb447 100644
--- a/cmd/kubeadm/app/cmd/BUILD
+++ b/cmd/kubeadm/app/cmd/BUILD
@@ -35,7 +35,6 @@ go_library(
         "//cmd/kubeadm/app/preflight:go_default_library",
         "//cmd/kubeadm/app/util:go_default_library",
         "//pkg/api:go_default_library",
-        "//pkg/api/v1:go_default_library",
         "//pkg/kubectl:go_default_library",
         "//pkg/kubectl/cmd/util:go_default_library",
         "//pkg/util/flag:go_default_library",
@@ -44,6 +43,7 @@ go_library(
         "//vendor:github.com/blang/semver",
         "//vendor:github.com/renstrom/dedent",
         "//vendor:github.com/spf13/cobra",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/fields",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/util/net",
diff --git a/cmd/kubeadm/app/master/BUILD b/cmd/kubeadm/app/master/BUILD
index 9aba3152302..cc705009ebe 100644
--- a/cmd/kubeadm/app/master/BUILD
+++ b/cmd/kubeadm/app/master/BUILD
@@ -26,7 +26,6 @@ go_library(
         "//cmd/kubeadm/app/images:go_default_library",
         "//cmd/kubeadm/app/phases/kubeconfig:go_default_library",
         "//cmd/kubeadm/app/util:go_default_library",
-        "//pkg/api:go_default_library",
         "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/extensions/v1beta1:go_default_library",
diff --git a/cmd/kubeadm/app/phases/apiconfig/BUILD b/cmd/kubeadm/app/phases/apiconfig/BUILD
index 41f55bf4f68..9978455bc0c 100644
--- a/cmd/kubeadm/app/phases/apiconfig/BUILD
+++ b/cmd/kubeadm/app/phases/apiconfig/BUILD
@@ -13,7 +13,6 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//cmd/kubeadm/app/master:go_default_library",
-        "//pkg/api:go_default_library",
         "//pkg/apis/rbac/v1beta1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testtype.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testtype.go
index 27c4a21cc21..fa82a63a404 100644
--- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testtype.go
+++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testtype.go
@@ -72,7 +72,7 @@ func (c *FakeTestTypes) Delete(name string, options *api.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeTestTypes) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeTestTypes) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(testtypesResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &testgroup.TestTypeList{})
@@ -89,7 +89,7 @@ func (c *FakeTestTypes) Get(name string, options v1.GetOptions) (result *testgro
 	return obj.(*testgroup.TestType), err
 }
 
-func (c *FakeTestTypes) List(opts api.ListOptions) (result *testgroup.TestTypeList, err error) {
+func (c *FakeTestTypes) List(opts v1.ListOptions) (result *testgroup.TestTypeList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(testtypesResource, c.ns, opts), &testgroup.TestTypeList{})
 
@@ -111,7 +111,7 @@ func (c *FakeTestTypes) List(opts api.ListOptions) (result *testgroup.TestTypeLi
 }
 
 // Watch returns a watch.Interface that watches the requested testTypes.
-func (c *FakeTestTypes) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeTestTypes) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(testtypesResource, c.ns, opts))
 
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 519e165ba77..b7e3b2bb118 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
@@ -37,10 +37,10 @@ type TestTypeInterface interface {
 	Update(*testgroup.TestType) (*testgroup.TestType, error)
 	UpdateStatus(*testgroup.TestType) (*testgroup.TestType, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*testgroup.TestType, error)
-	List(opts api.ListOptions) (*testgroup.TestTypeList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*testgroup.TestTypeList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *testgroup.TestType, err error)
 	TestTypeExpansion
 }
@@ -112,7 +112,7 @@ func (c *testTypes) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *testTypes) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *testTypes) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("testtypes").
@@ -136,7 +136,7 @@ func (c *testTypes) Get(name string, options v1.GetOptions) (result *testgroup.T
 }
 
 // List takes label and field selectors, and returns the list of TestTypes that match those selectors.
-func (c *testTypes) List(opts api.ListOptions) (result *testgroup.TestTypeList, err error) {
+func (c *testTypes) List(opts v1.ListOptions) (result *testgroup.TestTypeList, err error) {
 	result = &testgroup.TestTypeList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -148,7 +148,7 @@ func (c *testTypes) List(opts api.ListOptions) (result *testgroup.TestTypeList,
 }
 
 // Watch returns a watch.Interface that watches the requested testTypes.
-func (c *testTypes) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *testTypes) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/examples/BUILD b/examples/BUILD
index 46bb96cc22e..5fdb14be6ca 100644
--- a/examples/BUILD
+++ b/examples/BUILD
@@ -50,6 +50,7 @@ go_test(
         "//plugin/pkg/scheduler/api:go_default_library",
         "//plugin/pkg/scheduler/api/latest:go_default_library",
         "//vendor:github.com/golang/glog",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/types",
         "//vendor:k8s.io/apimachinery/pkg/util/validation/field",
diff --git a/federation/apis/federation/v1beta1/zz_generated.deepcopy.go b/federation/apis/federation/v1beta1/zz_generated.deepcopy.go
index 601c5b40c69..c2a4b3eb8ea 100644
--- a/federation/apis/federation/v1beta1/zz_generated.deepcopy.go
+++ b/federation/apis/federation/v1beta1/zz_generated.deepcopy.go
@@ -102,9 +102,7 @@ func DeepCopy_v1beta1_ClusterSpec(in interface{}, out interface{}, c *conversion
 		if in.ServerAddressByClientCIDRs != nil {
 			in, out := &in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs
 			*out = make([]ServerAddressByClientCIDR, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.SecretRef != nil {
 			in, out := &in.SecretRef, &out.SecretRef
diff --git a/federation/apis/federation/zz_generated.deepcopy.go b/federation/apis/federation/zz_generated.deepcopy.go
index 278b65c594c..16e0011dec3 100644
--- a/federation/apis/federation/zz_generated.deepcopy.go
+++ b/federation/apis/federation/zz_generated.deepcopy.go
@@ -118,9 +118,7 @@ func DeepCopy_federation_ClusterSpec(in interface{}, out interface{}, c *convers
 		if in.ServerAddressByClientCIDRs != nil {
 			in, out := &in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs
 			*out = make([]ServerAddressByClientCIDR, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.SecretRef != nil {
 			in, out := &in.SecretRef, &out.SecretRef
diff --git a/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go b/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go
index b6e3cad024d..ecb7edbe903 100644
--- a/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go
+++ b/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go
@@ -72,7 +72,7 @@ func (c *FakeHorizontalPodAutoscalers) Delete(name string, options *api_v1.Delet
 	return err
 }
 
-func (c *FakeHorizontalPodAutoscalers) DeleteCollection(options *api_v1.DeleteOptions, listOptions api_v1.ListOptions) error {
+func (c *FakeHorizontalPodAutoscalers) DeleteCollection(options *api_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(horizontalpodautoscalersResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1.HorizontalPodAutoscalerList{})
@@ -89,7 +89,7 @@ func (c *FakeHorizontalPodAutoscalers) Get(name string, options meta_v1.GetOptio
 	return obj.(*v1.HorizontalPodAutoscaler), err
 }
 
-func (c *FakeHorizontalPodAutoscalers) List(opts api_v1.ListOptions) (result *v1.HorizontalPodAutoscalerList, err error) {
+func (c *FakeHorizontalPodAutoscalers) List(opts meta_v1.ListOptions) (result *v1.HorizontalPodAutoscalerList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(horizontalpodautoscalersResource, c.ns, opts), &v1.HorizontalPodAutoscalerList{})
 
@@ -111,7 +111,7 @@ func (c *FakeHorizontalPodAutoscalers) List(opts api_v1.ListOptions) (result *v1
 }
 
 // Watch returns a watch.Interface that watches the requested horizontalPodAutoscalers.
-func (c *FakeHorizontalPodAutoscalers) Watch(opts api_v1.ListOptions) (watch.Interface, error) {
+func (c *FakeHorizontalPodAutoscalers) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(horizontalpodautoscalersResource, c.ns, opts))
 
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 7a268a04c87..7aaa8851942 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
@@ -38,10 +38,10 @@ type HorizontalPodAutoscalerInterface interface {
 	Update(*v1.HorizontalPodAutoscaler) (*v1.HorizontalPodAutoscaler, error)
 	UpdateStatus(*v1.HorizontalPodAutoscaler) (*v1.HorizontalPodAutoscaler, error)
 	Delete(name string, options *api_v1.DeleteOptions) error
-	DeleteCollection(options *api_v1.DeleteOptions, listOptions api_v1.ListOptions) error
+	DeleteCollection(options *api_v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1.HorizontalPodAutoscaler, error)
-	List(opts api_v1.ListOptions) (*v1.HorizontalPodAutoscalerList, error)
-	Watch(opts api_v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1.HorizontalPodAutoscalerList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.HorizontalPodAutoscaler, err error)
 	HorizontalPodAutoscalerExpansion
 }
@@ -113,7 +113,7 @@ func (c *horizontalPodAutoscalers) Delete(name string, options *api_v1.DeleteOpt
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *horizontalPodAutoscalers) DeleteCollection(options *api_v1.DeleteOptions, listOptions api_v1.ListOptions) error {
+func (c *horizontalPodAutoscalers) DeleteCollection(options *api_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("horizontalpodautoscalers").
@@ -137,7 +137,7 @@ func (c *horizontalPodAutoscalers) Get(name string, options meta_v1.GetOptions)
 }
 
 // List takes label and field selectors, and returns the list of HorizontalPodAutoscalers that match those selectors.
-func (c *horizontalPodAutoscalers) List(opts api_v1.ListOptions) (result *v1.HorizontalPodAutoscalerList, err error) {
+func (c *horizontalPodAutoscalers) List(opts meta_v1.ListOptions) (result *v1.HorizontalPodAutoscalerList, err error) {
 	result = &v1.HorizontalPodAutoscalerList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -149,7 +149,7 @@ func (c *horizontalPodAutoscalers) List(opts api_v1.ListOptions) (result *v1.Hor
 }
 
 // Watch returns a watch.Interface that watches the requested horizontalPodAutoscalers.
-func (c *horizontalPodAutoscalers) Watch(opts api_v1.ListOptions) (watch.Interface, error) {
+func (c *horizontalPodAutoscalers) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/fake_job.go b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/fake_job.go
index d0d80117450..0d1aa59076e 100644
--- a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/fake_job.go
+++ b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/fake_job.go
@@ -72,7 +72,7 @@ func (c *FakeJobs) Delete(name string, options *api_v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeJobs) DeleteCollection(options *api_v1.DeleteOptions, listOptions api_v1.ListOptions) error {
+func (c *FakeJobs) DeleteCollection(options *api_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(jobsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1.JobList{})
@@ -89,7 +89,7 @@ func (c *FakeJobs) Get(name string, options meta_v1.GetOptions) (result *v1.Job,
 	return obj.(*v1.Job), err
 }
 
-func (c *FakeJobs) List(opts api_v1.ListOptions) (result *v1.JobList, err error) {
+func (c *FakeJobs) List(opts meta_v1.ListOptions) (result *v1.JobList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(jobsResource, c.ns, opts), &v1.JobList{})
 
@@ -111,7 +111,7 @@ func (c *FakeJobs) List(opts api_v1.ListOptions) (result *v1.JobList, err error)
 }
 
 // Watch returns a watch.Interface that watches the requested jobs.
-func (c *FakeJobs) Watch(opts api_v1.ListOptions) (watch.Interface, error) {
+func (c *FakeJobs) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(jobsResource, c.ns, opts))
 
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 67ff9f03e0c..495c4006261 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
@@ -38,10 +38,10 @@ type JobInterface interface {
 	Update(*v1.Job) (*v1.Job, error)
 	UpdateStatus(*v1.Job) (*v1.Job, error)
 	Delete(name string, options *api_v1.DeleteOptions) error
-	DeleteCollection(options *api_v1.DeleteOptions, listOptions api_v1.ListOptions) error
+	DeleteCollection(options *api_v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1.Job, error)
-	List(opts api_v1.ListOptions) (*v1.JobList, error)
-	Watch(opts api_v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1.JobList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Job, err error)
 	JobExpansion
 }
@@ -113,7 +113,7 @@ func (c *jobs) Delete(name string, options *api_v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *jobs) DeleteCollection(options *api_v1.DeleteOptions, listOptions api_v1.ListOptions) error {
+func (c *jobs) DeleteCollection(options *api_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("jobs").
@@ -137,7 +137,7 @@ func (c *jobs) Get(name string, options meta_v1.GetOptions) (result *v1.Job, err
 }
 
 // List takes label and field selectors, and returns the list of Jobs that match those selectors.
-func (c *jobs) List(opts api_v1.ListOptions) (result *v1.JobList, err error) {
+func (c *jobs) List(opts meta_v1.ListOptions) (result *v1.JobList, err error) {
 	result = &v1.JobList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -149,7 +149,7 @@ func (c *jobs) List(opts api_v1.ListOptions) (result *v1.JobList, err error) {
 }
 
 // Watch returns a watch.Interface that watches the requested jobs.
-func (c *jobs) Watch(opts api_v1.ListOptions) (watch.Interface, error) {
+func (c *jobs) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 01de98954e6..1195e926714 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
@@ -36,10 +36,10 @@ type ConfigMapInterface interface {
 	Create(*v1.ConfigMap) (*v1.ConfigMap, error)
 	Update(*v1.ConfigMap) (*v1.ConfigMap, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1.ConfigMap, error)
-	List(opts v1.ListOptions) (*v1.ConfigMapList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1.ConfigMapList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.ConfigMap, err error)
 	ConfigMapExpansion
 }
@@ -95,7 +95,7 @@ func (c *configMaps) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *configMaps) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *configMaps) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("configmaps").
@@ -119,7 +119,7 @@ func (c *configMaps) Get(name string, options meta_v1.GetOptions) (result *v1.Co
 }
 
 // List takes label and field selectors, and returns the list of ConfigMaps that match those selectors.
-func (c *configMaps) List(opts v1.ListOptions) (result *v1.ConfigMapList, err error) {
+func (c *configMaps) List(opts meta_v1.ListOptions) (result *v1.ConfigMapList, err error) {
 	result = &v1.ConfigMapList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -131,7 +131,7 @@ func (c *configMaps) List(opts v1.ListOptions) (result *v1.ConfigMapList, err er
 }
 
 // Watch returns a watch.Interface that watches the requested configMaps.
-func (c *configMaps) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *configMaps) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 7ee9a35f173..7e1b3465452 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
@@ -36,10 +36,10 @@ type EventInterface interface {
 	Create(*v1.Event) (*v1.Event, error)
 	Update(*v1.Event) (*v1.Event, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1.Event, error)
-	List(opts v1.ListOptions) (*v1.EventList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1.EventList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Event, err error)
 	EventExpansion
 }
@@ -95,7 +95,7 @@ func (c *events) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *events) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *events) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("events").
@@ -119,7 +119,7 @@ func (c *events) Get(name string, options meta_v1.GetOptions) (result *v1.Event,
 }
 
 // List takes label and field selectors, and returns the list of Events that match those selectors.
-func (c *events) List(opts v1.ListOptions) (result *v1.EventList, err error) {
+func (c *events) List(opts meta_v1.ListOptions) (result *v1.EventList, err error) {
 	result = &v1.EventList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -131,7 +131,7 @@ func (c *events) List(opts v1.ListOptions) (result *v1.EventList, err error) {
 }
 
 // Watch returns a watch.Interface that watches the requested events.
-func (c *events) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *events) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_configmap.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_configmap.go
index eb5303c6147..d6f24794795 100644
--- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_configmap.go
+++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_configmap.go
@@ -61,7 +61,7 @@ func (c *FakeConfigMaps) Delete(name string, options *v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeConfigMaps) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeConfigMaps) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(configmapsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1.ConfigMapList{})
@@ -78,7 +78,7 @@ func (c *FakeConfigMaps) Get(name string, options meta_v1.GetOptions) (result *v
 	return obj.(*v1.ConfigMap), err
 }
 
-func (c *FakeConfigMaps) List(opts v1.ListOptions) (result *v1.ConfigMapList, err error) {
+func (c *FakeConfigMaps) List(opts meta_v1.ListOptions) (result *v1.ConfigMapList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(configmapsResource, c.ns, opts), &v1.ConfigMapList{})
 
@@ -100,7 +100,7 @@ func (c *FakeConfigMaps) List(opts v1.ListOptions) (result *v1.ConfigMapList, er
 }
 
 // Watch returns a watch.Interface that watches the requested configMaps.
-func (c *FakeConfigMaps) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeConfigMaps) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(configmapsResource, c.ns, opts))
 
diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_event.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_event.go
index 8a35409cf5b..35038e50e13 100644
--- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_event.go
+++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_event.go
@@ -61,7 +61,7 @@ func (c *FakeEvents) Delete(name string, options *v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeEvents) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeEvents) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(eventsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1.EventList{})
@@ -78,7 +78,7 @@ func (c *FakeEvents) Get(name string, options meta_v1.GetOptions) (result *v1.Ev
 	return obj.(*v1.Event), err
 }
 
-func (c *FakeEvents) List(opts v1.ListOptions) (result *v1.EventList, err error) {
+func (c *FakeEvents) List(opts meta_v1.ListOptions) (result *v1.EventList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(eventsResource, c.ns, opts), &v1.EventList{})
 
@@ -100,7 +100,7 @@ func (c *FakeEvents) List(opts v1.ListOptions) (result *v1.EventList, err error)
 }
 
 // Watch returns a watch.Interface that watches the requested events.
-func (c *FakeEvents) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeEvents) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(eventsResource, c.ns, opts))
 
diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_namespace.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_namespace.go
index 94d1e4f8f1e..b3ad561b077 100644
--- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_namespace.go
+++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_namespace.go
@@ -66,7 +66,7 @@ func (c *FakeNamespaces) Delete(name string, options *v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeNamespaces) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeNamespaces) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewRootDeleteCollectionAction(namespacesResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1.NamespaceList{})
@@ -82,7 +82,7 @@ func (c *FakeNamespaces) Get(name string, options meta_v1.GetOptions) (result *v
 	return obj.(*v1.Namespace), err
 }
 
-func (c *FakeNamespaces) List(opts v1.ListOptions) (result *v1.NamespaceList, err error) {
+func (c *FakeNamespaces) List(opts meta_v1.ListOptions) (result *v1.NamespaceList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewRootListAction(namespacesResource, opts), &v1.NamespaceList{})
 	if obj == nil {
@@ -103,7 +103,7 @@ func (c *FakeNamespaces) List(opts v1.ListOptions) (result *v1.NamespaceList, er
 }
 
 // Watch returns a watch.Interface that watches the requested namespaces.
-func (c *FakeNamespaces) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeNamespaces) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewRootWatchAction(namespacesResource, opts))
 }
diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_secret.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_secret.go
index e8ed62dac14..560e1018600 100644
--- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_secret.go
+++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_secret.go
@@ -61,7 +61,7 @@ func (c *FakeSecrets) Delete(name string, options *v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeSecrets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeSecrets) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(secretsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1.SecretList{})
@@ -78,7 +78,7 @@ func (c *FakeSecrets) Get(name string, options meta_v1.GetOptions) (result *v1.S
 	return obj.(*v1.Secret), err
 }
 
-func (c *FakeSecrets) List(opts v1.ListOptions) (result *v1.SecretList, err error) {
+func (c *FakeSecrets) List(opts meta_v1.ListOptions) (result *v1.SecretList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(secretsResource, c.ns, opts), &v1.SecretList{})
 
@@ -100,7 +100,7 @@ func (c *FakeSecrets) List(opts v1.ListOptions) (result *v1.SecretList, err erro
 }
 
 // Watch returns a watch.Interface that watches the requested secrets.
-func (c *FakeSecrets) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeSecrets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(secretsResource, c.ns, opts))
 
diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_service.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_service.go
index a5b2bf56f38..58813961a1e 100644
--- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_service.go
+++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_service.go
@@ -71,7 +71,7 @@ func (c *FakeServices) Delete(name string, options *v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeServices) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeServices) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(servicesResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1.ServiceList{})
@@ -88,7 +88,7 @@ func (c *FakeServices) Get(name string, options meta_v1.GetOptions) (result *v1.
 	return obj.(*v1.Service), err
 }
 
-func (c *FakeServices) List(opts v1.ListOptions) (result *v1.ServiceList, err error) {
+func (c *FakeServices) List(opts meta_v1.ListOptions) (result *v1.ServiceList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(servicesResource, c.ns, opts), &v1.ServiceList{})
 
@@ -110,7 +110,7 @@ func (c *FakeServices) List(opts v1.ListOptions) (result *v1.ServiceList, err er
 }
 
 // Watch returns a watch.Interface that watches the requested services.
-func (c *FakeServices) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeServices) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(servicesResource, c.ns, opts))
 
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 6fc64ff4e7b..69a451debec 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
@@ -37,10 +37,10 @@ type NamespaceInterface interface {
 	Update(*v1.Namespace) (*v1.Namespace, error)
 	UpdateStatus(*v1.Namespace) (*v1.Namespace, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1.Namespace, error)
-	List(opts v1.ListOptions) (*v1.NamespaceList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1.NamespaceList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Namespace, err error)
 	NamespaceExpansion
 }
@@ -106,7 +106,7 @@ func (c *namespaces) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *namespaces) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *namespaces) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Resource("namespaces").
 		VersionedParams(&listOptions, api.ParameterCodec).
@@ -128,7 +128,7 @@ func (c *namespaces) Get(name string, options meta_v1.GetOptions) (result *v1.Na
 }
 
 // List takes label and field selectors, and returns the list of Namespaces that match those selectors.
-func (c *namespaces) List(opts v1.ListOptions) (result *v1.NamespaceList, err error) {
+func (c *namespaces) List(opts meta_v1.ListOptions) (result *v1.NamespaceList, err error) {
 	result = &v1.NamespaceList{}
 	err = c.client.Get().
 		Resource("namespaces").
@@ -139,7 +139,7 @@ func (c *namespaces) List(opts v1.ListOptions) (result *v1.NamespaceList, err er
 }
 
 // Watch returns a watch.Interface that watches the requested namespaces.
-func (c *namespaces) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *namespaces) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Resource("namespaces").
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 0ba9ba8bfbe..9a0165a3072 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
@@ -36,10 +36,10 @@ type SecretInterface interface {
 	Create(*v1.Secret) (*v1.Secret, error)
 	Update(*v1.Secret) (*v1.Secret, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1.Secret, error)
-	List(opts v1.ListOptions) (*v1.SecretList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1.SecretList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Secret, err error)
 	SecretExpansion
 }
@@ -95,7 +95,7 @@ func (c *secrets) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *secrets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *secrets) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("secrets").
@@ -119,7 +119,7 @@ func (c *secrets) Get(name string, options meta_v1.GetOptions) (result *v1.Secre
 }
 
 // List takes label and field selectors, and returns the list of Secrets that match those selectors.
-func (c *secrets) List(opts v1.ListOptions) (result *v1.SecretList, err error) {
+func (c *secrets) List(opts meta_v1.ListOptions) (result *v1.SecretList, err error) {
 	result = &v1.SecretList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -131,7 +131,7 @@ func (c *secrets) List(opts v1.ListOptions) (result *v1.SecretList, err error) {
 }
 
 // Watch returns a watch.Interface that watches the requested secrets.
-func (c *secrets) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *secrets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 99c6d3f7a72..03bb9b5f3aa 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
@@ -37,10 +37,10 @@ type ServiceInterface interface {
 	Update(*v1.Service) (*v1.Service, error)
 	UpdateStatus(*v1.Service) (*v1.Service, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1.Service, error)
-	List(opts v1.ListOptions) (*v1.ServiceList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1.ServiceList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Service, err error)
 	ServiceExpansion
 }
@@ -112,7 +112,7 @@ func (c *services) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *services) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *services) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("services").
@@ -136,7 +136,7 @@ func (c *services) Get(name string, options meta_v1.GetOptions) (result *v1.Serv
 }
 
 // List takes label and field selectors, and returns the list of Services that match those selectors.
-func (c *services) List(opts v1.ListOptions) (result *v1.ServiceList, err error) {
+func (c *services) List(opts meta_v1.ListOptions) (result *v1.ServiceList, err error) {
 	result = &v1.ServiceList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -148,7 +148,7 @@ func (c *services) List(opts v1.ListOptions) (result *v1.ServiceList, err error)
 }
 
 // Watch returns a watch.Interface that watches the requested services.
-func (c *services) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *services) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 cdc71b8b55f..9657877a2ed 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
@@ -38,10 +38,10 @@ type DaemonSetInterface interface {
 	Update(*v1beta1.DaemonSet) (*v1beta1.DaemonSet, error)
 	UpdateStatus(*v1beta1.DaemonSet) (*v1beta1.DaemonSet, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1beta1.DaemonSet, error)
-	List(opts v1.ListOptions) (*v1beta1.DaemonSetList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1beta1.DaemonSetList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.DaemonSet, err error)
 	DaemonSetExpansion
 }
@@ -113,7 +113,7 @@ func (c *daemonSets) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *daemonSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *daemonSets) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("daemonsets").
@@ -137,7 +137,7 @@ func (c *daemonSets) Get(name string, options meta_v1.GetOptions) (result *v1bet
 }
 
 // List takes label and field selectors, and returns the list of DaemonSets that match those selectors.
-func (c *daemonSets) List(opts v1.ListOptions) (result *v1beta1.DaemonSetList, err error) {
+func (c *daemonSets) List(opts meta_v1.ListOptions) (result *v1beta1.DaemonSetList, err error) {
 	result = &v1beta1.DaemonSetList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -149,7 +149,7 @@ 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) {
+func (c *daemonSets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 1060d60ecae..e4051de8887 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
@@ -38,10 +38,10 @@ type DeploymentInterface interface {
 	Update(*v1beta1.Deployment) (*v1beta1.Deployment, error)
 	UpdateStatus(*v1beta1.Deployment) (*v1beta1.Deployment, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1beta1.Deployment, error)
-	List(opts v1.ListOptions) (*v1beta1.DeploymentList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1beta1.DeploymentList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.Deployment, err error)
 	DeploymentExpansion
 }
@@ -113,7 +113,7 @@ func (c *deployments) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *deployments) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *deployments) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("deployments").
@@ -137,7 +137,7 @@ func (c *deployments) Get(name string, options meta_v1.GetOptions) (result *v1be
 }
 
 // List takes label and field selectors, and returns the list of Deployments that match those selectors.
-func (c *deployments) List(opts v1.ListOptions) (result *v1beta1.DeploymentList, err error) {
+func (c *deployments) List(opts meta_v1.ListOptions) (result *v1beta1.DeploymentList, err error) {
 	result = &v1beta1.DeploymentList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -149,7 +149,7 @@ 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) {
+func (c *deployments) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_daemonset.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_daemonset.go
index bffe937495b..b5085642293 100644
--- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_daemonset.go
+++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_daemonset.go
@@ -72,7 +72,7 @@ func (c *FakeDaemonSets) Delete(name string, options *v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeDaemonSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeDaemonSets) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(daemonsetsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1beta1.DaemonSetList{})
@@ -89,7 +89,7 @@ func (c *FakeDaemonSets) Get(name string, options meta_v1.GetOptions) (result *v
 	return obj.(*v1beta1.DaemonSet), err
 }
 
-func (c *FakeDaemonSets) List(opts v1.ListOptions) (result *v1beta1.DaemonSetList, err error) {
+func (c *FakeDaemonSets) List(opts meta_v1.ListOptions) (result *v1beta1.DaemonSetList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(daemonsetsResource, c.ns, opts), &v1beta1.DaemonSetList{})
 
@@ -111,7 +111,7 @@ func (c *FakeDaemonSets) List(opts v1.ListOptions) (result *v1beta1.DaemonSetLis
 }
 
 // Watch returns a watch.Interface that watches the requested daemonSets.
-func (c *FakeDaemonSets) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeDaemonSets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(daemonsetsResource, c.ns, opts))
 
diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_deployment.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_deployment.go
index 6b6544f67d9..1c6edbeb57c 100644
--- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_deployment.go
+++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_deployment.go
@@ -72,7 +72,7 @@ func (c *FakeDeployments) Delete(name string, options *v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeDeployments) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeDeployments) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(deploymentsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1beta1.DeploymentList{})
@@ -89,7 +89,7 @@ func (c *FakeDeployments) Get(name string, options meta_v1.GetOptions) (result *
 	return obj.(*v1beta1.Deployment), err
 }
 
-func (c *FakeDeployments) List(opts v1.ListOptions) (result *v1beta1.DeploymentList, err error) {
+func (c *FakeDeployments) List(opts meta_v1.ListOptions) (result *v1beta1.DeploymentList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(deploymentsResource, c.ns, opts), &v1beta1.DeploymentList{})
 
@@ -111,7 +111,7 @@ func (c *FakeDeployments) List(opts v1.ListOptions) (result *v1beta1.DeploymentL
 }
 
 // Watch returns a watch.Interface that watches the requested deployments.
-func (c *FakeDeployments) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeDeployments) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(deploymentsResource, c.ns, opts))
 
diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_ingress.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_ingress.go
index e5a1059dff2..c7591aa4ea3 100644
--- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_ingress.go
+++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_ingress.go
@@ -72,7 +72,7 @@ func (c *FakeIngresses) Delete(name string, options *v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeIngresses) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeIngresses) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(ingressesResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1beta1.IngressList{})
@@ -89,7 +89,7 @@ func (c *FakeIngresses) Get(name string, options meta_v1.GetOptions) (result *v1
 	return obj.(*v1beta1.Ingress), err
 }
 
-func (c *FakeIngresses) List(opts v1.ListOptions) (result *v1beta1.IngressList, err error) {
+func (c *FakeIngresses) List(opts meta_v1.ListOptions) (result *v1beta1.IngressList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(ingressesResource, c.ns, opts), &v1beta1.IngressList{})
 
@@ -111,7 +111,7 @@ func (c *FakeIngresses) List(opts v1.ListOptions) (result *v1beta1.IngressList,
 }
 
 // Watch returns a watch.Interface that watches the requested ingresses.
-func (c *FakeIngresses) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeIngresses) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(ingressesResource, c.ns, opts))
 
diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_replicaset.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_replicaset.go
index d3dfe25bef8..25a24d6984e 100644
--- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_replicaset.go
+++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_replicaset.go
@@ -72,7 +72,7 @@ func (c *FakeReplicaSets) Delete(name string, options *v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeReplicaSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeReplicaSets) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(replicasetsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1beta1.ReplicaSetList{})
@@ -89,7 +89,7 @@ func (c *FakeReplicaSets) Get(name string, options meta_v1.GetOptions) (result *
 	return obj.(*v1beta1.ReplicaSet), err
 }
 
-func (c *FakeReplicaSets) List(opts v1.ListOptions) (result *v1beta1.ReplicaSetList, err error) {
+func (c *FakeReplicaSets) List(opts meta_v1.ListOptions) (result *v1beta1.ReplicaSetList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(replicasetsResource, c.ns, opts), &v1beta1.ReplicaSetList{})
 
@@ -111,7 +111,7 @@ func (c *FakeReplicaSets) List(opts v1.ListOptions) (result *v1beta1.ReplicaSetL
 }
 
 // Watch returns a watch.Interface that watches the requested replicaSets.
-func (c *FakeReplicaSets) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeReplicaSets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(replicasetsResource, c.ns, opts))
 
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 aaa1494699a..b81862744be 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
@@ -38,10 +38,10 @@ type IngressInterface interface {
 	Update(*v1beta1.Ingress) (*v1beta1.Ingress, error)
 	UpdateStatus(*v1beta1.Ingress) (*v1beta1.Ingress, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1beta1.Ingress, error)
-	List(opts v1.ListOptions) (*v1beta1.IngressList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1beta1.IngressList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.Ingress, err error)
 	IngressExpansion
 }
@@ -113,7 +113,7 @@ func (c *ingresses) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *ingresses) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *ingresses) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("ingresses").
@@ -137,7 +137,7 @@ func (c *ingresses) Get(name string, options meta_v1.GetOptions) (result *v1beta
 }
 
 // List takes label and field selectors, and returns the list of Ingresses that match those selectors.
-func (c *ingresses) List(opts v1.ListOptions) (result *v1beta1.IngressList, err error) {
+func (c *ingresses) List(opts meta_v1.ListOptions) (result *v1beta1.IngressList, err error) {
 	result = &v1beta1.IngressList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -149,7 +149,7 @@ 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) {
+func (c *ingresses) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 3bc699ff35f..cd825993318 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
@@ -38,10 +38,10 @@ type ReplicaSetInterface interface {
 	Update(*v1beta1.ReplicaSet) (*v1beta1.ReplicaSet, error)
 	UpdateStatus(*v1beta1.ReplicaSet) (*v1beta1.ReplicaSet, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1beta1.ReplicaSet, error)
-	List(opts v1.ListOptions) (*v1beta1.ReplicaSetList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1beta1.ReplicaSetList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.ReplicaSet, err error)
 	ReplicaSetExpansion
 }
@@ -113,7 +113,7 @@ func (c *replicaSets) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *replicaSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *replicaSets) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("replicasets").
@@ -137,7 +137,7 @@ func (c *replicaSets) Get(name string, options meta_v1.GetOptions) (result *v1be
 }
 
 // List takes label and field selectors, and returns the list of ReplicaSets that match those selectors.
-func (c *replicaSets) List(opts v1.ListOptions) (result *v1beta1.ReplicaSetList, err error) {
+func (c *replicaSets) List(opts meta_v1.ListOptions) (result *v1beta1.ReplicaSetList, err error) {
 	result = &v1beta1.ReplicaSetList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -149,7 +149,7 @@ 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) {
+func (c *replicaSets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 87c83d16d59..67d4e6ef0bc 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
@@ -38,10 +38,10 @@ type ClusterInterface interface {
 	Update(*v1beta1.Cluster) (*v1beta1.Cluster, error)
 	UpdateStatus(*v1beta1.Cluster) (*v1beta1.Cluster, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1beta1.Cluster, error)
-	List(opts v1.ListOptions) (*v1beta1.ClusterList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1beta1.ClusterList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.Cluster, err error)
 	ClusterExpansion
 }
@@ -107,7 +107,7 @@ func (c *clusters) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *clusters) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *clusters) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Resource("clusters").
 		VersionedParams(&listOptions, api.ParameterCodec).
@@ -129,7 +129,7 @@ func (c *clusters) Get(name string, options meta_v1.GetOptions) (result *v1beta1
 }
 
 // List takes label and field selectors, and returns the list of Clusters that match those selectors.
-func (c *clusters) List(opts v1.ListOptions) (result *v1beta1.ClusterList, err error) {
+func (c *clusters) List(opts meta_v1.ListOptions) (result *v1beta1.ClusterList, err error) {
 	result = &v1beta1.ClusterList{}
 	err = c.client.Get().
 		Resource("clusters").
@@ -140,7 +140,7 @@ 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) {
+func (c *clusters) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Resource("clusters").
diff --git a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/fake_cluster.go b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/fake_cluster.go
index e93687cc806..67619477db5 100644
--- a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/fake_cluster.go
+++ b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/fake_cluster.go
@@ -67,7 +67,7 @@ func (c *FakeClusters) Delete(name string, options *v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeClusters) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeClusters) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewRootDeleteCollectionAction(clustersResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1beta1.ClusterList{})
@@ -83,7 +83,7 @@ func (c *FakeClusters) Get(name string, options meta_v1.GetOptions) (result *v1b
 	return obj.(*v1beta1.Cluster), err
 }
 
-func (c *FakeClusters) List(opts v1.ListOptions) (result *v1beta1.ClusterList, err error) {
+func (c *FakeClusters) List(opts meta_v1.ListOptions) (result *v1beta1.ClusterList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewRootListAction(clustersResource, opts), &v1beta1.ClusterList{})
 	if obj == nil {
@@ -104,7 +104,7 @@ func (c *FakeClusters) List(opts v1.ListOptions) (result *v1beta1.ClusterList, e
 }
 
 // Watch returns a watch.Interface that watches the requested clusters.
-func (c *FakeClusters) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeClusters) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewRootWatchAction(clustersResource, opts))
 }
diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/fake/fake_horizontalpodautoscaler.go b/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/fake/fake_horizontalpodautoscaler.go
index 06938475820..a542e1661b9 100644
--- a/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/fake/fake_horizontalpodautoscaler.go
+++ b/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/fake/fake_horizontalpodautoscaler.go
@@ -72,7 +72,7 @@ func (c *FakeHorizontalPodAutoscalers) Delete(name string, options *api.DeleteOp
 	return err
 }
 
-func (c *FakeHorizontalPodAutoscalers) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeHorizontalPodAutoscalers) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(horizontalpodautoscalersResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &autoscaling.HorizontalPodAutoscalerList{})
@@ -89,7 +89,7 @@ func (c *FakeHorizontalPodAutoscalers) Get(name string, options v1.GetOptions) (
 	return obj.(*autoscaling.HorizontalPodAutoscaler), err
 }
 
-func (c *FakeHorizontalPodAutoscalers) List(opts api.ListOptions) (result *autoscaling.HorizontalPodAutoscalerList, err error) {
+func (c *FakeHorizontalPodAutoscalers) List(opts v1.ListOptions) (result *autoscaling.HorizontalPodAutoscalerList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(horizontalpodautoscalersResource, c.ns, opts), &autoscaling.HorizontalPodAutoscalerList{})
 
@@ -111,7 +111,7 @@ func (c *FakeHorizontalPodAutoscalers) List(opts api.ListOptions) (result *autos
 }
 
 // Watch returns a watch.Interface that watches the requested horizontalPodAutoscalers.
-func (c *FakeHorizontalPodAutoscalers) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeHorizontalPodAutoscalers) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(horizontalpodautoscalersResource, c.ns, opts))
 
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 74bf1376e97..83c8a0f9ab5 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
@@ -37,10 +37,10 @@ type HorizontalPodAutoscalerInterface interface {
 	Update(*autoscaling.HorizontalPodAutoscaler) (*autoscaling.HorizontalPodAutoscaler, error)
 	UpdateStatus(*autoscaling.HorizontalPodAutoscaler) (*autoscaling.HorizontalPodAutoscaler, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*autoscaling.HorizontalPodAutoscaler, error)
-	List(opts api.ListOptions) (*autoscaling.HorizontalPodAutoscalerList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*autoscaling.HorizontalPodAutoscalerList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *autoscaling.HorizontalPodAutoscaler, err error)
 	HorizontalPodAutoscalerExpansion
 }
@@ -112,7 +112,7 @@ func (c *horizontalPodAutoscalers) Delete(name string, options *api.DeleteOption
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *horizontalPodAutoscalers) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *horizontalPodAutoscalers) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("horizontalpodautoscalers").
@@ -136,7 +136,7 @@ func (c *horizontalPodAutoscalers) Get(name string, options v1.GetOptions) (resu
 }
 
 // List takes label and field selectors, and returns the list of HorizontalPodAutoscalers that match those selectors.
-func (c *horizontalPodAutoscalers) List(opts api.ListOptions) (result *autoscaling.HorizontalPodAutoscalerList, err error) {
+func (c *horizontalPodAutoscalers) List(opts v1.ListOptions) (result *autoscaling.HorizontalPodAutoscalerList, err error) {
 	result = &autoscaling.HorizontalPodAutoscalerList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -148,7 +148,7 @@ func (c *horizontalPodAutoscalers) List(opts api.ListOptions) (result *autoscali
 }
 
 // Watch returns a watch.Interface that watches the requested horizontalPodAutoscalers.
-func (c *horizontalPodAutoscalers) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *horizontalPodAutoscalers) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/fake/fake_job.go b/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/fake/fake_job.go
index 288323cdf72..71260fa1991 100644
--- a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/fake/fake_job.go
+++ b/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/fake/fake_job.go
@@ -72,7 +72,7 @@ func (c *FakeJobs) Delete(name string, options *api.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeJobs) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeJobs) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(jobsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &batch.JobList{})
@@ -89,7 +89,7 @@ func (c *FakeJobs) Get(name string, options v1.GetOptions) (result *batch.Job, e
 	return obj.(*batch.Job), err
 }
 
-func (c *FakeJobs) List(opts api.ListOptions) (result *batch.JobList, err error) {
+func (c *FakeJobs) List(opts v1.ListOptions) (result *batch.JobList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(jobsResource, c.ns, opts), &batch.JobList{})
 
@@ -111,7 +111,7 @@ func (c *FakeJobs) List(opts api.ListOptions) (result *batch.JobList, err error)
 }
 
 // Watch returns a watch.Interface that watches the requested jobs.
-func (c *FakeJobs) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeJobs) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(jobsResource, c.ns, opts))
 
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 53fea7e6041..a761b6931ec 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
@@ -37,10 +37,10 @@ type JobInterface interface {
 	Update(*batch.Job) (*batch.Job, error)
 	UpdateStatus(*batch.Job) (*batch.Job, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*batch.Job, error)
-	List(opts api.ListOptions) (*batch.JobList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*batch.JobList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *batch.Job, err error)
 	JobExpansion
 }
@@ -112,7 +112,7 @@ func (c *jobs) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *jobs) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *jobs) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("jobs").
@@ -136,7 +136,7 @@ func (c *jobs) Get(name string, options v1.GetOptions) (result *batch.Job, err e
 }
 
 // List takes label and field selectors, and returns the list of Jobs that match those selectors.
-func (c *jobs) List(opts api.ListOptions) (result *batch.JobList, err error) {
+func (c *jobs) List(opts v1.ListOptions) (result *batch.JobList, err error) {
 	result = &batch.JobList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -148,7 +148,7 @@ func (c *jobs) List(opts api.ListOptions) (result *batch.JobList, err error) {
 }
 
 // Watch returns a watch.Interface that watches the requested jobs.
-func (c *jobs) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *jobs) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 cc5accb295e..b3c10967055 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
@@ -35,10 +35,10 @@ type ConfigMapInterface interface {
 	Create(*api.ConfigMap) (*api.ConfigMap, error)
 	Update(*api.ConfigMap) (*api.ConfigMap, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*api.ConfigMap, error)
-	List(opts api.ListOptions) (*api.ConfigMapList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*api.ConfigMapList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.ConfigMap, err error)
 	ConfigMapExpansion
 }
@@ -94,7 +94,7 @@ func (c *configMaps) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *configMaps) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *configMaps) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("configmaps").
@@ -118,7 +118,7 @@ func (c *configMaps) Get(name string, options v1.GetOptions) (result *api.Config
 }
 
 // List takes label and field selectors, and returns the list of ConfigMaps that match those selectors.
-func (c *configMaps) List(opts api.ListOptions) (result *api.ConfigMapList, err error) {
+func (c *configMaps) List(opts v1.ListOptions) (result *api.ConfigMapList, err error) {
 	result = &api.ConfigMapList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -130,7 +130,7 @@ func (c *configMaps) List(opts api.ListOptions) (result *api.ConfigMapList, err
 }
 
 // Watch returns a watch.Interface that watches the requested configMaps.
-func (c *configMaps) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *configMaps) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 bbb6a398436..aa1f7bb8ac1 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
@@ -35,10 +35,10 @@ type EventInterface interface {
 	Create(*api.Event) (*api.Event, error)
 	Update(*api.Event) (*api.Event, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*api.Event, error)
-	List(opts api.ListOptions) (*api.EventList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*api.EventList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.Event, err error)
 	EventExpansion
 }
@@ -94,7 +94,7 @@ func (c *events) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *events) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *events) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("events").
@@ -118,7 +118,7 @@ func (c *events) Get(name string, options v1.GetOptions) (result *api.Event, err
 }
 
 // List takes label and field selectors, and returns the list of Events that match those selectors.
-func (c *events) List(opts api.ListOptions) (result *api.EventList, err error) {
+func (c *events) List(opts v1.ListOptions) (result *api.EventList, err error) {
 	result = &api.EventList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -130,7 +130,7 @@ func (c *events) List(opts api.ListOptions) (result *api.EventList, err error) {
 }
 
 // Watch returns a watch.Interface that watches the requested events.
-func (c *events) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *events) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_configmap.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_configmap.go
index 52620c98b54..c8679d484ab 100644
--- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_configmap.go
+++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_configmap.go
@@ -61,7 +61,7 @@ func (c *FakeConfigMaps) Delete(name string, options *api.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeConfigMaps) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeConfigMaps) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(configmapsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &api.ConfigMapList{})
@@ -78,7 +78,7 @@ func (c *FakeConfigMaps) Get(name string, options v1.GetOptions) (result *api.Co
 	return obj.(*api.ConfigMap), err
 }
 
-func (c *FakeConfigMaps) List(opts api.ListOptions) (result *api.ConfigMapList, err error) {
+func (c *FakeConfigMaps) List(opts v1.ListOptions) (result *api.ConfigMapList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(configmapsResource, c.ns, opts), &api.ConfigMapList{})
 
@@ -100,7 +100,7 @@ func (c *FakeConfigMaps) List(opts api.ListOptions) (result *api.ConfigMapList,
 }
 
 // Watch returns a watch.Interface that watches the requested configMaps.
-func (c *FakeConfigMaps) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeConfigMaps) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(configmapsResource, c.ns, opts))
 
diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_event.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_event.go
index 8d2e9d12537..599d27e607b 100644
--- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_event.go
+++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_event.go
@@ -61,7 +61,7 @@ func (c *FakeEvents) Delete(name string, options *api.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeEvents) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeEvents) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(eventsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &api.EventList{})
@@ -78,7 +78,7 @@ func (c *FakeEvents) Get(name string, options v1.GetOptions) (result *api.Event,
 	return obj.(*api.Event), err
 }
 
-func (c *FakeEvents) List(opts api.ListOptions) (result *api.EventList, err error) {
+func (c *FakeEvents) List(opts v1.ListOptions) (result *api.EventList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(eventsResource, c.ns, opts), &api.EventList{})
 
@@ -100,7 +100,7 @@ func (c *FakeEvents) List(opts api.ListOptions) (result *api.EventList, err erro
 }
 
 // Watch returns a watch.Interface that watches the requested events.
-func (c *FakeEvents) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeEvents) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(eventsResource, c.ns, opts))
 
diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_namespace.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_namespace.go
index ce2595896ac..c709b3e1f31 100644
--- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_namespace.go
+++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_namespace.go
@@ -66,7 +66,7 @@ func (c *FakeNamespaces) Delete(name string, options *api.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeNamespaces) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeNamespaces) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewRootDeleteCollectionAction(namespacesResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &api.NamespaceList{})
@@ -82,7 +82,7 @@ func (c *FakeNamespaces) Get(name string, options v1.GetOptions) (result *api.Na
 	return obj.(*api.Namespace), err
 }
 
-func (c *FakeNamespaces) List(opts api.ListOptions) (result *api.NamespaceList, err error) {
+func (c *FakeNamespaces) List(opts v1.ListOptions) (result *api.NamespaceList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewRootListAction(namespacesResource, opts), &api.NamespaceList{})
 	if obj == nil {
@@ -103,7 +103,7 @@ func (c *FakeNamespaces) List(opts api.ListOptions) (result *api.NamespaceList,
 }
 
 // Watch returns a watch.Interface that watches the requested namespaces.
-func (c *FakeNamespaces) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeNamespaces) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewRootWatchAction(namespacesResource, opts))
 }
diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_secret.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_secret.go
index 62ad836cce4..31a118ae116 100644
--- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_secret.go
+++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_secret.go
@@ -61,7 +61,7 @@ func (c *FakeSecrets) Delete(name string, options *api.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeSecrets) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeSecrets) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(secretsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &api.SecretList{})
@@ -78,7 +78,7 @@ func (c *FakeSecrets) Get(name string, options v1.GetOptions) (result *api.Secre
 	return obj.(*api.Secret), err
 }
 
-func (c *FakeSecrets) List(opts api.ListOptions) (result *api.SecretList, err error) {
+func (c *FakeSecrets) List(opts v1.ListOptions) (result *api.SecretList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(secretsResource, c.ns, opts), &api.SecretList{})
 
@@ -100,7 +100,7 @@ func (c *FakeSecrets) List(opts api.ListOptions) (result *api.SecretList, err er
 }
 
 // Watch returns a watch.Interface that watches the requested secrets.
-func (c *FakeSecrets) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeSecrets) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(secretsResource, c.ns, opts))
 
diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_service.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_service.go
index 7fe3c369773..7ea844b230b 100644
--- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_service.go
+++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_service.go
@@ -71,7 +71,7 @@ func (c *FakeServices) Delete(name string, options *api.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeServices) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeServices) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(servicesResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &api.ServiceList{})
@@ -88,7 +88,7 @@ func (c *FakeServices) Get(name string, options v1.GetOptions) (result *api.Serv
 	return obj.(*api.Service), err
 }
 
-func (c *FakeServices) List(opts api.ListOptions) (result *api.ServiceList, err error) {
+func (c *FakeServices) List(opts v1.ListOptions) (result *api.ServiceList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(servicesResource, c.ns, opts), &api.ServiceList{})
 
@@ -110,7 +110,7 @@ func (c *FakeServices) List(opts api.ListOptions) (result *api.ServiceList, err
 }
 
 // Watch returns a watch.Interface that watches the requested services.
-func (c *FakeServices) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeServices) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(servicesResource, c.ns, opts))
 
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 7cec0560ca8..306184ae7b2 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
@@ -36,10 +36,10 @@ type NamespaceInterface interface {
 	Update(*api.Namespace) (*api.Namespace, error)
 	UpdateStatus(*api.Namespace) (*api.Namespace, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*api.Namespace, error)
-	List(opts api.ListOptions) (*api.NamespaceList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*api.NamespaceList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.Namespace, err error)
 	NamespaceExpansion
 }
@@ -105,7 +105,7 @@ func (c *namespaces) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *namespaces) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *namespaces) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Resource("namespaces").
 		VersionedParams(&listOptions, api.ParameterCodec).
@@ -127,7 +127,7 @@ func (c *namespaces) Get(name string, options v1.GetOptions) (result *api.Namesp
 }
 
 // List takes label and field selectors, and returns the list of Namespaces that match those selectors.
-func (c *namespaces) List(opts api.ListOptions) (result *api.NamespaceList, err error) {
+func (c *namespaces) List(opts v1.ListOptions) (result *api.NamespaceList, err error) {
 	result = &api.NamespaceList{}
 	err = c.client.Get().
 		Resource("namespaces").
@@ -138,7 +138,7 @@ func (c *namespaces) List(opts api.ListOptions) (result *api.NamespaceList, err
 }
 
 // Watch returns a watch.Interface that watches the requested namespaces.
-func (c *namespaces) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *namespaces) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Resource("namespaces").
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 29902d461fc..8239d7988ea 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
@@ -35,10 +35,10 @@ type SecretInterface interface {
 	Create(*api.Secret) (*api.Secret, error)
 	Update(*api.Secret) (*api.Secret, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*api.Secret, error)
-	List(opts api.ListOptions) (*api.SecretList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*api.SecretList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.Secret, err error)
 	SecretExpansion
 }
@@ -94,7 +94,7 @@ func (c *secrets) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *secrets) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *secrets) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("secrets").
@@ -118,7 +118,7 @@ func (c *secrets) Get(name string, options v1.GetOptions) (result *api.Secret, e
 }
 
 // List takes label and field selectors, and returns the list of Secrets that match those selectors.
-func (c *secrets) List(opts api.ListOptions) (result *api.SecretList, err error) {
+func (c *secrets) List(opts v1.ListOptions) (result *api.SecretList, err error) {
 	result = &api.SecretList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -130,7 +130,7 @@ func (c *secrets) List(opts api.ListOptions) (result *api.SecretList, err error)
 }
 
 // Watch returns a watch.Interface that watches the requested secrets.
-func (c *secrets) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *secrets) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 c83fbd95ebc..9986c9ea96e 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
@@ -36,10 +36,10 @@ type ServiceInterface interface {
 	Update(*api.Service) (*api.Service, error)
 	UpdateStatus(*api.Service) (*api.Service, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*api.Service, error)
-	List(opts api.ListOptions) (*api.ServiceList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*api.ServiceList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.Service, err error)
 	ServiceExpansion
 }
@@ -111,7 +111,7 @@ func (c *services) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *services) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *services) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("services").
@@ -135,7 +135,7 @@ func (c *services) Get(name string, options v1.GetOptions) (result *api.Service,
 }
 
 // List takes label and field selectors, and returns the list of Services that match those selectors.
-func (c *services) List(opts api.ListOptions) (result *api.ServiceList, err error) {
+func (c *services) List(opts v1.ListOptions) (result *api.ServiceList, err error) {
 	result = &api.ServiceList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -147,7 +147,7 @@ func (c *services) List(opts api.ListOptions) (result *api.ServiceList, err erro
 }
 
 // Watch returns a watch.Interface that watches the requested services.
-func (c *services) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *services) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 c6ab08f065f..8c8a24da002 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
@@ -37,10 +37,10 @@ type DaemonSetInterface interface {
 	Update(*extensions.DaemonSet) (*extensions.DaemonSet, error)
 	UpdateStatus(*extensions.DaemonSet) (*extensions.DaemonSet, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*extensions.DaemonSet, error)
-	List(opts api.ListOptions) (*extensions.DaemonSetList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*extensions.DaemonSetList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *extensions.DaemonSet, err error)
 	DaemonSetExpansion
 }
@@ -112,7 +112,7 @@ func (c *daemonSets) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *daemonSets) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *daemonSets) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("daemonsets").
@@ -136,7 +136,7 @@ func (c *daemonSets) Get(name string, options v1.GetOptions) (result *extensions
 }
 
 // List takes label and field selectors, and returns the list of DaemonSets that match those selectors.
-func (c *daemonSets) List(opts api.ListOptions) (result *extensions.DaemonSetList, err error) {
+func (c *daemonSets) List(opts v1.ListOptions) (result *extensions.DaemonSetList, err error) {
 	result = &extensions.DaemonSetList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -148,7 +148,7 @@ func (c *daemonSets) List(opts api.ListOptions) (result *extensions.DaemonSetLis
 }
 
 // Watch returns a watch.Interface that watches the requested daemonSets.
-func (c *daemonSets) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *daemonSets) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 d48ea580518..c784a779b93 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
@@ -37,10 +37,10 @@ type DeploymentInterface interface {
 	Update(*extensions.Deployment) (*extensions.Deployment, error)
 	UpdateStatus(*extensions.Deployment) (*extensions.Deployment, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*extensions.Deployment, error)
-	List(opts api.ListOptions) (*extensions.DeploymentList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*extensions.DeploymentList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *extensions.Deployment, err error)
 	DeploymentExpansion
 }
@@ -112,7 +112,7 @@ func (c *deployments) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *deployments) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *deployments) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("deployments").
@@ -136,7 +136,7 @@ func (c *deployments) Get(name string, options v1.GetOptions) (result *extension
 }
 
 // List takes label and field selectors, and returns the list of Deployments that match those selectors.
-func (c *deployments) List(opts api.ListOptions) (result *extensions.DeploymentList, err error) {
+func (c *deployments) List(opts v1.ListOptions) (result *extensions.DeploymentList, err error) {
 	result = &extensions.DeploymentList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -148,7 +148,7 @@ func (c *deployments) List(opts api.ListOptions) (result *extensions.DeploymentL
 }
 
 // Watch returns a watch.Interface that watches the requested deployments.
-func (c *deployments) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *deployments) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_daemonset.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_daemonset.go
index f2e9d13e072..7fb4a928217 100644
--- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_daemonset.go
+++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_daemonset.go
@@ -72,7 +72,7 @@ func (c *FakeDaemonSets) Delete(name string, options *api.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeDaemonSets) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeDaemonSets) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(daemonsetsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &extensions.DaemonSetList{})
@@ -89,7 +89,7 @@ func (c *FakeDaemonSets) Get(name string, options v1.GetOptions) (result *extens
 	return obj.(*extensions.DaemonSet), err
 }
 
-func (c *FakeDaemonSets) List(opts api.ListOptions) (result *extensions.DaemonSetList, err error) {
+func (c *FakeDaemonSets) List(opts v1.ListOptions) (result *extensions.DaemonSetList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(daemonsetsResource, c.ns, opts), &extensions.DaemonSetList{})
 
@@ -111,7 +111,7 @@ func (c *FakeDaemonSets) List(opts api.ListOptions) (result *extensions.DaemonSe
 }
 
 // Watch returns a watch.Interface that watches the requested daemonSets.
-func (c *FakeDaemonSets) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeDaemonSets) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(daemonsetsResource, c.ns, opts))
 
diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_deployment.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_deployment.go
index 6c3d5654241..ef5b6144b82 100644
--- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_deployment.go
+++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_deployment.go
@@ -72,7 +72,7 @@ func (c *FakeDeployments) Delete(name string, options *api.DeleteOptions) error
 	return err
 }
 
-func (c *FakeDeployments) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeDeployments) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(deploymentsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &extensions.DeploymentList{})
@@ -89,7 +89,7 @@ func (c *FakeDeployments) Get(name string, options v1.GetOptions) (result *exten
 	return obj.(*extensions.Deployment), err
 }
 
-func (c *FakeDeployments) List(opts api.ListOptions) (result *extensions.DeploymentList, err error) {
+func (c *FakeDeployments) List(opts v1.ListOptions) (result *extensions.DeploymentList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(deploymentsResource, c.ns, opts), &extensions.DeploymentList{})
 
@@ -111,7 +111,7 @@ func (c *FakeDeployments) List(opts api.ListOptions) (result *extensions.Deploym
 }
 
 // Watch returns a watch.Interface that watches the requested deployments.
-func (c *FakeDeployments) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeDeployments) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(deploymentsResource, c.ns, opts))
 
diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_ingress.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_ingress.go
index 060fd427a56..77beba836d1 100644
--- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_ingress.go
+++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_ingress.go
@@ -72,7 +72,7 @@ func (c *FakeIngresses) Delete(name string, options *api.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeIngresses) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeIngresses) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(ingressesResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &extensions.IngressList{})
@@ -89,7 +89,7 @@ func (c *FakeIngresses) Get(name string, options v1.GetOptions) (result *extensi
 	return obj.(*extensions.Ingress), err
 }
 
-func (c *FakeIngresses) List(opts api.ListOptions) (result *extensions.IngressList, err error) {
+func (c *FakeIngresses) List(opts v1.ListOptions) (result *extensions.IngressList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(ingressesResource, c.ns, opts), &extensions.IngressList{})
 
@@ -111,7 +111,7 @@ func (c *FakeIngresses) List(opts api.ListOptions) (result *extensions.IngressLi
 }
 
 // Watch returns a watch.Interface that watches the requested ingresses.
-func (c *FakeIngresses) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeIngresses) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(ingressesResource, c.ns, opts))
 
diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_replicaset.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_replicaset.go
index 36aa9216ed5..672c5d66526 100644
--- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_replicaset.go
+++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_replicaset.go
@@ -72,7 +72,7 @@ func (c *FakeReplicaSets) Delete(name string, options *api.DeleteOptions) error
 	return err
 }
 
-func (c *FakeReplicaSets) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeReplicaSets) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(replicasetsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &extensions.ReplicaSetList{})
@@ -89,7 +89,7 @@ func (c *FakeReplicaSets) Get(name string, options v1.GetOptions) (result *exten
 	return obj.(*extensions.ReplicaSet), err
 }
 
-func (c *FakeReplicaSets) List(opts api.ListOptions) (result *extensions.ReplicaSetList, err error) {
+func (c *FakeReplicaSets) List(opts v1.ListOptions) (result *extensions.ReplicaSetList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(replicasetsResource, c.ns, opts), &extensions.ReplicaSetList{})
 
@@ -111,7 +111,7 @@ func (c *FakeReplicaSets) List(opts api.ListOptions) (result *extensions.Replica
 }
 
 // Watch returns a watch.Interface that watches the requested replicaSets.
-func (c *FakeReplicaSets) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeReplicaSets) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(replicasetsResource, c.ns, opts))
 
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 b026e2e33a1..6bd4e5025f3 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
@@ -37,10 +37,10 @@ type IngressInterface interface {
 	Update(*extensions.Ingress) (*extensions.Ingress, error)
 	UpdateStatus(*extensions.Ingress) (*extensions.Ingress, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*extensions.Ingress, error)
-	List(opts api.ListOptions) (*extensions.IngressList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*extensions.IngressList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *extensions.Ingress, err error)
 	IngressExpansion
 }
@@ -112,7 +112,7 @@ func (c *ingresses) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *ingresses) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *ingresses) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("ingresses").
@@ -136,7 +136,7 @@ func (c *ingresses) Get(name string, options v1.GetOptions) (result *extensions.
 }
 
 // List takes label and field selectors, and returns the list of Ingresses that match those selectors.
-func (c *ingresses) List(opts api.ListOptions) (result *extensions.IngressList, err error) {
+func (c *ingresses) List(opts v1.ListOptions) (result *extensions.IngressList, err error) {
 	result = &extensions.IngressList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -148,7 +148,7 @@ func (c *ingresses) List(opts api.ListOptions) (result *extensions.IngressList,
 }
 
 // Watch returns a watch.Interface that watches the requested ingresses.
-func (c *ingresses) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *ingresses) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 5de36beb0f5..b931315c95c 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
@@ -37,10 +37,10 @@ type ReplicaSetInterface interface {
 	Update(*extensions.ReplicaSet) (*extensions.ReplicaSet, error)
 	UpdateStatus(*extensions.ReplicaSet) (*extensions.ReplicaSet, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*extensions.ReplicaSet, error)
-	List(opts api.ListOptions) (*extensions.ReplicaSetList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*extensions.ReplicaSetList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *extensions.ReplicaSet, err error)
 	ReplicaSetExpansion
 }
@@ -112,7 +112,7 @@ func (c *replicaSets) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *replicaSets) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *replicaSets) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("replicasets").
@@ -136,7 +136,7 @@ func (c *replicaSets) Get(name string, options v1.GetOptions) (result *extension
 }
 
 // List takes label and field selectors, and returns the list of ReplicaSets that match those selectors.
-func (c *replicaSets) List(opts api.ListOptions) (result *extensions.ReplicaSetList, err error) {
+func (c *replicaSets) List(opts v1.ListOptions) (result *extensions.ReplicaSetList, err error) {
 	result = &extensions.ReplicaSetList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -148,7 +148,7 @@ func (c *replicaSets) List(opts api.ListOptions) (result *extensions.ReplicaSetL
 }
 
 // Watch returns a watch.Interface that watches the requested replicaSets.
-func (c *replicaSets) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *replicaSets) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 8530d867513..0b0251e7ed0 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
@@ -37,10 +37,10 @@ type ClusterInterface interface {
 	Update(*federation.Cluster) (*federation.Cluster, error)
 	UpdateStatus(*federation.Cluster) (*federation.Cluster, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*federation.Cluster, error)
-	List(opts api.ListOptions) (*federation.ClusterList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*federation.ClusterList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *federation.Cluster, err error)
 	ClusterExpansion
 }
@@ -106,7 +106,7 @@ func (c *clusters) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *clusters) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *clusters) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Resource("clusters").
 		VersionedParams(&listOptions, api.ParameterCodec).
@@ -128,7 +128,7 @@ func (c *clusters) Get(name string, options v1.GetOptions) (result *federation.C
 }
 
 // List takes label and field selectors, and returns the list of Clusters that match those selectors.
-func (c *clusters) List(opts api.ListOptions) (result *federation.ClusterList, err error) {
+func (c *clusters) List(opts v1.ListOptions) (result *federation.ClusterList, err error) {
 	result = &federation.ClusterList{}
 	err = c.client.Get().
 		Resource("clusters").
@@ -139,7 +139,7 @@ func (c *clusters) List(opts api.ListOptions) (result *federation.ClusterList, e
 }
 
 // Watch returns a watch.Interface that watches the requested clusters.
-func (c *clusters) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *clusters) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Resource("clusters").
diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/fake_cluster.go b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/fake_cluster.go
index 846d472c7a9..3da9ec004ea 100644
--- a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/fake_cluster.go
+++ b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/fake_cluster.go
@@ -67,7 +67,7 @@ func (c *FakeClusters) Delete(name string, options *api.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeClusters) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeClusters) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewRootDeleteCollectionAction(clustersResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &federation.ClusterList{})
@@ -83,7 +83,7 @@ func (c *FakeClusters) Get(name string, options v1.GetOptions) (result *federati
 	return obj.(*federation.Cluster), err
 }
 
-func (c *FakeClusters) List(opts api.ListOptions) (result *federation.ClusterList, err error) {
+func (c *FakeClusters) List(opts v1.ListOptions) (result *federation.ClusterList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewRootListAction(clustersResource, opts), &federation.ClusterList{})
 	if obj == nil {
@@ -104,7 +104,7 @@ func (c *FakeClusters) List(opts api.ListOptions) (result *federation.ClusterLis
 }
 
 // Watch returns a watch.Interface that watches the requested clusters.
-func (c *FakeClusters) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeClusters) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewRootWatchAction(clustersResource, opts))
 }
diff --git a/hack/.linted_packages b/hack/.linted_packages
index a1d4546aaa8..90aa056c90a 100644
--- a/hack/.linted_packages
+++ b/hack/.linted_packages
@@ -99,6 +99,7 @@ pkg/apis/storage/install
 pkg/apis/storage/validation
 pkg/auth/authenticator
 pkg/auth/authorizer/union
+pkg/client/cache
 pkg/client/conditions
 pkg/client/informers/informers_generated/apps
 pkg/client/informers/informers_generated/apps/internalversion
diff --git a/pkg/api/v1/types_swagger_doc_generated.go b/pkg/api/v1/types_swagger_doc_generated.go
index e0c9e0cb072..9928598d0b2 100644
--- a/pkg/api/v1/types_swagger_doc_generated.go
+++ b/pkg/api/v1/types_swagger_doc_generated.go
@@ -715,7 +715,7 @@ func (List) SwaggerDoc() map[string]string {
 }
 
 var map_ListOptions = map[string]string{
-	"":                "ListOptions is the query options to a standard REST list call.",
+	"":                "ListOptions is the query options to a standard REST list call. DEPRECATED: This type has been moved to meta/v1 and will be removed soon.",
 	"labelSelector":   "A selector to restrict the list of returned objects by their labels. Defaults to everything.",
 	"fieldSelector":   "A selector to restrict the list of returned objects by their fields. Defaults to everything.",
 	"watch":           "Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.",
diff --git a/pkg/api/v1/zz_generated.deepcopy.go b/pkg/api/v1/zz_generated.deepcopy.go
index f25d325aa20..6a04adcbf2a 100644
--- a/pkg/api/v1/zz_generated.deepcopy.go
+++ b/pkg/api/v1/zz_generated.deepcopy.go
@@ -320,16 +320,12 @@ func DeepCopy_v1_Capabilities(in interface{}, out interface{}, c *conversion.Clo
 		if in.Add != nil {
 			in, out := &in.Add, &out.Add
 			*out = make([]Capability, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.Drop != nil {
 			in, out := &in.Drop, &out.Drop
 			*out = make([]Capability, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -385,9 +381,7 @@ func DeepCopy_v1_ComponentStatus(in interface{}, out interface{}, c *conversion.
 		if in.Conditions != nil {
 			in, out := &in.Conditions, &out.Conditions
 			*out = make([]ComponentCondition, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -509,9 +503,7 @@ func DeepCopy_v1_Container(in interface{}, out interface{}, c *conversion.Cloner
 		if in.Ports != nil {
 			in, out := &in.Ports, &out.Ports
 			*out = make([]ContainerPort, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.EnvFrom != nil {
 			in, out := &in.EnvFrom, &out.EnvFrom
@@ -537,9 +529,7 @@ func DeepCopy_v1_Container(in interface{}, out interface{}, c *conversion.Cloner
 		if in.VolumeMounts != nil {
 			in, out := &in.VolumeMounts, &out.VolumeMounts
 			*out = make([]VolumeMount, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.LivenessProbe != nil {
 			in, out := &in.LivenessProbe, &out.LivenessProbe
@@ -816,9 +806,7 @@ func DeepCopy_v1_EndpointSubset(in interface{}, out interface{}, c *conversion.C
 		if in.Ports != nil {
 			in, out := &in.Ports, &out.Ports
 			*out = make([]EndpointPort, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -1072,9 +1060,7 @@ func DeepCopy_v1_HTTPGetAction(in interface{}, out interface{}, c *conversion.Cl
 		if in.HTTPHeaders != nil {
 			in, out := &in.HTTPHeaders, &out.HTTPHeaders
 			*out = make([]HTTPHeader, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -1320,9 +1306,7 @@ func DeepCopy_v1_LoadBalancerStatus(in interface{}, out interface{}, c *conversi
 		if in.Ingress != nil {
 			in, out := &in.Ingress, &out.Ingress
 			*out = make([]LoadBalancerIngress, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -1389,9 +1373,7 @@ func DeepCopy_v1_NamespaceSpec(in interface{}, out interface{}, c *conversion.Cl
 		if in.Finalizers != nil {
 			in, out := &in.Finalizers, &out.Finalizers
 			*out = make([]FinalizerName, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -1610,9 +1592,7 @@ func DeepCopy_v1_NodeStatus(in interface{}, out interface{}, c *conversion.Clone
 		if in.Addresses != nil {
 			in, out := &in.Addresses, &out.Addresses
 			*out = make([]NodeAddress, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.Images != nil {
 			in, out := &in.Images, &out.Images
@@ -1626,16 +1606,12 @@ func DeepCopy_v1_NodeStatus(in interface{}, out interface{}, c *conversion.Clone
 		if in.VolumesInUse != nil {
 			in, out := &in.VolumesInUse, &out.VolumesInUse
 			*out = make([]UniqueVolumeName, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.VolumesAttached != nil {
 			in, out := &in.VolumesAttached, &out.VolumesAttached
 			*out = make([]AttachedVolume, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -1781,9 +1757,7 @@ func DeepCopy_v1_PersistentVolumeClaimSpec(in interface{}, out interface{}, c *c
 		if in.AccessModes != nil {
 			in, out := &in.AccessModes, &out.AccessModes
 			*out = make([]PersistentVolumeAccessMode, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.Selector != nil {
 			in, out := &in.Selector, &out.Selector
@@ -1808,9 +1782,7 @@ func DeepCopy_v1_PersistentVolumeClaimStatus(in interface{}, out interface{}, c
 		if in.AccessModes != nil {
 			in, out := &in.AccessModes, &out.AccessModes
 			*out = make([]PersistentVolumeAccessMode, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.Capacity != nil {
 			in, out := &in.Capacity, &out.Capacity
@@ -1972,9 +1944,7 @@ func DeepCopy_v1_PersistentVolumeSpec(in interface{}, out interface{}, c *conver
 		if in.AccessModes != nil {
 			in, out := &in.AccessModes, &out.AccessModes
 			*out = make([]PersistentVolumeAccessMode, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.ClaimRef != nil {
 			in, out := &in.ClaimRef, &out.ClaimRef
@@ -2313,9 +2283,7 @@ func DeepCopy_v1_PodSpec(in interface{}, out interface{}, c *conversion.Cloner)
 		if in.ImagePullSecrets != nil {
 			in, out := &in.ImagePullSecrets, &out.ImagePullSecrets
 			*out = make([]LocalObjectReference, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.Affinity != nil {
 			in, out := &in.Affinity, &out.Affinity
@@ -2693,9 +2661,7 @@ func DeepCopy_v1_ResourceQuotaSpec(in interface{}, out interface{}, c *conversio
 		if in.Scopes != nil {
 			in, out := &in.Scopes, &out.Scopes
 			*out = make([]ResourceQuotaScope, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -2930,16 +2896,12 @@ func DeepCopy_v1_ServiceAccount(in interface{}, out interface{}, c *conversion.C
 		if in.Secrets != nil {
 			in, out := &in.Secrets, &out.Secrets
 			*out = make([]ObjectReference, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.ImagePullSecrets != nil {
 			in, out := &in.ImagePullSecrets, &out.ImagePullSecrets
 			*out = make([]LocalObjectReference, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -3007,9 +2969,7 @@ func DeepCopy_v1_ServiceSpec(in interface{}, out interface{}, c *conversion.Clon
 		if in.Ports != nil {
 			in, out := &in.Ports, &out.Ports
 			*out = make([]ServicePort, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.Selector != nil {
 			in, out := &in.Selector, &out.Selector
diff --git a/pkg/api/zz_generated.deepcopy.go b/pkg/api/zz_generated.deepcopy.go
index cd5df234e27..b489267e522 100644
--- a/pkg/api/zz_generated.deepcopy.go
+++ b/pkg/api/zz_generated.deepcopy.go
@@ -323,16 +323,12 @@ func DeepCopy_api_Capabilities(in interface{}, out interface{}, c *conversion.Cl
 		if in.Add != nil {
 			in, out := &in.Add, &out.Add
 			*out = make([]Capability, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.Drop != nil {
 			in, out := &in.Drop, &out.Drop
 			*out = make([]Capability, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -388,9 +384,7 @@ func DeepCopy_api_ComponentStatus(in interface{}, out interface{}, c *conversion
 		if in.Conditions != nil {
 			in, out := &in.Conditions, &out.Conditions
 			*out = make([]ComponentCondition, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -512,9 +506,7 @@ func DeepCopy_api_Container(in interface{}, out interface{}, c *conversion.Clone
 		if in.Ports != nil {
 			in, out := &in.Ports, &out.Ports
 			*out = make([]ContainerPort, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.EnvFrom != nil {
 			in, out := &in.EnvFrom, &out.EnvFrom
@@ -540,9 +532,7 @@ func DeepCopy_api_Container(in interface{}, out interface{}, c *conversion.Clone
 		if in.VolumeMounts != nil {
 			in, out := &in.VolumeMounts, &out.VolumeMounts
 			*out = make([]VolumeMount, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.LivenessProbe != nil {
 			in, out := &in.LivenessProbe, &out.LivenessProbe
@@ -844,9 +834,7 @@ func DeepCopy_api_EndpointSubset(in interface{}, out interface{}, c *conversion.
 		if in.Ports != nil {
 			in, out := &in.Ports, &out.Ports
 			*out = make([]EndpointPort, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -1100,9 +1088,7 @@ func DeepCopy_api_HTTPGetAction(in interface{}, out interface{}, c *conversion.C
 		if in.HTTPHeaders != nil {
 			in, out := &in.HTTPHeaders, &out.HTTPHeaders
 			*out = make([]HTTPHeader, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -1364,9 +1350,7 @@ func DeepCopy_api_LoadBalancerStatus(in interface{}, out interface{}, c *convers
 		if in.Ingress != nil {
 			in, out := &in.Ingress, &out.Ingress
 			*out = make([]LoadBalancerIngress, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -1433,9 +1417,7 @@ func DeepCopy_api_NamespaceSpec(in interface{}, out interface{}, c *conversion.C
 		if in.Finalizers != nil {
 			in, out := &in.Finalizers, &out.Finalizers
 			*out = make([]FinalizerName, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -1654,9 +1636,7 @@ func DeepCopy_api_NodeStatus(in interface{}, out interface{}, c *conversion.Clon
 		if in.Addresses != nil {
 			in, out := &in.Addresses, &out.Addresses
 			*out = make([]NodeAddress, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.Images != nil {
 			in, out := &in.Images, &out.Images
@@ -1670,16 +1650,12 @@ func DeepCopy_api_NodeStatus(in interface{}, out interface{}, c *conversion.Clon
 		if in.VolumesInUse != nil {
 			in, out := &in.VolumesInUse, &out.VolumesInUse
 			*out = make([]UniqueVolumeName, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.VolumesAttached != nil {
 			in, out := &in.VolumesAttached, &out.VolumesAttached
 			*out = make([]AttachedVolume, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -1825,9 +1801,7 @@ func DeepCopy_api_PersistentVolumeClaimSpec(in interface{}, out interface{}, c *
 		if in.AccessModes != nil {
 			in, out := &in.AccessModes, &out.AccessModes
 			*out = make([]PersistentVolumeAccessMode, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.Selector != nil {
 			in, out := &in.Selector, &out.Selector
@@ -1852,9 +1826,7 @@ func DeepCopy_api_PersistentVolumeClaimStatus(in interface{}, out interface{}, c
 		if in.AccessModes != nil {
 			in, out := &in.AccessModes, &out.AccessModes
 			*out = make([]PersistentVolumeAccessMode, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.Capacity != nil {
 			in, out := &in.Capacity, &out.Capacity
@@ -2016,9 +1988,7 @@ func DeepCopy_api_PersistentVolumeSpec(in interface{}, out interface{}, c *conve
 		if in.AccessModes != nil {
 			in, out := &in.AccessModes, &out.AccessModes
 			*out = make([]PersistentVolumeAccessMode, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.ClaimRef != nil {
 			in, out := &in.ClaimRef, &out.ClaimRef
@@ -2357,9 +2327,7 @@ func DeepCopy_api_PodSpec(in interface{}, out interface{}, c *conversion.Cloner)
 		if in.ImagePullSecrets != nil {
 			in, out := &in.ImagePullSecrets, &out.ImagePullSecrets
 			*out = make([]LocalObjectReference, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.Affinity != nil {
 			in, out := &in.Affinity, &out.Affinity
@@ -2732,9 +2700,7 @@ func DeepCopy_api_ResourceQuotaSpec(in interface{}, out interface{}, c *conversi
 		if in.Scopes != nil {
 			in, out := &in.Scopes, &out.Scopes
 			*out = make([]ResourceQuotaScope, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -2962,16 +2928,12 @@ func DeepCopy_api_ServiceAccount(in interface{}, out interface{}, c *conversion.
 		if in.Secrets != nil {
 			in, out := &in.Secrets, &out.Secrets
 			*out = make([]ObjectReference, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.ImagePullSecrets != nil {
 			in, out := &in.ImagePullSecrets, &out.ImagePullSecrets
 			*out = make([]LocalObjectReference, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -3039,9 +3001,7 @@ func DeepCopy_api_ServiceSpec(in interface{}, out interface{}, c *conversion.Clo
 		if in.Ports != nil {
 			in, out := &in.Ports, &out.Ports
 			*out = make([]ServicePort, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.Selector != nil {
 			in, out := &in.Selector, &out.Selector
diff --git a/pkg/apis/autoscaling/validation/BUILD b/pkg/apis/autoscaling/validation/BUILD
index 95de3f420df..ec72afaf8de 100644
--- a/pkg/apis/autoscaling/validation/BUILD
+++ b/pkg/apis/autoscaling/validation/BUILD
@@ -28,7 +28,6 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
-        "//pkg/api:go_default_library",
         "//pkg/apis/autoscaling:go_default_library",
         "//pkg/controller/podautoscaler:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
diff --git a/pkg/apis/batch/v2alpha1/zz_generated.deepcopy.go b/pkg/apis/batch/v2alpha1/zz_generated.deepcopy.go
index ed3558b8fab..09bd21ab1b4 100644
--- a/pkg/apis/batch/v2alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/batch/v2alpha1/zz_generated.deepcopy.go
@@ -118,9 +118,7 @@ func DeepCopy_v2alpha1_CronJobStatus(in interface{}, out interface{}, c *convers
 		if in.Active != nil {
 			in, out := &in.Active, &out.Active
 			*out = make([]api_v1.ObjectReference, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.LastScheduleTime != nil {
 			in, out := &in.LastScheduleTime, &out.LastScheduleTime
diff --git a/pkg/apis/batch/zz_generated.deepcopy.go b/pkg/apis/batch/zz_generated.deepcopy.go
index 78eaf0aba3c..b620c81422b 100644
--- a/pkg/apis/batch/zz_generated.deepcopy.go
+++ b/pkg/apis/batch/zz_generated.deepcopy.go
@@ -118,9 +118,7 @@ func DeepCopy_batch_CronJobStatus(in interface{}, out interface{}, c *conversion
 		if in.Active != nil {
 			in, out := &in.Active, &out.Active
 			*out = make([]api.ObjectReference, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.LastScheduleTime != nil {
 			in, out := &in.LastScheduleTime, &out.LastScheduleTime
diff --git a/pkg/apis/certificates/v1beta1/zz_generated.deepcopy.go b/pkg/apis/certificates/v1beta1/zz_generated.deepcopy.go
index ea6a5a23f35..5db3b92a4b2 100644
--- a/pkg/apis/certificates/v1beta1/zz_generated.deepcopy.go
+++ b/pkg/apis/certificates/v1beta1/zz_generated.deepcopy.go
@@ -104,9 +104,7 @@ func DeepCopy_v1beta1_CertificateSigningRequestSpec(in interface{}, out interfac
 		if in.Usages != nil {
 			in, out := &in.Usages, &out.Usages
 			*out = make([]KeyUsage, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.Groups != nil {
 			in, out := &in.Groups, &out.Groups
diff --git a/pkg/apis/certificates/zz_generated.deepcopy.go b/pkg/apis/certificates/zz_generated.deepcopy.go
index c752a76db7b..2372ca64509 100644
--- a/pkg/apis/certificates/zz_generated.deepcopy.go
+++ b/pkg/apis/certificates/zz_generated.deepcopy.go
@@ -104,9 +104,7 @@ func DeepCopy_certificates_CertificateSigningRequestSpec(in interface{}, out int
 		if in.Usages != nil {
 			in, out := &in.Usages, &out.Usages
 			*out = make([]KeyUsage, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.Groups != nil {
 			in, out := &in.Groups, &out.Groups
diff --git a/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go
index c3bf6ee9c8f..3e556882e32 100644
--- a/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go
@@ -257,9 +257,7 @@ func DeepCopy_v1alpha1_KubeletConfiguration(in interface{}, out interface{}, c *
 		if in.RegisterWithTaints != nil {
 			in, out := &in.RegisterWithTaints, &out.RegisterWithTaints
 			*out = make([]v1.Taint, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.KubeAPIQPS != nil {
 			in, out := &in.KubeAPIQPS, &out.KubeAPIQPS
diff --git a/pkg/apis/componentconfig/zz_generated.deepcopy.go b/pkg/apis/componentconfig/zz_generated.deepcopy.go
index b32b8878079..a88e2731e04 100644
--- a/pkg/apis/componentconfig/zz_generated.deepcopy.go
+++ b/pkg/apis/componentconfig/zz_generated.deepcopy.go
@@ -197,9 +197,7 @@ func DeepCopy_componentconfig_KubeletConfiguration(in interface{}, out interface
 		if in.RegisterWithTaints != nil {
 			in, out := &in.RegisterWithTaints, &out.RegisterWithTaints
 			*out = make([]api.Taint, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.NodeLabels != nil {
 			in, out := &in.NodeLabels, &out.NodeLabels
diff --git a/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go b/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go
index 76f43bca433..4f8b281550c 100644
--- a/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go
+++ b/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go
@@ -390,9 +390,7 @@ func DeepCopy_v1beta1_FSGroupStrategyOptions(in interface{}, out interface{}, c
 		if in.Ranges != nil {
 			in, out := &in.Ranges, &out.Ranges
 			*out = make([]IDRange, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -415,9 +413,7 @@ func DeepCopy_v1beta1_HTTPIngressRuleValue(in interface{}, out interface{}, c *c
 		if in.Paths != nil {
 			in, out := &in.Paths, &out.Paths
 			*out = make([]HTTPIngressPath, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -827,37 +823,27 @@ func DeepCopy_v1beta1_PodSecurityPolicySpec(in interface{}, out interface{}, c *
 		if in.DefaultAddCapabilities != nil {
 			in, out := &in.DefaultAddCapabilities, &out.DefaultAddCapabilities
 			*out = make([]api_v1.Capability, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.RequiredDropCapabilities != nil {
 			in, out := &in.RequiredDropCapabilities, &out.RequiredDropCapabilities
 			*out = make([]api_v1.Capability, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.AllowedCapabilities != nil {
 			in, out := &in.AllowedCapabilities, &out.AllowedCapabilities
 			*out = make([]api_v1.Capability, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.Volumes != nil {
 			in, out := &in.Volumes, &out.Volumes
 			*out = make([]FSType, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.HostPorts != nil {
 			in, out := &in.HostPorts, &out.HostPorts
 			*out = make([]HostPortRange, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if err := DeepCopy_v1beta1_SELinuxStrategyOptions(&in.SELinux, &out.SELinux, c); err != nil {
 			return err
@@ -1011,9 +997,7 @@ func DeepCopy_v1beta1_RunAsUserStrategyOptions(in interface{}, out interface{},
 		if in.Ranges != nil {
 			in, out := &in.Ranges, &out.Ranges
 			*out = make([]IDRange, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -1092,9 +1076,7 @@ func DeepCopy_v1beta1_SupplementalGroupsStrategyOptions(in interface{}, out inte
 		if in.Ranges != nil {
 			in, out := &in.Ranges, &out.Ranges
 			*out = make([]IDRange, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -1113,9 +1095,7 @@ func DeepCopy_v1beta1_ThirdPartyResource(in interface{}, out interface{}, c *con
 		if in.Versions != nil {
 			in, out := &in.Versions, &out.Versions
 			*out = make([]APIVersion, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
diff --git a/pkg/apis/extensions/zz_generated.deepcopy.go b/pkg/apis/extensions/zz_generated.deepcopy.go
index de5703e3bdf..d01391d9f3e 100644
--- a/pkg/apis/extensions/zz_generated.deepcopy.go
+++ b/pkg/apis/extensions/zz_generated.deepcopy.go
@@ -368,9 +368,7 @@ func DeepCopy_extensions_FSGroupStrategyOptions(in interface{}, out interface{},
 		if in.Ranges != nil {
 			in, out := &in.Ranges, &out.Ranges
 			*out = make([]IDRange, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -393,9 +391,7 @@ func DeepCopy_extensions_HTTPIngressRuleValue(in interface{}, out interface{}, c
 		if in.Paths != nil {
 			in, out := &in.Paths, &out.Paths
 			*out = make([]HTTPIngressPath, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -724,37 +720,27 @@ func DeepCopy_extensions_PodSecurityPolicySpec(in interface{}, out interface{},
 		if in.DefaultAddCapabilities != nil {
 			in, out := &in.DefaultAddCapabilities, &out.DefaultAddCapabilities
 			*out = make([]api.Capability, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.RequiredDropCapabilities != nil {
 			in, out := &in.RequiredDropCapabilities, &out.RequiredDropCapabilities
 			*out = make([]api.Capability, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.AllowedCapabilities != nil {
 			in, out := &in.AllowedCapabilities, &out.AllowedCapabilities
 			*out = make([]api.Capability, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.Volumes != nil {
 			in, out := &in.Volumes, &out.Volumes
 			*out = make([]FSType, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.HostPorts != nil {
 			in, out := &in.HostPorts, &out.HostPorts
 			*out = make([]HostPortRange, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if err := DeepCopy_extensions_SELinuxStrategyOptions(&in.SELinux, &out.SELinux, c); err != nil {
 			return err
@@ -893,9 +879,7 @@ func DeepCopy_extensions_RunAsUserStrategyOptions(in interface{}, out interface{
 		if in.Ranges != nil {
 			in, out := &in.Ranges, &out.Ranges
 			*out = make([]IDRange, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -966,9 +950,7 @@ func DeepCopy_extensions_SupplementalGroupsStrategyOptions(in interface{}, out i
 		if in.Ranges != nil {
 			in, out := &in.Ranges, &out.Ranges
 			*out = make([]IDRange, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -987,9 +969,7 @@ func DeepCopy_extensions_ThirdPartyResource(in interface{}, out interface{}, c *
 		if in.Versions != nil {
 			in, out := &in.Versions, &out.Versions
 			*out = make([]APIVersion, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
diff --git a/pkg/apis/imagepolicy/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/imagepolicy/v1alpha1/zz_generated.deepcopy.go
index ec1e375f0c8..e306af0dae2 100644
--- a/pkg/apis/imagepolicy/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/imagepolicy/v1alpha1/zz_generated.deepcopy.go
@@ -76,9 +76,7 @@ func DeepCopy_v1alpha1_ImageReviewSpec(in interface{}, out interface{}, c *conve
 		if in.Containers != nil {
 			in, out := &in.Containers, &out.Containers
 			*out = make([]ImageReviewContainerSpec, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.Annotations != nil {
 			in, out := &in.Annotations, &out.Annotations
diff --git a/pkg/apis/imagepolicy/zz_generated.deepcopy.go b/pkg/apis/imagepolicy/zz_generated.deepcopy.go
index 316b45a88d7..a2fa6c2effc 100644
--- a/pkg/apis/imagepolicy/zz_generated.deepcopy.go
+++ b/pkg/apis/imagepolicy/zz_generated.deepcopy.go
@@ -76,9 +76,7 @@ func DeepCopy_imagepolicy_ImageReviewSpec(in interface{}, out interface{}, c *co
 		if in.Containers != nil {
 			in, out := &in.Containers, &out.Containers
 			*out = make([]ImageReviewContainerSpec, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.Annotations != nil {
 			in, out := &in.Annotations, &out.Annotations
diff --git a/pkg/apis/rbac/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/rbac/v1alpha1/zz_generated.deepcopy.go
index 0bed09369de..f4dfd3ca7ca 100644
--- a/pkg/apis/rbac/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/rbac/v1alpha1/zz_generated.deepcopy.go
@@ -85,9 +85,7 @@ func DeepCopy_v1alpha1_ClusterRoleBinding(in interface{}, out interface{}, c *co
 		if in.Subjects != nil {
 			in, out := &in.Subjects, &out.Subjects
 			*out = make([]Subject, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -199,9 +197,7 @@ func DeepCopy_v1alpha1_RoleBinding(in interface{}, out interface{}, c *conversio
 		if in.Subjects != nil {
 			in, out := &in.Subjects, &out.Subjects
 			*out = make([]Subject, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
diff --git a/pkg/apis/rbac/v1beta1/zz_generated.deepcopy.go b/pkg/apis/rbac/v1beta1/zz_generated.deepcopy.go
index cdd9a231277..dccae9b4f52 100644
--- a/pkg/apis/rbac/v1beta1/zz_generated.deepcopy.go
+++ b/pkg/apis/rbac/v1beta1/zz_generated.deepcopy.go
@@ -85,9 +85,7 @@ func DeepCopy_v1beta1_ClusterRoleBinding(in interface{}, out interface{}, c *con
 		if in.Subjects != nil {
 			in, out := &in.Subjects, &out.Subjects
 			*out = make([]Subject, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -199,9 +197,7 @@ func DeepCopy_v1beta1_RoleBinding(in interface{}, out interface{}, c *conversion
 		if in.Subjects != nil {
 			in, out := &in.Subjects, &out.Subjects
 			*out = make([]Subject, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
diff --git a/pkg/apis/rbac/validation/BUILD b/pkg/apis/rbac/validation/BUILD
index ff9ff4a6e60..eeb39a6fc06 100644
--- a/pkg/apis/rbac/validation/BUILD
+++ b/pkg/apis/rbac/validation/BUILD
@@ -26,7 +26,6 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
-        "//pkg/api:go_default_library",
         "//pkg/apis/rbac:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/util/validation/field",
diff --git a/pkg/apis/rbac/zz_generated.deepcopy.go b/pkg/apis/rbac/zz_generated.deepcopy.go
index fa70dfcb3f3..db5d08cdf3a 100644
--- a/pkg/apis/rbac/zz_generated.deepcopy.go
+++ b/pkg/apis/rbac/zz_generated.deepcopy.go
@@ -85,9 +85,7 @@ func DeepCopy_rbac_ClusterRoleBinding(in interface{}, out interface{}, c *conver
 		if in.Subjects != nil {
 			in, out := &in.Subjects, &out.Subjects
 			*out = make([]Subject, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -199,9 +197,7 @@ func DeepCopy_rbac_RoleBinding(in interface{}, out interface{}, c *conversion.Cl
 		if in.Subjects != nil {
 			in, out := &in.Subjects, &out.Subjects
 			*out = make([]Subject, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
diff --git a/pkg/client/cache/BUILD b/pkg/client/cache/BUILD
index 6755a02763a..d2038aa37e3 100644
--- a/pkg/client/cache/BUILD
+++ b/pkg/client/cache/BUILD
@@ -31,11 +31,9 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/v1:go_default_library",
         "//vendor:github.com/golang/glog",
         "//vendor:k8s.io/apimachinery/pkg/api/errors",
         "//vendor:k8s.io/apimachinery/pkg/api/meta",
-        "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/fields",
         "//vendor:k8s.io/apimachinery/pkg/labels",
@@ -59,7 +57,6 @@ go_test(
         "expiration_cache_test.go",
         "fifo_test.go",
         "index_test.go",
-        "listwatch_test.go",
         "mutation_detector_test.go",
         "processor_listener_test.go",
         "reflector_test.go",
@@ -70,20 +67,15 @@ go_test(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/testapi:go_default_library",
         "//pkg/api/v1:go_default_library",
-        "//pkg/client/clientset_generated/internalclientset:go_default_library",
         "//pkg/client/testing/cache:go_default_library",
         "//vendor:github.com/google/gofuzz",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
-        "//vendor:k8s.io/apimachinery/pkg/fields",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/util/sets",
         "//vendor:k8s.io/apimachinery/pkg/util/wait",
         "//vendor:k8s.io/apimachinery/pkg/watch",
         "//vendor:k8s.io/client-go/pkg/util/clock",
-        "//vendor:k8s.io/client-go/pkg/util/testing",
-        "//vendor:k8s.io/client-go/rest",
     ],
 )
 
@@ -99,3 +91,22 @@ filegroup(
     srcs = [":package-srcs"],
     tags = ["automanaged"],
 )
+
+go_test(
+    name = "go_default_xtest",
+    srcs = ["listwatch_test.go"],
+    tags = ["automanaged"],
+    deps = [
+        "//pkg/api:go_default_library",
+        "//pkg/api/testapi:go_default_library",
+        "//pkg/api/v1:go_default_library",
+        "//pkg/client/cache:go_default_library",
+        "//pkg/client/clientset_generated/internalclientset:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
+        "//vendor:k8s.io/apimachinery/pkg/fields",
+        "//vendor:k8s.io/apimachinery/pkg/runtime",
+        "//vendor:k8s.io/apimachinery/pkg/watch",
+        "//vendor:k8s.io/client-go/pkg/util/testing",
+        "//vendor:k8s.io/client-go/rest",
+    ],
+)
diff --git a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/fake_statefulset.go b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/fake_statefulset.go
index e0a737ef631..cdea657825e 100644
--- a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/fake_statefulset.go
+++ b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/fake_statefulset.go
@@ -72,7 +72,7 @@ func (c *FakeStatefulSets) Delete(name string, options *v1.DeleteOptions) error
 	return err
 }
 
-func (c *FakeStatefulSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeStatefulSets) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(statefulsetsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1beta1.StatefulSetList{})
@@ -89,7 +89,7 @@ func (c *FakeStatefulSets) Get(name string, options meta_v1.GetOptions) (result
 	return obj.(*v1beta1.StatefulSet), err
 }
 
-func (c *FakeStatefulSets) List(opts v1.ListOptions) (result *v1beta1.StatefulSetList, err error) {
+func (c *FakeStatefulSets) List(opts meta_v1.ListOptions) (result *v1beta1.StatefulSetList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(statefulsetsResource, c.ns, opts), &v1beta1.StatefulSetList{})
 
@@ -111,7 +111,7 @@ func (c *FakeStatefulSets) List(opts v1.ListOptions) (result *v1beta1.StatefulSe
 }
 
 // Watch returns a watch.Interface that watches the requested statefulSets.
-func (c *FakeStatefulSets) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeStatefulSets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(statefulsetsResource, c.ns, opts))
 
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 2278785716c..dd206bd9824 100644
--- a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/statefulset.go
+++ b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/statefulset.go
@@ -38,10 +38,10 @@ type StatefulSetInterface interface {
 	Update(*v1beta1.StatefulSet) (*v1beta1.StatefulSet, error)
 	UpdateStatus(*v1beta1.StatefulSet) (*v1beta1.StatefulSet, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1beta1.StatefulSet, error)
-	List(opts v1.ListOptions) (*v1beta1.StatefulSetList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1beta1.StatefulSetList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.StatefulSet, err error)
 	StatefulSetExpansion
 }
@@ -113,7 +113,7 @@ func (c *statefulSets) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *statefulSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *statefulSets) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("statefulsets").
@@ -137,7 +137,7 @@ func (c *statefulSets) Get(name string, options meta_v1.GetOptions) (result *v1b
 }
 
 // List takes label and field selectors, and returns the list of StatefulSets that match those selectors.
-func (c *statefulSets) List(opts v1.ListOptions) (result *v1beta1.StatefulSetList, err error) {
+func (c *statefulSets) List(opts meta_v1.ListOptions) (result *v1beta1.StatefulSetList, err error) {
 	result = &v1beta1.StatefulSetList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -149,7 +149,7 @@ 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) {
+func (c *statefulSets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go
index b6e3cad024d..ecb7edbe903 100644
--- a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go
+++ b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go
@@ -72,7 +72,7 @@ func (c *FakeHorizontalPodAutoscalers) Delete(name string, options *api_v1.Delet
 	return err
 }
 
-func (c *FakeHorizontalPodAutoscalers) DeleteCollection(options *api_v1.DeleteOptions, listOptions api_v1.ListOptions) error {
+func (c *FakeHorizontalPodAutoscalers) DeleteCollection(options *api_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(horizontalpodautoscalersResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1.HorizontalPodAutoscalerList{})
@@ -89,7 +89,7 @@ func (c *FakeHorizontalPodAutoscalers) Get(name string, options meta_v1.GetOptio
 	return obj.(*v1.HorizontalPodAutoscaler), err
 }
 
-func (c *FakeHorizontalPodAutoscalers) List(opts api_v1.ListOptions) (result *v1.HorizontalPodAutoscalerList, err error) {
+func (c *FakeHorizontalPodAutoscalers) List(opts meta_v1.ListOptions) (result *v1.HorizontalPodAutoscalerList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(horizontalpodautoscalersResource, c.ns, opts), &v1.HorizontalPodAutoscalerList{})
 
@@ -111,7 +111,7 @@ func (c *FakeHorizontalPodAutoscalers) List(opts api_v1.ListOptions) (result *v1
 }
 
 // Watch returns a watch.Interface that watches the requested horizontalPodAutoscalers.
-func (c *FakeHorizontalPodAutoscalers) Watch(opts api_v1.ListOptions) (watch.Interface, error) {
+func (c *FakeHorizontalPodAutoscalers) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(horizontalpodautoscalersResource, c.ns, opts))
 
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 7a268a04c87..7aaa8851942 100644
--- a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/horizontalpodautoscaler.go
+++ b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/horizontalpodautoscaler.go
@@ -38,10 +38,10 @@ type HorizontalPodAutoscalerInterface interface {
 	Update(*v1.HorizontalPodAutoscaler) (*v1.HorizontalPodAutoscaler, error)
 	UpdateStatus(*v1.HorizontalPodAutoscaler) (*v1.HorizontalPodAutoscaler, error)
 	Delete(name string, options *api_v1.DeleteOptions) error
-	DeleteCollection(options *api_v1.DeleteOptions, listOptions api_v1.ListOptions) error
+	DeleteCollection(options *api_v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1.HorizontalPodAutoscaler, error)
-	List(opts api_v1.ListOptions) (*v1.HorizontalPodAutoscalerList, error)
-	Watch(opts api_v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1.HorizontalPodAutoscalerList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.HorizontalPodAutoscaler, err error)
 	HorizontalPodAutoscalerExpansion
 }
@@ -113,7 +113,7 @@ func (c *horizontalPodAutoscalers) Delete(name string, options *api_v1.DeleteOpt
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *horizontalPodAutoscalers) DeleteCollection(options *api_v1.DeleteOptions, listOptions api_v1.ListOptions) error {
+func (c *horizontalPodAutoscalers) DeleteCollection(options *api_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("horizontalpodautoscalers").
@@ -137,7 +137,7 @@ func (c *horizontalPodAutoscalers) Get(name string, options meta_v1.GetOptions)
 }
 
 // List takes label and field selectors, and returns the list of HorizontalPodAutoscalers that match those selectors.
-func (c *horizontalPodAutoscalers) List(opts api_v1.ListOptions) (result *v1.HorizontalPodAutoscalerList, err error) {
+func (c *horizontalPodAutoscalers) List(opts meta_v1.ListOptions) (result *v1.HorizontalPodAutoscalerList, err error) {
 	result = &v1.HorizontalPodAutoscalerList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -149,7 +149,7 @@ func (c *horizontalPodAutoscalers) List(opts api_v1.ListOptions) (result *v1.Hor
 }
 
 // Watch returns a watch.Interface that watches the requested horizontalPodAutoscalers.
-func (c *horizontalPodAutoscalers) Watch(opts api_v1.ListOptions) (watch.Interface, error) {
+func (c *horizontalPodAutoscalers) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/fake_job.go b/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/fake_job.go
index d0d80117450..0d1aa59076e 100644
--- a/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/fake_job.go
+++ b/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/fake_job.go
@@ -72,7 +72,7 @@ func (c *FakeJobs) Delete(name string, options *api_v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeJobs) DeleteCollection(options *api_v1.DeleteOptions, listOptions api_v1.ListOptions) error {
+func (c *FakeJobs) DeleteCollection(options *api_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(jobsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1.JobList{})
@@ -89,7 +89,7 @@ func (c *FakeJobs) Get(name string, options meta_v1.GetOptions) (result *v1.Job,
 	return obj.(*v1.Job), err
 }
 
-func (c *FakeJobs) List(opts api_v1.ListOptions) (result *v1.JobList, err error) {
+func (c *FakeJobs) List(opts meta_v1.ListOptions) (result *v1.JobList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(jobsResource, c.ns, opts), &v1.JobList{})
 
@@ -111,7 +111,7 @@ func (c *FakeJobs) List(opts api_v1.ListOptions) (result *v1.JobList, err error)
 }
 
 // Watch returns a watch.Interface that watches the requested jobs.
-func (c *FakeJobs) Watch(opts api_v1.ListOptions) (watch.Interface, error) {
+func (c *FakeJobs) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(jobsResource, c.ns, opts))
 
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 67ff9f03e0c..495c4006261 100644
--- a/pkg/client/clientset_generated/clientset/typed/batch/v1/job.go
+++ b/pkg/client/clientset_generated/clientset/typed/batch/v1/job.go
@@ -38,10 +38,10 @@ type JobInterface interface {
 	Update(*v1.Job) (*v1.Job, error)
 	UpdateStatus(*v1.Job) (*v1.Job, error)
 	Delete(name string, options *api_v1.DeleteOptions) error
-	DeleteCollection(options *api_v1.DeleteOptions, listOptions api_v1.ListOptions) error
+	DeleteCollection(options *api_v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1.Job, error)
-	List(opts api_v1.ListOptions) (*v1.JobList, error)
-	Watch(opts api_v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1.JobList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Job, err error)
 	JobExpansion
 }
@@ -113,7 +113,7 @@ func (c *jobs) Delete(name string, options *api_v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *jobs) DeleteCollection(options *api_v1.DeleteOptions, listOptions api_v1.ListOptions) error {
+func (c *jobs) DeleteCollection(options *api_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("jobs").
@@ -137,7 +137,7 @@ func (c *jobs) Get(name string, options meta_v1.GetOptions) (result *v1.Job, err
 }
 
 // List takes label and field selectors, and returns the list of Jobs that match those selectors.
-func (c *jobs) List(opts api_v1.ListOptions) (result *v1.JobList, err error) {
+func (c *jobs) List(opts meta_v1.ListOptions) (result *v1.JobList, err error) {
 	result = &v1.JobList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -149,7 +149,7 @@ func (c *jobs) List(opts api_v1.ListOptions) (result *v1.JobList, err error) {
 }
 
 // Watch returns a watch.Interface that watches the requested jobs.
-func (c *jobs) Watch(opts api_v1.ListOptions) (watch.Interface, error) {
+func (c *jobs) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 f2d40b3ab93..0bb59ff2ec4 100644
--- a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/cronjob.go
+++ b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/cronjob.go
@@ -38,10 +38,10 @@ type CronJobInterface interface {
 	Update(*v2alpha1.CronJob) (*v2alpha1.CronJob, error)
 	UpdateStatus(*v2alpha1.CronJob) (*v2alpha1.CronJob, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v2alpha1.CronJob, error)
-	List(opts v1.ListOptions) (*v2alpha1.CronJobList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v2alpha1.CronJobList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v2alpha1.CronJob, err error)
 	CronJobExpansion
 }
@@ -113,7 +113,7 @@ func (c *cronJobs) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *cronJobs) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *cronJobs) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("cronjobs").
@@ -137,7 +137,7 @@ func (c *cronJobs) Get(name string, options meta_v1.GetOptions) (result *v2alpha
 }
 
 // List takes label and field selectors, and returns the list of CronJobs that match those selectors.
-func (c *cronJobs) List(opts v1.ListOptions) (result *v2alpha1.CronJobList, err error) {
+func (c *cronJobs) List(opts meta_v1.ListOptions) (result *v2alpha1.CronJobList, err error) {
 	result = &v2alpha1.CronJobList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -149,7 +149,7 @@ 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) {
+func (c *cronJobs) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/fake_cronjob.go b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/fake_cronjob.go
index ac99f7f906f..ba193100423 100644
--- a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/fake_cronjob.go
+++ b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/fake_cronjob.go
@@ -72,7 +72,7 @@ func (c *FakeCronJobs) Delete(name string, options *v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeCronJobs) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeCronJobs) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(cronjobsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v2alpha1.CronJobList{})
@@ -89,7 +89,7 @@ func (c *FakeCronJobs) Get(name string, options meta_v1.GetOptions) (result *v2a
 	return obj.(*v2alpha1.CronJob), err
 }
 
-func (c *FakeCronJobs) List(opts v1.ListOptions) (result *v2alpha1.CronJobList, err error) {
+func (c *FakeCronJobs) List(opts meta_v1.ListOptions) (result *v2alpha1.CronJobList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(cronjobsResource, c.ns, opts), &v2alpha1.CronJobList{})
 
@@ -111,7 +111,7 @@ func (c *FakeCronJobs) List(opts v1.ListOptions) (result *v2alpha1.CronJobList,
 }
 
 // Watch returns a watch.Interface that watches the requested cronJobs.
-func (c *FakeCronJobs) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeCronJobs) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(cronjobsResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/fake_job.go b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/fake_job.go
index 1e1980c3adc..616f3b4b6a1 100644
--- a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/fake_job.go
+++ b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/fake_job.go
@@ -72,7 +72,7 @@ func (c *FakeJobs) Delete(name string, options *v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeJobs) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeJobs) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(jobsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v2alpha1.JobList{})
@@ -89,7 +89,7 @@ func (c *FakeJobs) Get(name string, options meta_v1.GetOptions) (result *v2alpha
 	return obj.(*v2alpha1.Job), err
 }
 
-func (c *FakeJobs) List(opts v1.ListOptions) (result *v2alpha1.JobList, err error) {
+func (c *FakeJobs) List(opts meta_v1.ListOptions) (result *v2alpha1.JobList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(jobsResource, c.ns, opts), &v2alpha1.JobList{})
 
@@ -111,7 +111,7 @@ func (c *FakeJobs) List(opts v1.ListOptions) (result *v2alpha1.JobList, err erro
 }
 
 // Watch returns a watch.Interface that watches the requested jobs.
-func (c *FakeJobs) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeJobs) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(jobsResource, c.ns, opts))
 
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 cc92b55a6ec..e7f90f17975 100644
--- a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/job.go
+++ b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/job.go
@@ -38,10 +38,10 @@ type JobInterface interface {
 	Update(*v2alpha1.Job) (*v2alpha1.Job, error)
 	UpdateStatus(*v2alpha1.Job) (*v2alpha1.Job, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v2alpha1.Job, error)
-	List(opts v1.ListOptions) (*v2alpha1.JobList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v2alpha1.JobList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v2alpha1.Job, err error)
 	JobExpansion
 }
@@ -113,7 +113,7 @@ func (c *jobs) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *jobs) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *jobs) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("jobs").
@@ -137,7 +137,7 @@ func (c *jobs) Get(name string, options meta_v1.GetOptions) (result *v2alpha1.Jo
 }
 
 // List takes label and field selectors, and returns the list of Jobs that match those selectors.
-func (c *jobs) List(opts v1.ListOptions) (result *v2alpha1.JobList, err error) {
+func (c *jobs) List(opts meta_v1.ListOptions) (result *v2alpha1.JobList, err error) {
 	result = &v2alpha1.JobList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -149,7 +149,7 @@ 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) {
+func (c *jobs) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 418be1b2637..4c88867eeee 100644
--- a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificatesigningrequest.go
+++ b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificatesigningrequest.go
@@ -38,10 +38,10 @@ type CertificateSigningRequestInterface interface {
 	Update(*v1beta1.CertificateSigningRequest) (*v1beta1.CertificateSigningRequest, error)
 	UpdateStatus(*v1beta1.CertificateSigningRequest) (*v1beta1.CertificateSigningRequest, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1beta1.CertificateSigningRequest, error)
-	List(opts v1.ListOptions) (*v1beta1.CertificateSigningRequestList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1beta1.CertificateSigningRequestList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.CertificateSigningRequest, err error)
 	CertificateSigningRequestExpansion
 }
@@ -107,7 +107,7 @@ func (c *certificateSigningRequests) Delete(name string, options *v1.DeleteOptio
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *certificateSigningRequests) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *certificateSigningRequests) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Resource("certificatesigningrequests").
 		VersionedParams(&listOptions, api.ParameterCodec).
@@ -129,7 +129,7 @@ func (c *certificateSigningRequests) Get(name string, options meta_v1.GetOptions
 }
 
 // List takes label and field selectors, and returns the list of CertificateSigningRequests that match those selectors.
-func (c *certificateSigningRequests) List(opts v1.ListOptions) (result *v1beta1.CertificateSigningRequestList, err error) {
+func (c *certificateSigningRequests) List(opts meta_v1.ListOptions) (result *v1beta1.CertificateSigningRequestList, err error) {
 	result = &v1beta1.CertificateSigningRequestList{}
 	err = c.client.Get().
 		Resource("certificatesigningrequests").
@@ -140,7 +140,7 @@ 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) {
+func (c *certificateSigningRequests) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Resource("certificatesigningrequests").
diff --git a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/fake_certificatesigningrequest.go b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/fake_certificatesigningrequest.go
index bedfb2bf35f..7a91193e516 100644
--- a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/fake_certificatesigningrequest.go
+++ b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/fake_certificatesigningrequest.go
@@ -67,7 +67,7 @@ func (c *FakeCertificateSigningRequests) Delete(name string, options *v1.DeleteO
 	return err
 }
 
-func (c *FakeCertificateSigningRequests) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeCertificateSigningRequests) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewRootDeleteCollectionAction(certificatesigningrequestsResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1beta1.CertificateSigningRequestList{})
@@ -83,7 +83,7 @@ func (c *FakeCertificateSigningRequests) Get(name string, options meta_v1.GetOpt
 	return obj.(*v1beta1.CertificateSigningRequest), err
 }
 
-func (c *FakeCertificateSigningRequests) List(opts v1.ListOptions) (result *v1beta1.CertificateSigningRequestList, err error) {
+func (c *FakeCertificateSigningRequests) List(opts meta_v1.ListOptions) (result *v1beta1.CertificateSigningRequestList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewRootListAction(certificatesigningrequestsResource, opts), &v1beta1.CertificateSigningRequestList{})
 	if obj == nil {
@@ -104,7 +104,7 @@ func (c *FakeCertificateSigningRequests) List(opts v1.ListOptions) (result *v1be
 }
 
 // Watch returns a watch.Interface that watches the requested certificateSigningRequests.
-func (c *FakeCertificateSigningRequests) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeCertificateSigningRequests) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewRootWatchAction(certificatesigningrequestsResource, opts))
 }
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 f3858d92796..29a4c4a4859 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/componentstatus.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/componentstatus.go
@@ -36,10 +36,10 @@ type ComponentStatusInterface interface {
 	Create(*v1.ComponentStatus) (*v1.ComponentStatus, error)
 	Update(*v1.ComponentStatus) (*v1.ComponentStatus, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1.ComponentStatus, error)
-	List(opts v1.ListOptions) (*v1.ComponentStatusList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1.ComponentStatusList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.ComponentStatus, err error)
 	ComponentStatusExpansion
 }
@@ -90,7 +90,7 @@ func (c *componentStatuses) Delete(name string, options *v1.DeleteOptions) error
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *componentStatuses) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *componentStatuses) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Resource("componentstatuses").
 		VersionedParams(&listOptions, api.ParameterCodec).
@@ -112,7 +112,7 @@ func (c *componentStatuses) Get(name string, options meta_v1.GetOptions) (result
 }
 
 // List takes label and field selectors, and returns the list of ComponentStatuses that match those selectors.
-func (c *componentStatuses) List(opts v1.ListOptions) (result *v1.ComponentStatusList, err error) {
+func (c *componentStatuses) List(opts meta_v1.ListOptions) (result *v1.ComponentStatusList, err error) {
 	result = &v1.ComponentStatusList{}
 	err = c.client.Get().
 		Resource("componentstatuses").
@@ -123,7 +123,7 @@ func (c *componentStatuses) List(opts v1.ListOptions) (result *v1.ComponentStatu
 }
 
 // Watch returns a watch.Interface that watches the requested componentStatuses.
-func (c *componentStatuses) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *componentStatuses) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Resource("componentstatuses").
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 01de98954e6..1195e926714 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/configmap.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/configmap.go
@@ -36,10 +36,10 @@ type ConfigMapInterface interface {
 	Create(*v1.ConfigMap) (*v1.ConfigMap, error)
 	Update(*v1.ConfigMap) (*v1.ConfigMap, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1.ConfigMap, error)
-	List(opts v1.ListOptions) (*v1.ConfigMapList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1.ConfigMapList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.ConfigMap, err error)
 	ConfigMapExpansion
 }
@@ -95,7 +95,7 @@ func (c *configMaps) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *configMaps) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *configMaps) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("configmaps").
@@ -119,7 +119,7 @@ func (c *configMaps) Get(name string, options meta_v1.GetOptions) (result *v1.Co
 }
 
 // List takes label and field selectors, and returns the list of ConfigMaps that match those selectors.
-func (c *configMaps) List(opts v1.ListOptions) (result *v1.ConfigMapList, err error) {
+func (c *configMaps) List(opts meta_v1.ListOptions) (result *v1.ConfigMapList, err error) {
 	result = &v1.ConfigMapList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -131,7 +131,7 @@ func (c *configMaps) List(opts v1.ListOptions) (result *v1.ConfigMapList, err er
 }
 
 // Watch returns a watch.Interface that watches the requested configMaps.
-func (c *configMaps) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *configMaps) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 4e688a32e8c..5de52131b6b 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/endpoints.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/endpoints.go
@@ -36,10 +36,10 @@ type EndpointsInterface interface {
 	Create(*v1.Endpoints) (*v1.Endpoints, error)
 	Update(*v1.Endpoints) (*v1.Endpoints, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1.Endpoints, error)
-	List(opts v1.ListOptions) (*v1.EndpointsList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1.EndpointsList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Endpoints, err error)
 	EndpointsExpansion
 }
@@ -95,7 +95,7 @@ func (c *endpoints) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *endpoints) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *endpoints) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("endpoints").
@@ -119,7 +119,7 @@ func (c *endpoints) Get(name string, options meta_v1.GetOptions) (result *v1.End
 }
 
 // List takes label and field selectors, and returns the list of Endpoints that match those selectors.
-func (c *endpoints) List(opts v1.ListOptions) (result *v1.EndpointsList, err error) {
+func (c *endpoints) List(opts meta_v1.ListOptions) (result *v1.EndpointsList, err error) {
 	result = &v1.EndpointsList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -131,7 +131,7 @@ func (c *endpoints) List(opts v1.ListOptions) (result *v1.EndpointsList, err err
 }
 
 // Watch returns a watch.Interface that watches the requested endpoints.
-func (c *endpoints) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *endpoints) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 7ee9a35f173..7e1b3465452 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/event.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/event.go
@@ -36,10 +36,10 @@ type EventInterface interface {
 	Create(*v1.Event) (*v1.Event, error)
 	Update(*v1.Event) (*v1.Event, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1.Event, error)
-	List(opts v1.ListOptions) (*v1.EventList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1.EventList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Event, err error)
 	EventExpansion
 }
@@ -95,7 +95,7 @@ func (c *events) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *events) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *events) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("events").
@@ -119,7 +119,7 @@ func (c *events) Get(name string, options meta_v1.GetOptions) (result *v1.Event,
 }
 
 // List takes label and field selectors, and returns the list of Events that match those selectors.
-func (c *events) List(opts v1.ListOptions) (result *v1.EventList, err error) {
+func (c *events) List(opts meta_v1.ListOptions) (result *v1.EventList, err error) {
 	result = &v1.EventList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -131,7 +131,7 @@ func (c *events) List(opts v1.ListOptions) (result *v1.EventList, err error) {
 }
 
 // Watch returns a watch.Interface that watches the requested events.
-func (c *events) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *events) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_componentstatus.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_componentstatus.go
index ecdf40a1836..2d38b780bd4 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_componentstatus.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_componentstatus.go
@@ -57,7 +57,7 @@ func (c *FakeComponentStatuses) Delete(name string, options *v1.DeleteOptions) e
 	return err
 }
 
-func (c *FakeComponentStatuses) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeComponentStatuses) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewRootDeleteCollectionAction(componentstatusesResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1.ComponentStatusList{})
@@ -73,7 +73,7 @@ func (c *FakeComponentStatuses) Get(name string, options meta_v1.GetOptions) (re
 	return obj.(*v1.ComponentStatus), err
 }
 
-func (c *FakeComponentStatuses) List(opts v1.ListOptions) (result *v1.ComponentStatusList, err error) {
+func (c *FakeComponentStatuses) List(opts meta_v1.ListOptions) (result *v1.ComponentStatusList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewRootListAction(componentstatusesResource, opts), &v1.ComponentStatusList{})
 	if obj == nil {
@@ -94,7 +94,7 @@ func (c *FakeComponentStatuses) List(opts v1.ListOptions) (result *v1.ComponentS
 }
 
 // Watch returns a watch.Interface that watches the requested componentStatuses.
-func (c *FakeComponentStatuses) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeComponentStatuses) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewRootWatchAction(componentstatusesResource, opts))
 }
diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_configmap.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_configmap.go
index eb5303c6147..d6f24794795 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_configmap.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_configmap.go
@@ -61,7 +61,7 @@ func (c *FakeConfigMaps) Delete(name string, options *v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeConfigMaps) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeConfigMaps) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(configmapsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1.ConfigMapList{})
@@ -78,7 +78,7 @@ func (c *FakeConfigMaps) Get(name string, options meta_v1.GetOptions) (result *v
 	return obj.(*v1.ConfigMap), err
 }
 
-func (c *FakeConfigMaps) List(opts v1.ListOptions) (result *v1.ConfigMapList, err error) {
+func (c *FakeConfigMaps) List(opts meta_v1.ListOptions) (result *v1.ConfigMapList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(configmapsResource, c.ns, opts), &v1.ConfigMapList{})
 
@@ -100,7 +100,7 @@ func (c *FakeConfigMaps) List(opts v1.ListOptions) (result *v1.ConfigMapList, er
 }
 
 // Watch returns a watch.Interface that watches the requested configMaps.
-func (c *FakeConfigMaps) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeConfigMaps) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(configmapsResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_endpoints.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_endpoints.go
index 7834346e590..d79abc6790a 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_endpoints.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_endpoints.go
@@ -61,7 +61,7 @@ func (c *FakeEndpoints) Delete(name string, options *v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeEndpoints) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeEndpoints) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(endpointsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1.EndpointsList{})
@@ -78,7 +78,7 @@ func (c *FakeEndpoints) Get(name string, options meta_v1.GetOptions) (result *v1
 	return obj.(*v1.Endpoints), err
 }
 
-func (c *FakeEndpoints) List(opts v1.ListOptions) (result *v1.EndpointsList, err error) {
+func (c *FakeEndpoints) List(opts meta_v1.ListOptions) (result *v1.EndpointsList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(endpointsResource, c.ns, opts), &v1.EndpointsList{})
 
@@ -100,7 +100,7 @@ func (c *FakeEndpoints) List(opts v1.ListOptions) (result *v1.EndpointsList, err
 }
 
 // Watch returns a watch.Interface that watches the requested endpoints.
-func (c *FakeEndpoints) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeEndpoints) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(endpointsResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_event.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_event.go
index 8a35409cf5b..35038e50e13 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_event.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_event.go
@@ -61,7 +61,7 @@ func (c *FakeEvents) Delete(name string, options *v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeEvents) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeEvents) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(eventsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1.EventList{})
@@ -78,7 +78,7 @@ func (c *FakeEvents) Get(name string, options meta_v1.GetOptions) (result *v1.Ev
 	return obj.(*v1.Event), err
 }
 
-func (c *FakeEvents) List(opts v1.ListOptions) (result *v1.EventList, err error) {
+func (c *FakeEvents) List(opts meta_v1.ListOptions) (result *v1.EventList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(eventsResource, c.ns, opts), &v1.EventList{})
 
@@ -100,7 +100,7 @@ func (c *FakeEvents) List(opts v1.ListOptions) (result *v1.EventList, err error)
 }
 
 // Watch returns a watch.Interface that watches the requested events.
-func (c *FakeEvents) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeEvents) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(eventsResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_limitrange.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_limitrange.go
index f60e785e07a..7ea53284463 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_limitrange.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_limitrange.go
@@ -61,7 +61,7 @@ func (c *FakeLimitRanges) Delete(name string, options *v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeLimitRanges) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeLimitRanges) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(limitrangesResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1.LimitRangeList{})
@@ -78,7 +78,7 @@ func (c *FakeLimitRanges) Get(name string, options meta_v1.GetOptions) (result *
 	return obj.(*v1.LimitRange), err
 }
 
-func (c *FakeLimitRanges) List(opts v1.ListOptions) (result *v1.LimitRangeList, err error) {
+func (c *FakeLimitRanges) List(opts meta_v1.ListOptions) (result *v1.LimitRangeList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(limitrangesResource, c.ns, opts), &v1.LimitRangeList{})
 
@@ -100,7 +100,7 @@ func (c *FakeLimitRanges) List(opts v1.ListOptions) (result *v1.LimitRangeList,
 }
 
 // Watch returns a watch.Interface that watches the requested limitRanges.
-func (c *FakeLimitRanges) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeLimitRanges) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(limitrangesResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_namespace.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_namespace.go
index 94d1e4f8f1e..b3ad561b077 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_namespace.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_namespace.go
@@ -66,7 +66,7 @@ func (c *FakeNamespaces) Delete(name string, options *v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeNamespaces) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeNamespaces) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewRootDeleteCollectionAction(namespacesResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1.NamespaceList{})
@@ -82,7 +82,7 @@ func (c *FakeNamespaces) Get(name string, options meta_v1.GetOptions) (result *v
 	return obj.(*v1.Namespace), err
 }
 
-func (c *FakeNamespaces) List(opts v1.ListOptions) (result *v1.NamespaceList, err error) {
+func (c *FakeNamespaces) List(opts meta_v1.ListOptions) (result *v1.NamespaceList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewRootListAction(namespacesResource, opts), &v1.NamespaceList{})
 	if obj == nil {
@@ -103,7 +103,7 @@ func (c *FakeNamespaces) List(opts v1.ListOptions) (result *v1.NamespaceList, er
 }
 
 // Watch returns a watch.Interface that watches the requested namespaces.
-func (c *FakeNamespaces) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeNamespaces) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewRootWatchAction(namespacesResource, opts))
 }
diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_node.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_node.go
index d72c9ec11be..d75f3440008 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_node.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_node.go
@@ -66,7 +66,7 @@ func (c *FakeNodes) Delete(name string, options *v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeNodes) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeNodes) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewRootDeleteCollectionAction(nodesResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1.NodeList{})
@@ -82,7 +82,7 @@ func (c *FakeNodes) Get(name string, options meta_v1.GetOptions) (result *v1.Nod
 	return obj.(*v1.Node), err
 }
 
-func (c *FakeNodes) List(opts v1.ListOptions) (result *v1.NodeList, err error) {
+func (c *FakeNodes) List(opts meta_v1.ListOptions) (result *v1.NodeList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewRootListAction(nodesResource, opts), &v1.NodeList{})
 	if obj == nil {
@@ -103,7 +103,7 @@ func (c *FakeNodes) List(opts v1.ListOptions) (result *v1.NodeList, err error) {
 }
 
 // Watch returns a watch.Interface that watches the requested nodes.
-func (c *FakeNodes) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeNodes) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewRootWatchAction(nodesResource, opts))
 }
diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_persistentvolume.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_persistentvolume.go
index 787e7fee89a..a299bed0c7b 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_persistentvolume.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_persistentvolume.go
@@ -66,7 +66,7 @@ func (c *FakePersistentVolumes) Delete(name string, options *v1.DeleteOptions) e
 	return err
 }
 
-func (c *FakePersistentVolumes) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakePersistentVolumes) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewRootDeleteCollectionAction(persistentvolumesResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1.PersistentVolumeList{})
@@ -82,7 +82,7 @@ func (c *FakePersistentVolumes) Get(name string, options meta_v1.GetOptions) (re
 	return obj.(*v1.PersistentVolume), err
 }
 
-func (c *FakePersistentVolumes) List(opts v1.ListOptions) (result *v1.PersistentVolumeList, err error) {
+func (c *FakePersistentVolumes) List(opts meta_v1.ListOptions) (result *v1.PersistentVolumeList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewRootListAction(persistentvolumesResource, opts), &v1.PersistentVolumeList{})
 	if obj == nil {
@@ -103,7 +103,7 @@ func (c *FakePersistentVolumes) List(opts v1.ListOptions) (result *v1.Persistent
 }
 
 // Watch returns a watch.Interface that watches the requested persistentVolumes.
-func (c *FakePersistentVolumes) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakePersistentVolumes) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewRootWatchAction(persistentvolumesResource, opts))
 }
diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_persistentvolumeclaim.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_persistentvolumeclaim.go
index b8e2cdd6bf6..22f0fea39e6 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_persistentvolumeclaim.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_persistentvolumeclaim.go
@@ -71,7 +71,7 @@ func (c *FakePersistentVolumeClaims) Delete(name string, options *v1.DeleteOptio
 	return err
 }
 
-func (c *FakePersistentVolumeClaims) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakePersistentVolumeClaims) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(persistentvolumeclaimsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1.PersistentVolumeClaimList{})
@@ -88,7 +88,7 @@ func (c *FakePersistentVolumeClaims) Get(name string, options meta_v1.GetOptions
 	return obj.(*v1.PersistentVolumeClaim), err
 }
 
-func (c *FakePersistentVolumeClaims) List(opts v1.ListOptions) (result *v1.PersistentVolumeClaimList, err error) {
+func (c *FakePersistentVolumeClaims) List(opts meta_v1.ListOptions) (result *v1.PersistentVolumeClaimList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(persistentvolumeclaimsResource, c.ns, opts), &v1.PersistentVolumeClaimList{})
 
@@ -110,7 +110,7 @@ func (c *FakePersistentVolumeClaims) List(opts v1.ListOptions) (result *v1.Persi
 }
 
 // Watch returns a watch.Interface that watches the requested persistentVolumeClaims.
-func (c *FakePersistentVolumeClaims) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakePersistentVolumeClaims) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(persistentvolumeclaimsResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_pod.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_pod.go
index 27b54908c40..00f967fba64 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_pod.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_pod.go
@@ -71,7 +71,7 @@ func (c *FakePods) Delete(name string, options *v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakePods) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakePods) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(podsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1.PodList{})
@@ -88,7 +88,7 @@ func (c *FakePods) Get(name string, options meta_v1.GetOptions) (result *v1.Pod,
 	return obj.(*v1.Pod), err
 }
 
-func (c *FakePods) List(opts v1.ListOptions) (result *v1.PodList, err error) {
+func (c *FakePods) List(opts meta_v1.ListOptions) (result *v1.PodList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(podsResource, c.ns, opts), &v1.PodList{})
 
@@ -110,7 +110,7 @@ func (c *FakePods) List(opts v1.ListOptions) (result *v1.PodList, err error) {
 }
 
 // Watch returns a watch.Interface that watches the requested pods.
-func (c *FakePods) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakePods) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(podsResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_podtemplate.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_podtemplate.go
index 44f0632b608..2f191f5f830 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_podtemplate.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_podtemplate.go
@@ -61,7 +61,7 @@ func (c *FakePodTemplates) Delete(name string, options *v1.DeleteOptions) error
 	return err
 }
 
-func (c *FakePodTemplates) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakePodTemplates) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(podtemplatesResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1.PodTemplateList{})
@@ -78,7 +78,7 @@ func (c *FakePodTemplates) Get(name string, options meta_v1.GetOptions) (result
 	return obj.(*v1.PodTemplate), err
 }
 
-func (c *FakePodTemplates) List(opts v1.ListOptions) (result *v1.PodTemplateList, err error) {
+func (c *FakePodTemplates) List(opts meta_v1.ListOptions) (result *v1.PodTemplateList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(podtemplatesResource, c.ns, opts), &v1.PodTemplateList{})
 
@@ -100,7 +100,7 @@ func (c *FakePodTemplates) List(opts v1.ListOptions) (result *v1.PodTemplateList
 }
 
 // Watch returns a watch.Interface that watches the requested podTemplates.
-func (c *FakePodTemplates) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakePodTemplates) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(podtemplatesResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_replicationcontroller.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_replicationcontroller.go
index 2a474a97fb9..cd644fd9b7a 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_replicationcontroller.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_replicationcontroller.go
@@ -71,7 +71,7 @@ func (c *FakeReplicationControllers) Delete(name string, options *v1.DeleteOptio
 	return err
 }
 
-func (c *FakeReplicationControllers) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeReplicationControllers) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(replicationcontrollersResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1.ReplicationControllerList{})
@@ -88,7 +88,7 @@ func (c *FakeReplicationControllers) Get(name string, options meta_v1.GetOptions
 	return obj.(*v1.ReplicationController), err
 }
 
-func (c *FakeReplicationControllers) List(opts v1.ListOptions) (result *v1.ReplicationControllerList, err error) {
+func (c *FakeReplicationControllers) List(opts meta_v1.ListOptions) (result *v1.ReplicationControllerList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(replicationcontrollersResource, c.ns, opts), &v1.ReplicationControllerList{})
 
@@ -110,7 +110,7 @@ func (c *FakeReplicationControllers) List(opts v1.ListOptions) (result *v1.Repli
 }
 
 // Watch returns a watch.Interface that watches the requested replicationControllers.
-func (c *FakeReplicationControllers) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeReplicationControllers) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(replicationcontrollersResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_resourcequota.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_resourcequota.go
index 8f2e92054c7..52ec816a95a 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_resourcequota.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_resourcequota.go
@@ -71,7 +71,7 @@ func (c *FakeResourceQuotas) Delete(name string, options *v1.DeleteOptions) erro
 	return err
 }
 
-func (c *FakeResourceQuotas) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeResourceQuotas) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(resourcequotasResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1.ResourceQuotaList{})
@@ -88,7 +88,7 @@ func (c *FakeResourceQuotas) Get(name string, options meta_v1.GetOptions) (resul
 	return obj.(*v1.ResourceQuota), err
 }
 
-func (c *FakeResourceQuotas) List(opts v1.ListOptions) (result *v1.ResourceQuotaList, err error) {
+func (c *FakeResourceQuotas) List(opts meta_v1.ListOptions) (result *v1.ResourceQuotaList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(resourcequotasResource, c.ns, opts), &v1.ResourceQuotaList{})
 
@@ -110,7 +110,7 @@ func (c *FakeResourceQuotas) List(opts v1.ListOptions) (result *v1.ResourceQuota
 }
 
 // Watch returns a watch.Interface that watches the requested resourceQuotas.
-func (c *FakeResourceQuotas) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeResourceQuotas) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(resourcequotasResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_secret.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_secret.go
index e8ed62dac14..560e1018600 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_secret.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_secret.go
@@ -61,7 +61,7 @@ func (c *FakeSecrets) Delete(name string, options *v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeSecrets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeSecrets) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(secretsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1.SecretList{})
@@ -78,7 +78,7 @@ func (c *FakeSecrets) Get(name string, options meta_v1.GetOptions) (result *v1.S
 	return obj.(*v1.Secret), err
 }
 
-func (c *FakeSecrets) List(opts v1.ListOptions) (result *v1.SecretList, err error) {
+func (c *FakeSecrets) List(opts meta_v1.ListOptions) (result *v1.SecretList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(secretsResource, c.ns, opts), &v1.SecretList{})
 
@@ -100,7 +100,7 @@ func (c *FakeSecrets) List(opts v1.ListOptions) (result *v1.SecretList, err erro
 }
 
 // Watch returns a watch.Interface that watches the requested secrets.
-func (c *FakeSecrets) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeSecrets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(secretsResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_service.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_service.go
index a5b2bf56f38..58813961a1e 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_service.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_service.go
@@ -71,7 +71,7 @@ func (c *FakeServices) Delete(name string, options *v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeServices) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeServices) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(servicesResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1.ServiceList{})
@@ -88,7 +88,7 @@ func (c *FakeServices) Get(name string, options meta_v1.GetOptions) (result *v1.
 	return obj.(*v1.Service), err
 }
 
-func (c *FakeServices) List(opts v1.ListOptions) (result *v1.ServiceList, err error) {
+func (c *FakeServices) List(opts meta_v1.ListOptions) (result *v1.ServiceList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(servicesResource, c.ns, opts), &v1.ServiceList{})
 
@@ -110,7 +110,7 @@ func (c *FakeServices) List(opts v1.ListOptions) (result *v1.ServiceList, err er
 }
 
 // Watch returns a watch.Interface that watches the requested services.
-func (c *FakeServices) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeServices) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(servicesResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_serviceaccount.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_serviceaccount.go
index 73b99456a76..55bb6d9d5b1 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_serviceaccount.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_serviceaccount.go
@@ -61,7 +61,7 @@ func (c *FakeServiceAccounts) Delete(name string, options *v1.DeleteOptions) err
 	return err
 }
 
-func (c *FakeServiceAccounts) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeServiceAccounts) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(serviceaccountsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1.ServiceAccountList{})
@@ -78,7 +78,7 @@ func (c *FakeServiceAccounts) Get(name string, options meta_v1.GetOptions) (resu
 	return obj.(*v1.ServiceAccount), err
 }
 
-func (c *FakeServiceAccounts) List(opts v1.ListOptions) (result *v1.ServiceAccountList, err error) {
+func (c *FakeServiceAccounts) List(opts meta_v1.ListOptions) (result *v1.ServiceAccountList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(serviceaccountsResource, c.ns, opts), &v1.ServiceAccountList{})
 
@@ -100,7 +100,7 @@ func (c *FakeServiceAccounts) List(opts v1.ListOptions) (result *v1.ServiceAccou
 }
 
 // Watch returns a watch.Interface that watches the requested serviceAccounts.
-func (c *FakeServiceAccounts) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeServiceAccounts) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(serviceaccountsResource, c.ns, opts))
 
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 0e007cbcb27..4a05a88a07c 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/limitrange.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/limitrange.go
@@ -36,10 +36,10 @@ type LimitRangeInterface interface {
 	Create(*v1.LimitRange) (*v1.LimitRange, error)
 	Update(*v1.LimitRange) (*v1.LimitRange, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1.LimitRange, error)
-	List(opts v1.ListOptions) (*v1.LimitRangeList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1.LimitRangeList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.LimitRange, err error)
 	LimitRangeExpansion
 }
@@ -95,7 +95,7 @@ func (c *limitRanges) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *limitRanges) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *limitRanges) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("limitranges").
@@ -119,7 +119,7 @@ func (c *limitRanges) Get(name string, options meta_v1.GetOptions) (result *v1.L
 }
 
 // List takes label and field selectors, and returns the list of LimitRanges that match those selectors.
-func (c *limitRanges) List(opts v1.ListOptions) (result *v1.LimitRangeList, err error) {
+func (c *limitRanges) List(opts meta_v1.ListOptions) (result *v1.LimitRangeList, err error) {
 	result = &v1.LimitRangeList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -131,7 +131,7 @@ func (c *limitRanges) List(opts v1.ListOptions) (result *v1.LimitRangeList, err
 }
 
 // Watch returns a watch.Interface that watches the requested limitRanges.
-func (c *limitRanges) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *limitRanges) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 6fc64ff4e7b..69a451debec 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/namespace.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/namespace.go
@@ -37,10 +37,10 @@ type NamespaceInterface interface {
 	Update(*v1.Namespace) (*v1.Namespace, error)
 	UpdateStatus(*v1.Namespace) (*v1.Namespace, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1.Namespace, error)
-	List(opts v1.ListOptions) (*v1.NamespaceList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1.NamespaceList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Namespace, err error)
 	NamespaceExpansion
 }
@@ -106,7 +106,7 @@ func (c *namespaces) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *namespaces) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *namespaces) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Resource("namespaces").
 		VersionedParams(&listOptions, api.ParameterCodec).
@@ -128,7 +128,7 @@ func (c *namespaces) Get(name string, options meta_v1.GetOptions) (result *v1.Na
 }
 
 // List takes label and field selectors, and returns the list of Namespaces that match those selectors.
-func (c *namespaces) List(opts v1.ListOptions) (result *v1.NamespaceList, err error) {
+func (c *namespaces) List(opts meta_v1.ListOptions) (result *v1.NamespaceList, err error) {
 	result = &v1.NamespaceList{}
 	err = c.client.Get().
 		Resource("namespaces").
@@ -139,7 +139,7 @@ func (c *namespaces) List(opts v1.ListOptions) (result *v1.NamespaceList, err er
 }
 
 // Watch returns a watch.Interface that watches the requested namespaces.
-func (c *namespaces) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *namespaces) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Resource("namespaces").
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 38d47ae9ac7..a509282cd4c 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/node.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/node.go
@@ -37,10 +37,10 @@ type NodeInterface interface {
 	Update(*v1.Node) (*v1.Node, error)
 	UpdateStatus(*v1.Node) (*v1.Node, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1.Node, error)
-	List(opts v1.ListOptions) (*v1.NodeList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1.NodeList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Node, err error)
 	NodeExpansion
 }
@@ -106,7 +106,7 @@ func (c *nodes) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *nodes) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *nodes) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Resource("nodes").
 		VersionedParams(&listOptions, api.ParameterCodec).
@@ -128,7 +128,7 @@ func (c *nodes) Get(name string, options meta_v1.GetOptions) (result *v1.Node, e
 }
 
 // List takes label and field selectors, and returns the list of Nodes that match those selectors.
-func (c *nodes) List(opts v1.ListOptions) (result *v1.NodeList, err error) {
+func (c *nodes) List(opts meta_v1.ListOptions) (result *v1.NodeList, err error) {
 	result = &v1.NodeList{}
 	err = c.client.Get().
 		Resource("nodes").
@@ -139,7 +139,7 @@ func (c *nodes) List(opts v1.ListOptions) (result *v1.NodeList, err error) {
 }
 
 // Watch returns a watch.Interface that watches the requested nodes.
-func (c *nodes) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *nodes) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Resource("nodes").
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 4e75654a4bc..70df1ef3fde 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/persistentvolume.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/persistentvolume.go
@@ -37,10 +37,10 @@ type PersistentVolumeInterface interface {
 	Update(*v1.PersistentVolume) (*v1.PersistentVolume, error)
 	UpdateStatus(*v1.PersistentVolume) (*v1.PersistentVolume, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1.PersistentVolume, error)
-	List(opts v1.ListOptions) (*v1.PersistentVolumeList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1.PersistentVolumeList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.PersistentVolume, err error)
 	PersistentVolumeExpansion
 }
@@ -106,7 +106,7 @@ func (c *persistentVolumes) Delete(name string, options *v1.DeleteOptions) error
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *persistentVolumes) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *persistentVolumes) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Resource("persistentvolumes").
 		VersionedParams(&listOptions, api.ParameterCodec).
@@ -128,7 +128,7 @@ func (c *persistentVolumes) Get(name string, options meta_v1.GetOptions) (result
 }
 
 // List takes label and field selectors, and returns the list of PersistentVolumes that match those selectors.
-func (c *persistentVolumes) List(opts v1.ListOptions) (result *v1.PersistentVolumeList, err error) {
+func (c *persistentVolumes) List(opts meta_v1.ListOptions) (result *v1.PersistentVolumeList, err error) {
 	result = &v1.PersistentVolumeList{}
 	err = c.client.Get().
 		Resource("persistentvolumes").
@@ -139,7 +139,7 @@ func (c *persistentVolumes) List(opts v1.ListOptions) (result *v1.PersistentVolu
 }
 
 // Watch returns a watch.Interface that watches the requested persistentVolumes.
-func (c *persistentVolumes) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *persistentVolumes) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Resource("persistentvolumes").
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 4cdc98eb172..9d14b9c17b1 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/persistentvolumeclaim.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/persistentvolumeclaim.go
@@ -37,10 +37,10 @@ type PersistentVolumeClaimInterface interface {
 	Update(*v1.PersistentVolumeClaim) (*v1.PersistentVolumeClaim, error)
 	UpdateStatus(*v1.PersistentVolumeClaim) (*v1.PersistentVolumeClaim, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1.PersistentVolumeClaim, error)
-	List(opts v1.ListOptions) (*v1.PersistentVolumeClaimList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1.PersistentVolumeClaimList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.PersistentVolumeClaim, err error)
 	PersistentVolumeClaimExpansion
 }
@@ -112,7 +112,7 @@ func (c *persistentVolumeClaims) Delete(name string, options *v1.DeleteOptions)
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *persistentVolumeClaims) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *persistentVolumeClaims) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("persistentvolumeclaims").
@@ -136,7 +136,7 @@ func (c *persistentVolumeClaims) Get(name string, options meta_v1.GetOptions) (r
 }
 
 // List takes label and field selectors, and returns the list of PersistentVolumeClaims that match those selectors.
-func (c *persistentVolumeClaims) List(opts v1.ListOptions) (result *v1.PersistentVolumeClaimList, err error) {
+func (c *persistentVolumeClaims) List(opts meta_v1.ListOptions) (result *v1.PersistentVolumeClaimList, err error) {
 	result = &v1.PersistentVolumeClaimList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -148,7 +148,7 @@ func (c *persistentVolumeClaims) List(opts v1.ListOptions) (result *v1.Persisten
 }
 
 // Watch returns a watch.Interface that watches the requested persistentVolumeClaims.
-func (c *persistentVolumeClaims) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *persistentVolumeClaims) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 8a1d5e9f03b..03a9e31a99e 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/pod.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/pod.go
@@ -37,10 +37,10 @@ type PodInterface interface {
 	Update(*v1.Pod) (*v1.Pod, error)
 	UpdateStatus(*v1.Pod) (*v1.Pod, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1.Pod, error)
-	List(opts v1.ListOptions) (*v1.PodList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1.PodList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Pod, err error)
 	PodExpansion
 }
@@ -112,7 +112,7 @@ func (c *pods) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *pods) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *pods) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("pods").
@@ -136,7 +136,7 @@ func (c *pods) Get(name string, options meta_v1.GetOptions) (result *v1.Pod, err
 }
 
 // List takes label and field selectors, and returns the list of Pods that match those selectors.
-func (c *pods) List(opts v1.ListOptions) (result *v1.PodList, err error) {
+func (c *pods) List(opts meta_v1.ListOptions) (result *v1.PodList, err error) {
 	result = &v1.PodList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -148,7 +148,7 @@ func (c *pods) List(opts v1.ListOptions) (result *v1.PodList, err error) {
 }
 
 // Watch returns a watch.Interface that watches the requested pods.
-func (c *pods) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *pods) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 d8763eaaa0e..d75afcba445 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/podtemplate.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/podtemplate.go
@@ -36,10 +36,10 @@ type PodTemplateInterface interface {
 	Create(*v1.PodTemplate) (*v1.PodTemplate, error)
 	Update(*v1.PodTemplate) (*v1.PodTemplate, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1.PodTemplate, error)
-	List(opts v1.ListOptions) (*v1.PodTemplateList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1.PodTemplateList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.PodTemplate, err error)
 	PodTemplateExpansion
 }
@@ -95,7 +95,7 @@ func (c *podTemplates) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *podTemplates) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *podTemplates) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("podtemplates").
@@ -119,7 +119,7 @@ func (c *podTemplates) Get(name string, options meta_v1.GetOptions) (result *v1.
 }
 
 // List takes label and field selectors, and returns the list of PodTemplates that match those selectors.
-func (c *podTemplates) List(opts v1.ListOptions) (result *v1.PodTemplateList, err error) {
+func (c *podTemplates) List(opts meta_v1.ListOptions) (result *v1.PodTemplateList, err error) {
 	result = &v1.PodTemplateList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -131,7 +131,7 @@ func (c *podTemplates) List(opts v1.ListOptions) (result *v1.PodTemplateList, er
 }
 
 // Watch returns a watch.Interface that watches the requested podTemplates.
-func (c *podTemplates) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *podTemplates) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 d6f3101dc8e..e037cc66a3d 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/replicationcontroller.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/replicationcontroller.go
@@ -37,10 +37,10 @@ type ReplicationControllerInterface interface {
 	Update(*v1.ReplicationController) (*v1.ReplicationController, error)
 	UpdateStatus(*v1.ReplicationController) (*v1.ReplicationController, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1.ReplicationController, error)
-	List(opts v1.ListOptions) (*v1.ReplicationControllerList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1.ReplicationControllerList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.ReplicationController, err error)
 	ReplicationControllerExpansion
 }
@@ -112,7 +112,7 @@ func (c *replicationControllers) Delete(name string, options *v1.DeleteOptions)
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *replicationControllers) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *replicationControllers) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("replicationcontrollers").
@@ -136,7 +136,7 @@ func (c *replicationControllers) Get(name string, options meta_v1.GetOptions) (r
 }
 
 // List takes label and field selectors, and returns the list of ReplicationControllers that match those selectors.
-func (c *replicationControllers) List(opts v1.ListOptions) (result *v1.ReplicationControllerList, err error) {
+func (c *replicationControllers) List(opts meta_v1.ListOptions) (result *v1.ReplicationControllerList, err error) {
 	result = &v1.ReplicationControllerList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -148,7 +148,7 @@ func (c *replicationControllers) List(opts v1.ListOptions) (result *v1.Replicati
 }
 
 // Watch returns a watch.Interface that watches the requested replicationControllers.
-func (c *replicationControllers) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *replicationControllers) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 675a0c357b5..8f2f1d39bba 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/resourcequota.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/resourcequota.go
@@ -37,10 +37,10 @@ type ResourceQuotaInterface interface {
 	Update(*v1.ResourceQuota) (*v1.ResourceQuota, error)
 	UpdateStatus(*v1.ResourceQuota) (*v1.ResourceQuota, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1.ResourceQuota, error)
-	List(opts v1.ListOptions) (*v1.ResourceQuotaList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1.ResourceQuotaList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.ResourceQuota, err error)
 	ResourceQuotaExpansion
 }
@@ -112,7 +112,7 @@ func (c *resourceQuotas) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *resourceQuotas) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *resourceQuotas) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("resourcequotas").
@@ -136,7 +136,7 @@ func (c *resourceQuotas) Get(name string, options meta_v1.GetOptions) (result *v
 }
 
 // List takes label and field selectors, and returns the list of ResourceQuotas that match those selectors.
-func (c *resourceQuotas) List(opts v1.ListOptions) (result *v1.ResourceQuotaList, err error) {
+func (c *resourceQuotas) List(opts meta_v1.ListOptions) (result *v1.ResourceQuotaList, err error) {
 	result = &v1.ResourceQuotaList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -148,7 +148,7 @@ func (c *resourceQuotas) List(opts v1.ListOptions) (result *v1.ResourceQuotaList
 }
 
 // Watch returns a watch.Interface that watches the requested resourceQuotas.
-func (c *resourceQuotas) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *resourceQuotas) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 0ba9ba8bfbe..9a0165a3072 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/secret.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/secret.go
@@ -36,10 +36,10 @@ type SecretInterface interface {
 	Create(*v1.Secret) (*v1.Secret, error)
 	Update(*v1.Secret) (*v1.Secret, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1.Secret, error)
-	List(opts v1.ListOptions) (*v1.SecretList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1.SecretList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Secret, err error)
 	SecretExpansion
 }
@@ -95,7 +95,7 @@ func (c *secrets) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *secrets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *secrets) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("secrets").
@@ -119,7 +119,7 @@ func (c *secrets) Get(name string, options meta_v1.GetOptions) (result *v1.Secre
 }
 
 // List takes label and field selectors, and returns the list of Secrets that match those selectors.
-func (c *secrets) List(opts v1.ListOptions) (result *v1.SecretList, err error) {
+func (c *secrets) List(opts meta_v1.ListOptions) (result *v1.SecretList, err error) {
 	result = &v1.SecretList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -131,7 +131,7 @@ func (c *secrets) List(opts v1.ListOptions) (result *v1.SecretList, err error) {
 }
 
 // Watch returns a watch.Interface that watches the requested secrets.
-func (c *secrets) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *secrets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 99c6d3f7a72..03bb9b5f3aa 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/service.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/service.go
@@ -37,10 +37,10 @@ type ServiceInterface interface {
 	Update(*v1.Service) (*v1.Service, error)
 	UpdateStatus(*v1.Service) (*v1.Service, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1.Service, error)
-	List(opts v1.ListOptions) (*v1.ServiceList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1.ServiceList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Service, err error)
 	ServiceExpansion
 }
@@ -112,7 +112,7 @@ func (c *services) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *services) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *services) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("services").
@@ -136,7 +136,7 @@ func (c *services) Get(name string, options meta_v1.GetOptions) (result *v1.Serv
 }
 
 // List takes label and field selectors, and returns the list of Services that match those selectors.
-func (c *services) List(opts v1.ListOptions) (result *v1.ServiceList, err error) {
+func (c *services) List(opts meta_v1.ListOptions) (result *v1.ServiceList, err error) {
 	result = &v1.ServiceList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -148,7 +148,7 @@ func (c *services) List(opts v1.ListOptions) (result *v1.ServiceList, err error)
 }
 
 // Watch returns a watch.Interface that watches the requested services.
-func (c *services) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *services) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 f47e4eec48e..1cc2d928f20 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/serviceaccount.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/serviceaccount.go
@@ -36,10 +36,10 @@ type ServiceAccountInterface interface {
 	Create(*v1.ServiceAccount) (*v1.ServiceAccount, error)
 	Update(*v1.ServiceAccount) (*v1.ServiceAccount, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1.ServiceAccount, error)
-	List(opts v1.ListOptions) (*v1.ServiceAccountList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1.ServiceAccountList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.ServiceAccount, err error)
 	ServiceAccountExpansion
 }
@@ -95,7 +95,7 @@ func (c *serviceAccounts) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *serviceAccounts) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *serviceAccounts) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("serviceaccounts").
@@ -119,7 +119,7 @@ func (c *serviceAccounts) Get(name string, options meta_v1.GetOptions) (result *
 }
 
 // List takes label and field selectors, and returns the list of ServiceAccounts that match those selectors.
-func (c *serviceAccounts) List(opts v1.ListOptions) (result *v1.ServiceAccountList, err error) {
+func (c *serviceAccounts) List(opts meta_v1.ListOptions) (result *v1.ServiceAccountList, err error) {
 	result = &v1.ServiceAccountList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -131,7 +131,7 @@ func (c *serviceAccounts) List(opts v1.ListOptions) (result *v1.ServiceAccountLi
 }
 
 // Watch returns a watch.Interface that watches the requested serviceAccounts.
-func (c *serviceAccounts) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *serviceAccounts) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 cdc71b8b55f..9657877a2ed 100644
--- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/daemonset.go
+++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/daemonset.go
@@ -38,10 +38,10 @@ type DaemonSetInterface interface {
 	Update(*v1beta1.DaemonSet) (*v1beta1.DaemonSet, error)
 	UpdateStatus(*v1beta1.DaemonSet) (*v1beta1.DaemonSet, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1beta1.DaemonSet, error)
-	List(opts v1.ListOptions) (*v1beta1.DaemonSetList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1beta1.DaemonSetList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.DaemonSet, err error)
 	DaemonSetExpansion
 }
@@ -113,7 +113,7 @@ func (c *daemonSets) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *daemonSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *daemonSets) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("daemonsets").
@@ -137,7 +137,7 @@ func (c *daemonSets) Get(name string, options meta_v1.GetOptions) (result *v1bet
 }
 
 // List takes label and field selectors, and returns the list of DaemonSets that match those selectors.
-func (c *daemonSets) List(opts v1.ListOptions) (result *v1beta1.DaemonSetList, err error) {
+func (c *daemonSets) List(opts meta_v1.ListOptions) (result *v1beta1.DaemonSetList, err error) {
 	result = &v1beta1.DaemonSetList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -149,7 +149,7 @@ 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) {
+func (c *daemonSets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 1060d60ecae..e4051de8887 100644
--- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/deployment.go
+++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/deployment.go
@@ -38,10 +38,10 @@ type DeploymentInterface interface {
 	Update(*v1beta1.Deployment) (*v1beta1.Deployment, error)
 	UpdateStatus(*v1beta1.Deployment) (*v1beta1.Deployment, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1beta1.Deployment, error)
-	List(opts v1.ListOptions) (*v1beta1.DeploymentList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1beta1.DeploymentList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.Deployment, err error)
 	DeploymentExpansion
 }
@@ -113,7 +113,7 @@ func (c *deployments) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *deployments) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *deployments) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("deployments").
@@ -137,7 +137,7 @@ func (c *deployments) Get(name string, options meta_v1.GetOptions) (result *v1be
 }
 
 // List takes label and field selectors, and returns the list of Deployments that match those selectors.
-func (c *deployments) List(opts v1.ListOptions) (result *v1beta1.DeploymentList, err error) {
+func (c *deployments) List(opts meta_v1.ListOptions) (result *v1beta1.DeploymentList, err error) {
 	result = &v1beta1.DeploymentList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -149,7 +149,7 @@ 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) {
+func (c *deployments) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_daemonset.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_daemonset.go
index bffe937495b..b5085642293 100644
--- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_daemonset.go
+++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_daemonset.go
@@ -72,7 +72,7 @@ func (c *FakeDaemonSets) Delete(name string, options *v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeDaemonSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeDaemonSets) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(daemonsetsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1beta1.DaemonSetList{})
@@ -89,7 +89,7 @@ func (c *FakeDaemonSets) Get(name string, options meta_v1.GetOptions) (result *v
 	return obj.(*v1beta1.DaemonSet), err
 }
 
-func (c *FakeDaemonSets) List(opts v1.ListOptions) (result *v1beta1.DaemonSetList, err error) {
+func (c *FakeDaemonSets) List(opts meta_v1.ListOptions) (result *v1beta1.DaemonSetList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(daemonsetsResource, c.ns, opts), &v1beta1.DaemonSetList{})
 
@@ -111,7 +111,7 @@ func (c *FakeDaemonSets) List(opts v1.ListOptions) (result *v1beta1.DaemonSetLis
 }
 
 // Watch returns a watch.Interface that watches the requested daemonSets.
-func (c *FakeDaemonSets) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeDaemonSets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(daemonsetsResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_deployment.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_deployment.go
index 6b6544f67d9..1c6edbeb57c 100644
--- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_deployment.go
+++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_deployment.go
@@ -72,7 +72,7 @@ func (c *FakeDeployments) Delete(name string, options *v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeDeployments) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeDeployments) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(deploymentsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1beta1.DeploymentList{})
@@ -89,7 +89,7 @@ func (c *FakeDeployments) Get(name string, options meta_v1.GetOptions) (result *
 	return obj.(*v1beta1.Deployment), err
 }
 
-func (c *FakeDeployments) List(opts v1.ListOptions) (result *v1beta1.DeploymentList, err error) {
+func (c *FakeDeployments) List(opts meta_v1.ListOptions) (result *v1beta1.DeploymentList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(deploymentsResource, c.ns, opts), &v1beta1.DeploymentList{})
 
@@ -111,7 +111,7 @@ func (c *FakeDeployments) List(opts v1.ListOptions) (result *v1beta1.DeploymentL
 }
 
 // Watch returns a watch.Interface that watches the requested deployments.
-func (c *FakeDeployments) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeDeployments) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(deploymentsResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_ingress.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_ingress.go
index e5a1059dff2..c7591aa4ea3 100644
--- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_ingress.go
+++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_ingress.go
@@ -72,7 +72,7 @@ func (c *FakeIngresses) Delete(name string, options *v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeIngresses) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeIngresses) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(ingressesResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1beta1.IngressList{})
@@ -89,7 +89,7 @@ func (c *FakeIngresses) Get(name string, options meta_v1.GetOptions) (result *v1
 	return obj.(*v1beta1.Ingress), err
 }
 
-func (c *FakeIngresses) List(opts v1.ListOptions) (result *v1beta1.IngressList, err error) {
+func (c *FakeIngresses) List(opts meta_v1.ListOptions) (result *v1beta1.IngressList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(ingressesResource, c.ns, opts), &v1beta1.IngressList{})
 
@@ -111,7 +111,7 @@ func (c *FakeIngresses) List(opts v1.ListOptions) (result *v1beta1.IngressList,
 }
 
 // Watch returns a watch.Interface that watches the requested ingresses.
-func (c *FakeIngresses) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeIngresses) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(ingressesResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_podsecuritypolicy.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_podsecuritypolicy.go
index 77750e77300..08352691e5d 100644
--- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_podsecuritypolicy.go
+++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_podsecuritypolicy.go
@@ -58,7 +58,7 @@ func (c *FakePodSecurityPolicies) Delete(name string, options *v1.DeleteOptions)
 	return err
 }
 
-func (c *FakePodSecurityPolicies) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakePodSecurityPolicies) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewRootDeleteCollectionAction(podsecuritypoliciesResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1beta1.PodSecurityPolicyList{})
@@ -74,7 +74,7 @@ func (c *FakePodSecurityPolicies) Get(name string, options meta_v1.GetOptions) (
 	return obj.(*v1beta1.PodSecurityPolicy), err
 }
 
-func (c *FakePodSecurityPolicies) List(opts v1.ListOptions) (result *v1beta1.PodSecurityPolicyList, err error) {
+func (c *FakePodSecurityPolicies) List(opts meta_v1.ListOptions) (result *v1beta1.PodSecurityPolicyList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewRootListAction(podsecuritypoliciesResource, opts), &v1beta1.PodSecurityPolicyList{})
 	if obj == nil {
@@ -95,7 +95,7 @@ func (c *FakePodSecurityPolicies) List(opts v1.ListOptions) (result *v1beta1.Pod
 }
 
 // Watch returns a watch.Interface that watches the requested podSecurityPolicies.
-func (c *FakePodSecurityPolicies) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakePodSecurityPolicies) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewRootWatchAction(podsecuritypoliciesResource, opts))
 }
diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_replicaset.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_replicaset.go
index d3dfe25bef8..25a24d6984e 100644
--- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_replicaset.go
+++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_replicaset.go
@@ -72,7 +72,7 @@ func (c *FakeReplicaSets) Delete(name string, options *v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeReplicaSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeReplicaSets) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(replicasetsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1beta1.ReplicaSetList{})
@@ -89,7 +89,7 @@ func (c *FakeReplicaSets) Get(name string, options meta_v1.GetOptions) (result *
 	return obj.(*v1beta1.ReplicaSet), err
 }
 
-func (c *FakeReplicaSets) List(opts v1.ListOptions) (result *v1beta1.ReplicaSetList, err error) {
+func (c *FakeReplicaSets) List(opts meta_v1.ListOptions) (result *v1beta1.ReplicaSetList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(replicasetsResource, c.ns, opts), &v1beta1.ReplicaSetList{})
 
@@ -111,7 +111,7 @@ func (c *FakeReplicaSets) List(opts v1.ListOptions) (result *v1beta1.ReplicaSetL
 }
 
 // Watch returns a watch.Interface that watches the requested replicaSets.
-func (c *FakeReplicaSets) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeReplicaSets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(replicasetsResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go
index 5262365a485..52a246ac727 100644
--- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go
+++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go
@@ -58,7 +58,7 @@ func (c *FakeThirdPartyResources) Delete(name string, options *v1.DeleteOptions)
 	return err
 }
 
-func (c *FakeThirdPartyResources) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeThirdPartyResources) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewRootDeleteCollectionAction(thirdpartyresourcesResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1beta1.ThirdPartyResourceList{})
@@ -74,7 +74,7 @@ func (c *FakeThirdPartyResources) Get(name string, options meta_v1.GetOptions) (
 	return obj.(*v1beta1.ThirdPartyResource), err
 }
 
-func (c *FakeThirdPartyResources) List(opts v1.ListOptions) (result *v1beta1.ThirdPartyResourceList, err error) {
+func (c *FakeThirdPartyResources) List(opts meta_v1.ListOptions) (result *v1beta1.ThirdPartyResourceList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewRootListAction(thirdpartyresourcesResource, opts), &v1beta1.ThirdPartyResourceList{})
 	if obj == nil {
@@ -95,7 +95,7 @@ func (c *FakeThirdPartyResources) List(opts v1.ListOptions) (result *v1beta1.Thi
 }
 
 // Watch returns a watch.Interface that watches the requested thirdPartyResources.
-func (c *FakeThirdPartyResources) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeThirdPartyResources) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewRootWatchAction(thirdpartyresourcesResource, opts))
 }
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 aaa1494699a..b81862744be 100644
--- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/ingress.go
+++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/ingress.go
@@ -38,10 +38,10 @@ type IngressInterface interface {
 	Update(*v1beta1.Ingress) (*v1beta1.Ingress, error)
 	UpdateStatus(*v1beta1.Ingress) (*v1beta1.Ingress, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1beta1.Ingress, error)
-	List(opts v1.ListOptions) (*v1beta1.IngressList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1beta1.IngressList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.Ingress, err error)
 	IngressExpansion
 }
@@ -113,7 +113,7 @@ func (c *ingresses) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *ingresses) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *ingresses) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("ingresses").
@@ -137,7 +137,7 @@ func (c *ingresses) Get(name string, options meta_v1.GetOptions) (result *v1beta
 }
 
 // List takes label and field selectors, and returns the list of Ingresses that match those selectors.
-func (c *ingresses) List(opts v1.ListOptions) (result *v1beta1.IngressList, err error) {
+func (c *ingresses) List(opts meta_v1.ListOptions) (result *v1beta1.IngressList, err error) {
 	result = &v1beta1.IngressList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -149,7 +149,7 @@ 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) {
+func (c *ingresses) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 918aec4549f..17c0e9a8995 100644
--- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/podsecuritypolicy.go
+++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/podsecuritypolicy.go
@@ -37,10 +37,10 @@ type PodSecurityPolicyInterface interface {
 	Create(*v1beta1.PodSecurityPolicy) (*v1beta1.PodSecurityPolicy, error)
 	Update(*v1beta1.PodSecurityPolicy) (*v1beta1.PodSecurityPolicy, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1beta1.PodSecurityPolicy, error)
-	List(opts v1.ListOptions) (*v1beta1.PodSecurityPolicyList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1beta1.PodSecurityPolicyList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.PodSecurityPolicy, err error)
 	PodSecurityPolicyExpansion
 }
@@ -91,7 +91,7 @@ func (c *podSecurityPolicies) Delete(name string, options *v1.DeleteOptions) err
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *podSecurityPolicies) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *podSecurityPolicies) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Resource("podsecuritypolicies").
 		VersionedParams(&listOptions, api.ParameterCodec).
@@ -113,7 +113,7 @@ func (c *podSecurityPolicies) Get(name string, options meta_v1.GetOptions) (resu
 }
 
 // List takes label and field selectors, and returns the list of PodSecurityPolicies that match those selectors.
-func (c *podSecurityPolicies) List(opts v1.ListOptions) (result *v1beta1.PodSecurityPolicyList, err error) {
+func (c *podSecurityPolicies) List(opts meta_v1.ListOptions) (result *v1beta1.PodSecurityPolicyList, err error) {
 	result = &v1beta1.PodSecurityPolicyList{}
 	err = c.client.Get().
 		Resource("podsecuritypolicies").
@@ -124,7 +124,7 @@ 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) {
+func (c *podSecurityPolicies) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Resource("podsecuritypolicies").
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 3bc699ff35f..cd825993318 100644
--- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/replicaset.go
+++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/replicaset.go
@@ -38,10 +38,10 @@ type ReplicaSetInterface interface {
 	Update(*v1beta1.ReplicaSet) (*v1beta1.ReplicaSet, error)
 	UpdateStatus(*v1beta1.ReplicaSet) (*v1beta1.ReplicaSet, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1beta1.ReplicaSet, error)
-	List(opts v1.ListOptions) (*v1beta1.ReplicaSetList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1beta1.ReplicaSetList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.ReplicaSet, err error)
 	ReplicaSetExpansion
 }
@@ -113,7 +113,7 @@ func (c *replicaSets) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *replicaSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *replicaSets) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("replicasets").
@@ -137,7 +137,7 @@ func (c *replicaSets) Get(name string, options meta_v1.GetOptions) (result *v1be
 }
 
 // List takes label and field selectors, and returns the list of ReplicaSets that match those selectors.
-func (c *replicaSets) List(opts v1.ListOptions) (result *v1beta1.ReplicaSetList, err error) {
+func (c *replicaSets) List(opts meta_v1.ListOptions) (result *v1beta1.ReplicaSetList, err error) {
 	result = &v1beta1.ReplicaSetList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -149,7 +149,7 @@ 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) {
+func (c *replicaSets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 cee01c6b11a..8a5ab262bee 100644
--- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/thirdpartyresource.go
+++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/thirdpartyresource.go
@@ -37,10 +37,10 @@ type ThirdPartyResourceInterface interface {
 	Create(*v1beta1.ThirdPartyResource) (*v1beta1.ThirdPartyResource, error)
 	Update(*v1beta1.ThirdPartyResource) (*v1beta1.ThirdPartyResource, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1beta1.ThirdPartyResource, error)
-	List(opts v1.ListOptions) (*v1beta1.ThirdPartyResourceList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1beta1.ThirdPartyResourceList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.ThirdPartyResource, err error)
 	ThirdPartyResourceExpansion
 }
@@ -91,7 +91,7 @@ func (c *thirdPartyResources) Delete(name string, options *v1.DeleteOptions) err
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *thirdPartyResources) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *thirdPartyResources) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Resource("thirdpartyresources").
 		VersionedParams(&listOptions, api.ParameterCodec).
@@ -113,7 +113,7 @@ func (c *thirdPartyResources) Get(name string, options meta_v1.GetOptions) (resu
 }
 
 // List takes label and field selectors, and returns the list of ThirdPartyResources that match those selectors.
-func (c *thirdPartyResources) List(opts v1.ListOptions) (result *v1beta1.ThirdPartyResourceList, err error) {
+func (c *thirdPartyResources) List(opts meta_v1.ListOptions) (result *v1beta1.ThirdPartyResourceList, err error) {
 	result = &v1beta1.ThirdPartyResourceList{}
 	err = c.client.Get().
 		Resource("thirdpartyresources").
@@ -124,7 +124,7 @@ 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) {
+func (c *thirdPartyResources) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Resource("thirdpartyresources").
diff --git a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/fake_poddisruptionbudget.go b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/fake_poddisruptionbudget.go
index edd74988630..ba3d5768383 100644
--- a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/fake_poddisruptionbudget.go
+++ b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/fake_poddisruptionbudget.go
@@ -72,7 +72,7 @@ func (c *FakePodDisruptionBudgets) Delete(name string, options *v1.DeleteOptions
 	return err
 }
 
-func (c *FakePodDisruptionBudgets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakePodDisruptionBudgets) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(poddisruptionbudgetsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1beta1.PodDisruptionBudgetList{})
@@ -89,7 +89,7 @@ func (c *FakePodDisruptionBudgets) Get(name string, options meta_v1.GetOptions)
 	return obj.(*v1beta1.PodDisruptionBudget), err
 }
 
-func (c *FakePodDisruptionBudgets) List(opts v1.ListOptions) (result *v1beta1.PodDisruptionBudgetList, err error) {
+func (c *FakePodDisruptionBudgets) List(opts meta_v1.ListOptions) (result *v1beta1.PodDisruptionBudgetList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(poddisruptionbudgetsResource, c.ns, opts), &v1beta1.PodDisruptionBudgetList{})
 
@@ -111,7 +111,7 @@ func (c *FakePodDisruptionBudgets) List(opts v1.ListOptions) (result *v1beta1.Po
 }
 
 // Watch returns a watch.Interface that watches the requested podDisruptionBudgets.
-func (c *FakePodDisruptionBudgets) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakePodDisruptionBudgets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(poddisruptionbudgetsResource, c.ns, opts))
 
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 ffa09bd6742..0f501543f1e 100644
--- a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/poddisruptionbudget.go
+++ b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/poddisruptionbudget.go
@@ -38,10 +38,10 @@ type PodDisruptionBudgetInterface interface {
 	Update(*v1beta1.PodDisruptionBudget) (*v1beta1.PodDisruptionBudget, error)
 	UpdateStatus(*v1beta1.PodDisruptionBudget) (*v1beta1.PodDisruptionBudget, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1beta1.PodDisruptionBudget, error)
-	List(opts v1.ListOptions) (*v1beta1.PodDisruptionBudgetList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1beta1.PodDisruptionBudgetList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.PodDisruptionBudget, err error)
 	PodDisruptionBudgetExpansion
 }
@@ -113,7 +113,7 @@ func (c *podDisruptionBudgets) Delete(name string, options *v1.DeleteOptions) er
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *podDisruptionBudgets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *podDisruptionBudgets) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("poddisruptionbudgets").
@@ -137,7 +137,7 @@ func (c *podDisruptionBudgets) Get(name string, options meta_v1.GetOptions) (res
 }
 
 // List takes label and field selectors, and returns the list of PodDisruptionBudgets that match those selectors.
-func (c *podDisruptionBudgets) List(opts v1.ListOptions) (result *v1beta1.PodDisruptionBudgetList, err error) {
+func (c *podDisruptionBudgets) List(opts meta_v1.ListOptions) (result *v1beta1.PodDisruptionBudgetList, err error) {
 	result = &v1beta1.PodDisruptionBudgetList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -149,7 +149,7 @@ 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) {
+func (c *podDisruptionBudgets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 4247ade5236..9b2dfec58a2 100644
--- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrole.go
+++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrole.go
@@ -37,10 +37,10 @@ type ClusterRoleInterface interface {
 	Create(*v1alpha1.ClusterRole) (*v1alpha1.ClusterRole, error)
 	Update(*v1alpha1.ClusterRole) (*v1alpha1.ClusterRole, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1alpha1.ClusterRole, error)
-	List(opts v1.ListOptions) (*v1alpha1.ClusterRoleList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1alpha1.ClusterRoleList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.ClusterRole, err error)
 	ClusterRoleExpansion
 }
@@ -91,7 +91,7 @@ func (c *clusterRoles) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *clusterRoles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *clusterRoles) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Resource("clusterroles").
 		VersionedParams(&listOptions, api.ParameterCodec).
@@ -113,7 +113,7 @@ func (c *clusterRoles) Get(name string, options meta_v1.GetOptions) (result *v1a
 }
 
 // List takes label and field selectors, and returns the list of ClusterRoles that match those selectors.
-func (c *clusterRoles) List(opts v1.ListOptions) (result *v1alpha1.ClusterRoleList, err error) {
+func (c *clusterRoles) List(opts meta_v1.ListOptions) (result *v1alpha1.ClusterRoleList, err error) {
 	result = &v1alpha1.ClusterRoleList{}
 	err = c.client.Get().
 		Resource("clusterroles").
@@ -124,7 +124,7 @@ 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) {
+func (c *clusterRoles) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Resource("clusterroles").
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 315b8810dfe..f195ac7790e 100644
--- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrolebinding.go
+++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrolebinding.go
@@ -37,10 +37,10 @@ type ClusterRoleBindingInterface interface {
 	Create(*v1alpha1.ClusterRoleBinding) (*v1alpha1.ClusterRoleBinding, error)
 	Update(*v1alpha1.ClusterRoleBinding) (*v1alpha1.ClusterRoleBinding, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1alpha1.ClusterRoleBinding, error)
-	List(opts v1.ListOptions) (*v1alpha1.ClusterRoleBindingList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1alpha1.ClusterRoleBindingList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.ClusterRoleBinding, err error)
 	ClusterRoleBindingExpansion
 }
@@ -91,7 +91,7 @@ func (c *clusterRoleBindings) Delete(name string, options *v1.DeleteOptions) err
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *clusterRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *clusterRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Resource("clusterrolebindings").
 		VersionedParams(&listOptions, api.ParameterCodec).
@@ -113,7 +113,7 @@ func (c *clusterRoleBindings) Get(name string, options meta_v1.GetOptions) (resu
 }
 
 // List takes label and field selectors, and returns the list of ClusterRoleBindings that match those selectors.
-func (c *clusterRoleBindings) List(opts v1.ListOptions) (result *v1alpha1.ClusterRoleBindingList, err error) {
+func (c *clusterRoleBindings) List(opts meta_v1.ListOptions) (result *v1alpha1.ClusterRoleBindingList, err error) {
 	result = &v1alpha1.ClusterRoleBindingList{}
 	err = c.client.Get().
 		Resource("clusterrolebindings").
@@ -124,7 +124,7 @@ 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) {
+func (c *clusterRoleBindings) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Resource("clusterrolebindings").
diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_clusterrole.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_clusterrole.go
index fe44f6081e5..b70fbc4979e 100644
--- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_clusterrole.go
+++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_clusterrole.go
@@ -58,7 +58,7 @@ func (c *FakeClusterRoles) Delete(name string, options *v1.DeleteOptions) error
 	return err
 }
 
-func (c *FakeClusterRoles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeClusterRoles) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewRootDeleteCollectionAction(clusterrolesResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1alpha1.ClusterRoleList{})
@@ -74,7 +74,7 @@ func (c *FakeClusterRoles) Get(name string, options meta_v1.GetOptions) (result
 	return obj.(*v1alpha1.ClusterRole), err
 }
 
-func (c *FakeClusterRoles) List(opts v1.ListOptions) (result *v1alpha1.ClusterRoleList, err error) {
+func (c *FakeClusterRoles) List(opts meta_v1.ListOptions) (result *v1alpha1.ClusterRoleList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewRootListAction(clusterrolesResource, opts), &v1alpha1.ClusterRoleList{})
 	if obj == nil {
@@ -95,7 +95,7 @@ func (c *FakeClusterRoles) List(opts v1.ListOptions) (result *v1alpha1.ClusterRo
 }
 
 // Watch returns a watch.Interface that watches the requested clusterRoles.
-func (c *FakeClusterRoles) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeClusterRoles) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewRootWatchAction(clusterrolesResource, opts))
 }
diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_clusterrolebinding.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_clusterrolebinding.go
index 155ad3f3469..9546f8bf9cf 100644
--- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_clusterrolebinding.go
+++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_clusterrolebinding.go
@@ -58,7 +58,7 @@ func (c *FakeClusterRoleBindings) Delete(name string, options *v1.DeleteOptions)
 	return err
 }
 
-func (c *FakeClusterRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeClusterRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewRootDeleteCollectionAction(clusterrolebindingsResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1alpha1.ClusterRoleBindingList{})
@@ -74,7 +74,7 @@ func (c *FakeClusterRoleBindings) Get(name string, options meta_v1.GetOptions) (
 	return obj.(*v1alpha1.ClusterRoleBinding), err
 }
 
-func (c *FakeClusterRoleBindings) List(opts v1.ListOptions) (result *v1alpha1.ClusterRoleBindingList, err error) {
+func (c *FakeClusterRoleBindings) List(opts meta_v1.ListOptions) (result *v1alpha1.ClusterRoleBindingList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewRootListAction(clusterrolebindingsResource, opts), &v1alpha1.ClusterRoleBindingList{})
 	if obj == nil {
@@ -95,7 +95,7 @@ func (c *FakeClusterRoleBindings) List(opts v1.ListOptions) (result *v1alpha1.Cl
 }
 
 // Watch returns a watch.Interface that watches the requested clusterRoleBindings.
-func (c *FakeClusterRoleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeClusterRoleBindings) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewRootWatchAction(clusterrolebindingsResource, opts))
 }
diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_role.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_role.go
index 61f077ada6c..3573ca60880 100644
--- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_role.go
+++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_role.go
@@ -62,7 +62,7 @@ func (c *FakeRoles) Delete(name string, options *v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeRoles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeRoles) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(rolesResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1alpha1.RoleList{})
@@ -79,7 +79,7 @@ func (c *FakeRoles) Get(name string, options meta_v1.GetOptions) (result *v1alph
 	return obj.(*v1alpha1.Role), err
 }
 
-func (c *FakeRoles) List(opts v1.ListOptions) (result *v1alpha1.RoleList, err error) {
+func (c *FakeRoles) List(opts meta_v1.ListOptions) (result *v1alpha1.RoleList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(rolesResource, c.ns, opts), &v1alpha1.RoleList{})
 
@@ -101,7 +101,7 @@ func (c *FakeRoles) List(opts v1.ListOptions) (result *v1alpha1.RoleList, err er
 }
 
 // Watch returns a watch.Interface that watches the requested roles.
-func (c *FakeRoles) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeRoles) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(rolesResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_rolebinding.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_rolebinding.go
index 9269fd1f9af..924dd013d10 100644
--- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_rolebinding.go
+++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_rolebinding.go
@@ -62,7 +62,7 @@ func (c *FakeRoleBindings) Delete(name string, options *v1.DeleteOptions) error
 	return err
 }
 
-func (c *FakeRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(rolebindingsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1alpha1.RoleBindingList{})
@@ -79,7 +79,7 @@ func (c *FakeRoleBindings) Get(name string, options meta_v1.GetOptions) (result
 	return obj.(*v1alpha1.RoleBinding), err
 }
 
-func (c *FakeRoleBindings) List(opts v1.ListOptions) (result *v1alpha1.RoleBindingList, err error) {
+func (c *FakeRoleBindings) List(opts meta_v1.ListOptions) (result *v1alpha1.RoleBindingList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(rolebindingsResource, c.ns, opts), &v1alpha1.RoleBindingList{})
 
@@ -101,7 +101,7 @@ func (c *FakeRoleBindings) List(opts v1.ListOptions) (result *v1alpha1.RoleBindi
 }
 
 // Watch returns a watch.Interface that watches the requested roleBindings.
-func (c *FakeRoleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeRoleBindings) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(rolebindingsResource, c.ns, opts))
 
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 b7c47fff729..cdaf1fcd148 100644
--- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/role.go
+++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/role.go
@@ -37,10 +37,10 @@ type RoleInterface interface {
 	Create(*v1alpha1.Role) (*v1alpha1.Role, error)
 	Update(*v1alpha1.Role) (*v1alpha1.Role, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1alpha1.Role, error)
-	List(opts v1.ListOptions) (*v1alpha1.RoleList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1alpha1.RoleList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.Role, err error)
 	RoleExpansion
 }
@@ -96,7 +96,7 @@ func (c *roles) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *roles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *roles) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("roles").
@@ -120,7 +120,7 @@ func (c *roles) Get(name string, options meta_v1.GetOptions) (result *v1alpha1.R
 }
 
 // List takes label and field selectors, and returns the list of Roles that match those selectors.
-func (c *roles) List(opts v1.ListOptions) (result *v1alpha1.RoleList, err error) {
+func (c *roles) List(opts meta_v1.ListOptions) (result *v1alpha1.RoleList, err error) {
 	result = &v1alpha1.RoleList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -132,7 +132,7 @@ 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) {
+func (c *roles) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 d181b021e4c..234999feecb 100644
--- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rolebinding.go
+++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rolebinding.go
@@ -37,10 +37,10 @@ type RoleBindingInterface interface {
 	Create(*v1alpha1.RoleBinding) (*v1alpha1.RoleBinding, error)
 	Update(*v1alpha1.RoleBinding) (*v1alpha1.RoleBinding, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1alpha1.RoleBinding, error)
-	List(opts v1.ListOptions) (*v1alpha1.RoleBindingList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1alpha1.RoleBindingList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.RoleBinding, err error)
 	RoleBindingExpansion
 }
@@ -96,7 +96,7 @@ func (c *roleBindings) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *roleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *roleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("rolebindings").
@@ -120,7 +120,7 @@ func (c *roleBindings) Get(name string, options meta_v1.GetOptions) (result *v1a
 }
 
 // List takes label and field selectors, and returns the list of RoleBindings that match those selectors.
-func (c *roleBindings) List(opts v1.ListOptions) (result *v1alpha1.RoleBindingList, err error) {
+func (c *roleBindings) List(opts meta_v1.ListOptions) (result *v1alpha1.RoleBindingList, err error) {
 	result = &v1alpha1.RoleBindingList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -132,7 +132,7 @@ 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) {
+func (c *roleBindings) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 41aef63d146..0d4396eb044 100644
--- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrole.go
+++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrole.go
@@ -37,10 +37,10 @@ type ClusterRoleInterface interface {
 	Create(*v1beta1.ClusterRole) (*v1beta1.ClusterRole, error)
 	Update(*v1beta1.ClusterRole) (*v1beta1.ClusterRole, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1beta1.ClusterRole, error)
-	List(opts v1.ListOptions) (*v1beta1.ClusterRoleList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1beta1.ClusterRoleList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.ClusterRole, err error)
 	ClusterRoleExpansion
 }
@@ -91,7 +91,7 @@ func (c *clusterRoles) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *clusterRoles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *clusterRoles) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Resource("clusterroles").
 		VersionedParams(&listOptions, api.ParameterCodec).
@@ -113,7 +113,7 @@ func (c *clusterRoles) Get(name string, options meta_v1.GetOptions) (result *v1b
 }
 
 // List takes label and field selectors, and returns the list of ClusterRoles that match those selectors.
-func (c *clusterRoles) List(opts v1.ListOptions) (result *v1beta1.ClusterRoleList, err error) {
+func (c *clusterRoles) List(opts meta_v1.ListOptions) (result *v1beta1.ClusterRoleList, err error) {
 	result = &v1beta1.ClusterRoleList{}
 	err = c.client.Get().
 		Resource("clusterroles").
@@ -124,7 +124,7 @@ 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) {
+func (c *clusterRoles) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Resource("clusterroles").
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 6229b8e93d6..a30d93c4f60 100644
--- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrolebinding.go
+++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrolebinding.go
@@ -37,10 +37,10 @@ type ClusterRoleBindingInterface interface {
 	Create(*v1beta1.ClusterRoleBinding) (*v1beta1.ClusterRoleBinding, error)
 	Update(*v1beta1.ClusterRoleBinding) (*v1beta1.ClusterRoleBinding, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1beta1.ClusterRoleBinding, error)
-	List(opts v1.ListOptions) (*v1beta1.ClusterRoleBindingList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1beta1.ClusterRoleBindingList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.ClusterRoleBinding, err error)
 	ClusterRoleBindingExpansion
 }
@@ -91,7 +91,7 @@ func (c *clusterRoleBindings) Delete(name string, options *v1.DeleteOptions) err
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *clusterRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *clusterRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Resource("clusterrolebindings").
 		VersionedParams(&listOptions, api.ParameterCodec).
@@ -113,7 +113,7 @@ func (c *clusterRoleBindings) Get(name string, options meta_v1.GetOptions) (resu
 }
 
 // List takes label and field selectors, and returns the list of ClusterRoleBindings that match those selectors.
-func (c *clusterRoleBindings) List(opts v1.ListOptions) (result *v1beta1.ClusterRoleBindingList, err error) {
+func (c *clusterRoleBindings) List(opts meta_v1.ListOptions) (result *v1beta1.ClusterRoleBindingList, err error) {
 	result = &v1beta1.ClusterRoleBindingList{}
 	err = c.client.Get().
 		Resource("clusterrolebindings").
@@ -124,7 +124,7 @@ 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) {
+func (c *clusterRoleBindings) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Resource("clusterrolebindings").
diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_clusterrole.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_clusterrole.go
index 88274ac9c17..53c542dc751 100644
--- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_clusterrole.go
+++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_clusterrole.go
@@ -58,7 +58,7 @@ func (c *FakeClusterRoles) Delete(name string, options *v1.DeleteOptions) error
 	return err
 }
 
-func (c *FakeClusterRoles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeClusterRoles) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewRootDeleteCollectionAction(clusterrolesResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1beta1.ClusterRoleList{})
@@ -74,7 +74,7 @@ func (c *FakeClusterRoles) Get(name string, options meta_v1.GetOptions) (result
 	return obj.(*v1beta1.ClusterRole), err
 }
 
-func (c *FakeClusterRoles) List(opts v1.ListOptions) (result *v1beta1.ClusterRoleList, err error) {
+func (c *FakeClusterRoles) List(opts meta_v1.ListOptions) (result *v1beta1.ClusterRoleList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewRootListAction(clusterrolesResource, opts), &v1beta1.ClusterRoleList{})
 	if obj == nil {
@@ -95,7 +95,7 @@ func (c *FakeClusterRoles) List(opts v1.ListOptions) (result *v1beta1.ClusterRol
 }
 
 // Watch returns a watch.Interface that watches the requested clusterRoles.
-func (c *FakeClusterRoles) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeClusterRoles) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewRootWatchAction(clusterrolesResource, opts))
 }
diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_clusterrolebinding.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_clusterrolebinding.go
index dda3dbdbf61..f5ba379c902 100644
--- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_clusterrolebinding.go
+++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_clusterrolebinding.go
@@ -58,7 +58,7 @@ func (c *FakeClusterRoleBindings) Delete(name string, options *v1.DeleteOptions)
 	return err
 }
 
-func (c *FakeClusterRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeClusterRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewRootDeleteCollectionAction(clusterrolebindingsResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1beta1.ClusterRoleBindingList{})
@@ -74,7 +74,7 @@ func (c *FakeClusterRoleBindings) Get(name string, options meta_v1.GetOptions) (
 	return obj.(*v1beta1.ClusterRoleBinding), err
 }
 
-func (c *FakeClusterRoleBindings) List(opts v1.ListOptions) (result *v1beta1.ClusterRoleBindingList, err error) {
+func (c *FakeClusterRoleBindings) List(opts meta_v1.ListOptions) (result *v1beta1.ClusterRoleBindingList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewRootListAction(clusterrolebindingsResource, opts), &v1beta1.ClusterRoleBindingList{})
 	if obj == nil {
@@ -95,7 +95,7 @@ func (c *FakeClusterRoleBindings) List(opts v1.ListOptions) (result *v1beta1.Clu
 }
 
 // Watch returns a watch.Interface that watches the requested clusterRoleBindings.
-func (c *FakeClusterRoleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeClusterRoleBindings) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewRootWatchAction(clusterrolebindingsResource, opts))
 }
diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_role.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_role.go
index f1d84795046..f9f86d00e30 100644
--- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_role.go
+++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_role.go
@@ -62,7 +62,7 @@ func (c *FakeRoles) Delete(name string, options *v1.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeRoles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeRoles) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(rolesResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1beta1.RoleList{})
@@ -79,7 +79,7 @@ func (c *FakeRoles) Get(name string, options meta_v1.GetOptions) (result *v1beta
 	return obj.(*v1beta1.Role), err
 }
 
-func (c *FakeRoles) List(opts v1.ListOptions) (result *v1beta1.RoleList, err error) {
+func (c *FakeRoles) List(opts meta_v1.ListOptions) (result *v1beta1.RoleList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(rolesResource, c.ns, opts), &v1beta1.RoleList{})
 
@@ -101,7 +101,7 @@ func (c *FakeRoles) List(opts v1.ListOptions) (result *v1beta1.RoleList, err err
 }
 
 // Watch returns a watch.Interface that watches the requested roles.
-func (c *FakeRoles) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeRoles) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(rolesResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_rolebinding.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_rolebinding.go
index 726208d5822..6c1d28aa3bf 100644
--- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_rolebinding.go
+++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_rolebinding.go
@@ -62,7 +62,7 @@ func (c *FakeRoleBindings) Delete(name string, options *v1.DeleteOptions) error
 	return err
 }
 
-func (c *FakeRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(rolebindingsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1beta1.RoleBindingList{})
@@ -79,7 +79,7 @@ func (c *FakeRoleBindings) Get(name string, options meta_v1.GetOptions) (result
 	return obj.(*v1beta1.RoleBinding), err
 }
 
-func (c *FakeRoleBindings) List(opts v1.ListOptions) (result *v1beta1.RoleBindingList, err error) {
+func (c *FakeRoleBindings) List(opts meta_v1.ListOptions) (result *v1beta1.RoleBindingList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(rolebindingsResource, c.ns, opts), &v1beta1.RoleBindingList{})
 
@@ -101,7 +101,7 @@ func (c *FakeRoleBindings) List(opts v1.ListOptions) (result *v1beta1.RoleBindin
 }
 
 // Watch returns a watch.Interface that watches the requested roleBindings.
-func (c *FakeRoleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeRoleBindings) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(rolebindingsResource, c.ns, opts))
 
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 958516dffe8..116b2e5611a 100644
--- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/role.go
+++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/role.go
@@ -37,10 +37,10 @@ type RoleInterface interface {
 	Create(*v1beta1.Role) (*v1beta1.Role, error)
 	Update(*v1beta1.Role) (*v1beta1.Role, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1beta1.Role, error)
-	List(opts v1.ListOptions) (*v1beta1.RoleList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1beta1.RoleList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.Role, err error)
 	RoleExpansion
 }
@@ -96,7 +96,7 @@ func (c *roles) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *roles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *roles) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("roles").
@@ -120,7 +120,7 @@ func (c *roles) Get(name string, options meta_v1.GetOptions) (result *v1beta1.Ro
 }
 
 // List takes label and field selectors, and returns the list of Roles that match those selectors.
-func (c *roles) List(opts v1.ListOptions) (result *v1beta1.RoleList, err error) {
+func (c *roles) List(opts meta_v1.ListOptions) (result *v1beta1.RoleList, err error) {
 	result = &v1beta1.RoleList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -132,7 +132,7 @@ 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) {
+func (c *roles) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 ce490766c6a..463d8bab21b 100644
--- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rolebinding.go
+++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rolebinding.go
@@ -37,10 +37,10 @@ type RoleBindingInterface interface {
 	Create(*v1beta1.RoleBinding) (*v1beta1.RoleBinding, error)
 	Update(*v1beta1.RoleBinding) (*v1beta1.RoleBinding, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1beta1.RoleBinding, error)
-	List(opts v1.ListOptions) (*v1beta1.RoleBindingList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1beta1.RoleBindingList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.RoleBinding, err error)
 	RoleBindingExpansion
 }
@@ -96,7 +96,7 @@ func (c *roleBindings) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *roleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *roleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("rolebindings").
@@ -120,7 +120,7 @@ func (c *roleBindings) Get(name string, options meta_v1.GetOptions) (result *v1b
 }
 
 // List takes label and field selectors, and returns the list of RoleBindings that match those selectors.
-func (c *roleBindings) List(opts v1.ListOptions) (result *v1beta1.RoleBindingList, err error) {
+func (c *roleBindings) List(opts meta_v1.ListOptions) (result *v1beta1.RoleBindingList, err error) {
 	result = &v1beta1.RoleBindingList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -132,7 +132,7 @@ 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) {
+func (c *roleBindings) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/fake_storageclass.go b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/fake_storageclass.go
index 730b624d558..50453e3f898 100644
--- a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/fake_storageclass.go
+++ b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/fake_storageclass.go
@@ -58,7 +58,7 @@ func (c *FakeStorageClasses) Delete(name string, options *v1.DeleteOptions) erro
 	return err
 }
 
-func (c *FakeStorageClasses) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *FakeStorageClasses) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	action := core.NewRootDeleteCollectionAction(storageclassesResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1beta1.StorageClassList{})
@@ -74,7 +74,7 @@ func (c *FakeStorageClasses) Get(name string, options meta_v1.GetOptions) (resul
 	return obj.(*v1beta1.StorageClass), err
 }
 
-func (c *FakeStorageClasses) List(opts v1.ListOptions) (result *v1beta1.StorageClassList, err error) {
+func (c *FakeStorageClasses) List(opts meta_v1.ListOptions) (result *v1beta1.StorageClassList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewRootListAction(storageclassesResource, opts), &v1beta1.StorageClassList{})
 	if obj == nil {
@@ -95,7 +95,7 @@ func (c *FakeStorageClasses) List(opts v1.ListOptions) (result *v1beta1.StorageC
 }
 
 // Watch returns a watch.Interface that watches the requested storageClasses.
-func (c *FakeStorageClasses) Watch(opts v1.ListOptions) (watch.Interface, error) {
+func (c *FakeStorageClasses) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewRootWatchAction(storageclassesResource, opts))
 }
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 92a85300462..94edf25830b 100644
--- a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storageclass.go
+++ b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storageclass.go
@@ -37,10 +37,10 @@ type StorageClassInterface interface {
 	Create(*v1beta1.StorageClass) (*v1beta1.StorageClass, error)
 	Update(*v1beta1.StorageClass) (*v1beta1.StorageClass, error)
 	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error
 	Get(name string, options meta_v1.GetOptions) (*v1beta1.StorageClass, error)
-	List(opts v1.ListOptions) (*v1beta1.StorageClassList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
+	List(opts meta_v1.ListOptions) (*v1beta1.StorageClassList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.StorageClass, err error)
 	StorageClassExpansion
 }
@@ -91,7 +91,7 @@ func (c *storageClasses) Delete(name string, options *v1.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *storageClasses) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *storageClasses) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
 	return c.client.Delete().
 		Resource("storageclasses").
 		VersionedParams(&listOptions, api.ParameterCodec).
@@ -113,7 +113,7 @@ func (c *storageClasses) Get(name string, options meta_v1.GetOptions) (result *v
 }
 
 // List takes label and field selectors, and returns the list of StorageClasses that match those selectors.
-func (c *storageClasses) List(opts v1.ListOptions) (result *v1beta1.StorageClassList, err error) {
+func (c *storageClasses) List(opts meta_v1.ListOptions) (result *v1beta1.StorageClassList, err error) {
 	result = &v1beta1.StorageClassList{}
 	err = c.client.Get().
 		Resource("storageclasses").
@@ -124,7 +124,7 @@ 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) {
+func (c *storageClasses) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Resource("storageclasses").
diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/fake_statefulset.go b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/fake_statefulset.go
index 4718f7214c8..6d0f37b61cf 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/fake_statefulset.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/fake_statefulset.go
@@ -72,7 +72,7 @@ func (c *FakeStatefulSets) Delete(name string, options *api.DeleteOptions) error
 	return err
 }
 
-func (c *FakeStatefulSets) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeStatefulSets) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(statefulsetsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &apps.StatefulSetList{})
@@ -89,7 +89,7 @@ func (c *FakeStatefulSets) Get(name string, options v1.GetOptions) (result *apps
 	return obj.(*apps.StatefulSet), err
 }
 
-func (c *FakeStatefulSets) List(opts api.ListOptions) (result *apps.StatefulSetList, err error) {
+func (c *FakeStatefulSets) List(opts v1.ListOptions) (result *apps.StatefulSetList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(statefulsetsResource, c.ns, opts), &apps.StatefulSetList{})
 
@@ -111,7 +111,7 @@ func (c *FakeStatefulSets) List(opts api.ListOptions) (result *apps.StatefulSetL
 }
 
 // Watch returns a watch.Interface that watches the requested statefulSets.
-func (c *FakeStatefulSets) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeStatefulSets) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(statefulsetsResource, c.ns, opts))
 
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 8947ee661cd..fadc6d8e19e 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/statefulset.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/statefulset.go
@@ -37,10 +37,10 @@ type StatefulSetInterface interface {
 	Update(*apps.StatefulSet) (*apps.StatefulSet, error)
 	UpdateStatus(*apps.StatefulSet) (*apps.StatefulSet, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*apps.StatefulSet, error)
-	List(opts api.ListOptions) (*apps.StatefulSetList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*apps.StatefulSetList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *apps.StatefulSet, err error)
 	StatefulSetExpansion
 }
@@ -112,7 +112,7 @@ func (c *statefulSets) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *statefulSets) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *statefulSets) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("statefulsets").
@@ -136,7 +136,7 @@ func (c *statefulSets) Get(name string, options v1.GetOptions) (result *apps.Sta
 }
 
 // List takes label and field selectors, and returns the list of StatefulSets that match those selectors.
-func (c *statefulSets) List(opts api.ListOptions) (result *apps.StatefulSetList, err error) {
+func (c *statefulSets) List(opts v1.ListOptions) (result *apps.StatefulSetList, err error) {
 	result = &apps.StatefulSetList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -148,7 +148,7 @@ func (c *statefulSets) List(opts api.ListOptions) (result *apps.StatefulSetList,
 }
 
 // Watch returns a watch.Interface that watches the requested statefulSets.
-func (c *statefulSets) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *statefulSets) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/fake_horizontalpodautoscaler.go b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/fake_horizontalpodautoscaler.go
index 06938475820..a542e1661b9 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/fake_horizontalpodautoscaler.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/fake_horizontalpodautoscaler.go
@@ -72,7 +72,7 @@ func (c *FakeHorizontalPodAutoscalers) Delete(name string, options *api.DeleteOp
 	return err
 }
 
-func (c *FakeHorizontalPodAutoscalers) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeHorizontalPodAutoscalers) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(horizontalpodautoscalersResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &autoscaling.HorizontalPodAutoscalerList{})
@@ -89,7 +89,7 @@ func (c *FakeHorizontalPodAutoscalers) Get(name string, options v1.GetOptions) (
 	return obj.(*autoscaling.HorizontalPodAutoscaler), err
 }
 
-func (c *FakeHorizontalPodAutoscalers) List(opts api.ListOptions) (result *autoscaling.HorizontalPodAutoscalerList, err error) {
+func (c *FakeHorizontalPodAutoscalers) List(opts v1.ListOptions) (result *autoscaling.HorizontalPodAutoscalerList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(horizontalpodautoscalersResource, c.ns, opts), &autoscaling.HorizontalPodAutoscalerList{})
 
@@ -111,7 +111,7 @@ func (c *FakeHorizontalPodAutoscalers) List(opts api.ListOptions) (result *autos
 }
 
 // Watch returns a watch.Interface that watches the requested horizontalPodAutoscalers.
-func (c *FakeHorizontalPodAutoscalers) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeHorizontalPodAutoscalers) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(horizontalpodautoscalersResource, c.ns, opts))
 
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 74bf1376e97..83c8a0f9ab5 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/horizontalpodautoscaler.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/horizontalpodautoscaler.go
@@ -37,10 +37,10 @@ type HorizontalPodAutoscalerInterface interface {
 	Update(*autoscaling.HorizontalPodAutoscaler) (*autoscaling.HorizontalPodAutoscaler, error)
 	UpdateStatus(*autoscaling.HorizontalPodAutoscaler) (*autoscaling.HorizontalPodAutoscaler, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*autoscaling.HorizontalPodAutoscaler, error)
-	List(opts api.ListOptions) (*autoscaling.HorizontalPodAutoscalerList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*autoscaling.HorizontalPodAutoscalerList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *autoscaling.HorizontalPodAutoscaler, err error)
 	HorizontalPodAutoscalerExpansion
 }
@@ -112,7 +112,7 @@ func (c *horizontalPodAutoscalers) Delete(name string, options *api.DeleteOption
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *horizontalPodAutoscalers) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *horizontalPodAutoscalers) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("horizontalpodautoscalers").
@@ -136,7 +136,7 @@ func (c *horizontalPodAutoscalers) Get(name string, options v1.GetOptions) (resu
 }
 
 // List takes label and field selectors, and returns the list of HorizontalPodAutoscalers that match those selectors.
-func (c *horizontalPodAutoscalers) List(opts api.ListOptions) (result *autoscaling.HorizontalPodAutoscalerList, err error) {
+func (c *horizontalPodAutoscalers) List(opts v1.ListOptions) (result *autoscaling.HorizontalPodAutoscalerList, err error) {
 	result = &autoscaling.HorizontalPodAutoscalerList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -148,7 +148,7 @@ func (c *horizontalPodAutoscalers) List(opts api.ListOptions) (result *autoscali
 }
 
 // Watch returns a watch.Interface that watches the requested horizontalPodAutoscalers.
-func (c *horizontalPodAutoscalers) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *horizontalPodAutoscalers) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 89ebf2efd93..8cab71ff1c6 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/cronjob.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/cronjob.go
@@ -37,10 +37,10 @@ type CronJobInterface interface {
 	Update(*batch.CronJob) (*batch.CronJob, error)
 	UpdateStatus(*batch.CronJob) (*batch.CronJob, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*batch.CronJob, error)
-	List(opts api.ListOptions) (*batch.CronJobList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*batch.CronJobList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *batch.CronJob, err error)
 	CronJobExpansion
 }
@@ -112,7 +112,7 @@ func (c *cronJobs) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *cronJobs) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *cronJobs) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("cronjobs").
@@ -136,7 +136,7 @@ func (c *cronJobs) Get(name string, options v1.GetOptions) (result *batch.CronJo
 }
 
 // List takes label and field selectors, and returns the list of CronJobs that match those selectors.
-func (c *cronJobs) List(opts api.ListOptions) (result *batch.CronJobList, err error) {
+func (c *cronJobs) List(opts v1.ListOptions) (result *batch.CronJobList, err error) {
 	result = &batch.CronJobList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -148,7 +148,7 @@ func (c *cronJobs) List(opts api.ListOptions) (result *batch.CronJobList, err er
 }
 
 // Watch returns a watch.Interface that watches the requested cronJobs.
-func (c *cronJobs) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *cronJobs) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_cronjob.go b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_cronjob.go
index 9f136d8b9b0..99e12797be2 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_cronjob.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_cronjob.go
@@ -72,7 +72,7 @@ func (c *FakeCronJobs) Delete(name string, options *api.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeCronJobs) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeCronJobs) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(cronjobsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &batch.CronJobList{})
@@ -89,7 +89,7 @@ func (c *FakeCronJobs) Get(name string, options v1.GetOptions) (result *batch.Cr
 	return obj.(*batch.CronJob), err
 }
 
-func (c *FakeCronJobs) List(opts api.ListOptions) (result *batch.CronJobList, err error) {
+func (c *FakeCronJobs) List(opts v1.ListOptions) (result *batch.CronJobList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(cronjobsResource, c.ns, opts), &batch.CronJobList{})
 
@@ -111,7 +111,7 @@ func (c *FakeCronJobs) List(opts api.ListOptions) (result *batch.CronJobList, er
 }
 
 // Watch returns a watch.Interface that watches the requested cronJobs.
-func (c *FakeCronJobs) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeCronJobs) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(cronjobsResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_job.go b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_job.go
index 288323cdf72..71260fa1991 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_job.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_job.go
@@ -72,7 +72,7 @@ func (c *FakeJobs) Delete(name string, options *api.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeJobs) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeJobs) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(jobsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &batch.JobList{})
@@ -89,7 +89,7 @@ func (c *FakeJobs) Get(name string, options v1.GetOptions) (result *batch.Job, e
 	return obj.(*batch.Job), err
 }
 
-func (c *FakeJobs) List(opts api.ListOptions) (result *batch.JobList, err error) {
+func (c *FakeJobs) List(opts v1.ListOptions) (result *batch.JobList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(jobsResource, c.ns, opts), &batch.JobList{})
 
@@ -111,7 +111,7 @@ func (c *FakeJobs) List(opts api.ListOptions) (result *batch.JobList, err error)
 }
 
 // Watch returns a watch.Interface that watches the requested jobs.
-func (c *FakeJobs) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeJobs) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(jobsResource, c.ns, opts))
 
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 53fea7e6041..a761b6931ec 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/job.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/job.go
@@ -37,10 +37,10 @@ type JobInterface interface {
 	Update(*batch.Job) (*batch.Job, error)
 	UpdateStatus(*batch.Job) (*batch.Job, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*batch.Job, error)
-	List(opts api.ListOptions) (*batch.JobList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*batch.JobList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *batch.Job, err error)
 	JobExpansion
 }
@@ -112,7 +112,7 @@ func (c *jobs) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *jobs) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *jobs) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("jobs").
@@ -136,7 +136,7 @@ func (c *jobs) Get(name string, options v1.GetOptions) (result *batch.Job, err e
 }
 
 // List takes label and field selectors, and returns the list of Jobs that match those selectors.
-func (c *jobs) List(opts api.ListOptions) (result *batch.JobList, err error) {
+func (c *jobs) List(opts v1.ListOptions) (result *batch.JobList, err error) {
 	result = &batch.JobList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -148,7 +148,7 @@ func (c *jobs) List(opts api.ListOptions) (result *batch.JobList, err error) {
 }
 
 // Watch returns a watch.Interface that watches the requested jobs.
-func (c *jobs) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *jobs) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 6cb7d2622ec..c75d2eac30e 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificatesigningrequest.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificatesigningrequest.go
@@ -37,10 +37,10 @@ type CertificateSigningRequestInterface interface {
 	Update(*certificates.CertificateSigningRequest) (*certificates.CertificateSigningRequest, error)
 	UpdateStatus(*certificates.CertificateSigningRequest) (*certificates.CertificateSigningRequest, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*certificates.CertificateSigningRequest, error)
-	List(opts api.ListOptions) (*certificates.CertificateSigningRequestList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*certificates.CertificateSigningRequestList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *certificates.CertificateSigningRequest, err error)
 	CertificateSigningRequestExpansion
 }
@@ -106,7 +106,7 @@ func (c *certificateSigningRequests) Delete(name string, options *api.DeleteOpti
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *certificateSigningRequests) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *certificateSigningRequests) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Resource("certificatesigningrequests").
 		VersionedParams(&listOptions, api.ParameterCodec).
@@ -128,7 +128,7 @@ func (c *certificateSigningRequests) Get(name string, options v1.GetOptions) (re
 }
 
 // List takes label and field selectors, and returns the list of CertificateSigningRequests that match those selectors.
-func (c *certificateSigningRequests) List(opts api.ListOptions) (result *certificates.CertificateSigningRequestList, err error) {
+func (c *certificateSigningRequests) List(opts v1.ListOptions) (result *certificates.CertificateSigningRequestList, err error) {
 	result = &certificates.CertificateSigningRequestList{}
 	err = c.client.Get().
 		Resource("certificatesigningrequests").
@@ -139,7 +139,7 @@ func (c *certificateSigningRequests) List(opts api.ListOptions) (result *certifi
 }
 
 // Watch returns a watch.Interface that watches the requested certificateSigningRequests.
-func (c *certificateSigningRequests) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *certificateSigningRequests) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Resource("certificatesigningrequests").
diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/fake_certificatesigningrequest.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/fake_certificatesigningrequest.go
index d5056bdea40..e5d4db34705 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/fake_certificatesigningrequest.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/fake_certificatesigningrequest.go
@@ -67,7 +67,7 @@ func (c *FakeCertificateSigningRequests) Delete(name string, options *api.Delete
 	return err
 }
 
-func (c *FakeCertificateSigningRequests) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeCertificateSigningRequests) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewRootDeleteCollectionAction(certificatesigningrequestsResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &certificates.CertificateSigningRequestList{})
@@ -83,7 +83,7 @@ func (c *FakeCertificateSigningRequests) Get(name string, options v1.GetOptions)
 	return obj.(*certificates.CertificateSigningRequest), err
 }
 
-func (c *FakeCertificateSigningRequests) List(opts api.ListOptions) (result *certificates.CertificateSigningRequestList, err error) {
+func (c *FakeCertificateSigningRequests) List(opts v1.ListOptions) (result *certificates.CertificateSigningRequestList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewRootListAction(certificatesigningrequestsResource, opts), &certificates.CertificateSigningRequestList{})
 	if obj == nil {
@@ -104,7 +104,7 @@ func (c *FakeCertificateSigningRequests) List(opts api.ListOptions) (result *cer
 }
 
 // Watch returns a watch.Interface that watches the requested certificateSigningRequests.
-func (c *FakeCertificateSigningRequests) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeCertificateSigningRequests) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewRootWatchAction(certificatesigningrequestsResource, opts))
 }
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 da735d62703..0c338903217 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/componentstatus.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/componentstatus.go
@@ -35,10 +35,10 @@ type ComponentStatusInterface interface {
 	Create(*api.ComponentStatus) (*api.ComponentStatus, error)
 	Update(*api.ComponentStatus) (*api.ComponentStatus, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*api.ComponentStatus, error)
-	List(opts api.ListOptions) (*api.ComponentStatusList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*api.ComponentStatusList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.ComponentStatus, err error)
 	ComponentStatusExpansion
 }
@@ -89,7 +89,7 @@ func (c *componentStatuses) Delete(name string, options *api.DeleteOptions) erro
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *componentStatuses) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *componentStatuses) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Resource("componentstatuses").
 		VersionedParams(&listOptions, api.ParameterCodec).
@@ -111,7 +111,7 @@ func (c *componentStatuses) Get(name string, options v1.GetOptions) (result *api
 }
 
 // List takes label and field selectors, and returns the list of ComponentStatuses that match those selectors.
-func (c *componentStatuses) List(opts api.ListOptions) (result *api.ComponentStatusList, err error) {
+func (c *componentStatuses) List(opts v1.ListOptions) (result *api.ComponentStatusList, err error) {
 	result = &api.ComponentStatusList{}
 	err = c.client.Get().
 		Resource("componentstatuses").
@@ -122,7 +122,7 @@ func (c *componentStatuses) List(opts api.ListOptions) (result *api.ComponentSta
 }
 
 // Watch returns a watch.Interface that watches the requested componentStatuses.
-func (c *componentStatuses) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *componentStatuses) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Resource("componentstatuses").
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 cc5accb295e..b3c10967055 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/configmap.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/configmap.go
@@ -35,10 +35,10 @@ type ConfigMapInterface interface {
 	Create(*api.ConfigMap) (*api.ConfigMap, error)
 	Update(*api.ConfigMap) (*api.ConfigMap, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*api.ConfigMap, error)
-	List(opts api.ListOptions) (*api.ConfigMapList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*api.ConfigMapList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.ConfigMap, err error)
 	ConfigMapExpansion
 }
@@ -94,7 +94,7 @@ func (c *configMaps) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *configMaps) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *configMaps) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("configmaps").
@@ -118,7 +118,7 @@ func (c *configMaps) Get(name string, options v1.GetOptions) (result *api.Config
 }
 
 // List takes label and field selectors, and returns the list of ConfigMaps that match those selectors.
-func (c *configMaps) List(opts api.ListOptions) (result *api.ConfigMapList, err error) {
+func (c *configMaps) List(opts v1.ListOptions) (result *api.ConfigMapList, err error) {
 	result = &api.ConfigMapList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -130,7 +130,7 @@ func (c *configMaps) List(opts api.ListOptions) (result *api.ConfigMapList, err
 }
 
 // Watch returns a watch.Interface that watches the requested configMaps.
-func (c *configMaps) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *configMaps) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 eb5134b2b89..3d564fda242 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/endpoints.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/endpoints.go
@@ -35,10 +35,10 @@ type EndpointsInterface interface {
 	Create(*api.Endpoints) (*api.Endpoints, error)
 	Update(*api.Endpoints) (*api.Endpoints, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*api.Endpoints, error)
-	List(opts api.ListOptions) (*api.EndpointsList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*api.EndpointsList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.Endpoints, err error)
 	EndpointsExpansion
 }
@@ -94,7 +94,7 @@ func (c *endpoints) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *endpoints) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *endpoints) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("endpoints").
@@ -118,7 +118,7 @@ func (c *endpoints) Get(name string, options v1.GetOptions) (result *api.Endpoin
 }
 
 // List takes label and field selectors, and returns the list of Endpoints that match those selectors.
-func (c *endpoints) List(opts api.ListOptions) (result *api.EndpointsList, err error) {
+func (c *endpoints) List(opts v1.ListOptions) (result *api.EndpointsList, err error) {
 	result = &api.EndpointsList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -130,7 +130,7 @@ func (c *endpoints) List(opts api.ListOptions) (result *api.EndpointsList, err e
 }
 
 // Watch returns a watch.Interface that watches the requested endpoints.
-func (c *endpoints) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *endpoints) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 bbb6a398436..aa1f7bb8ac1 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/event.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/event.go
@@ -35,10 +35,10 @@ type EventInterface interface {
 	Create(*api.Event) (*api.Event, error)
 	Update(*api.Event) (*api.Event, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*api.Event, error)
-	List(opts api.ListOptions) (*api.EventList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*api.EventList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.Event, err error)
 	EventExpansion
 }
@@ -94,7 +94,7 @@ func (c *events) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *events) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *events) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("events").
@@ -118,7 +118,7 @@ func (c *events) Get(name string, options v1.GetOptions) (result *api.Event, err
 }
 
 // List takes label and field selectors, and returns the list of Events that match those selectors.
-func (c *events) List(opts api.ListOptions) (result *api.EventList, err error) {
+func (c *events) List(opts v1.ListOptions) (result *api.EventList, err error) {
 	result = &api.EventList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -130,7 +130,7 @@ func (c *events) List(opts api.ListOptions) (result *api.EventList, err error) {
 }
 
 // Watch returns a watch.Interface that watches the requested events.
-func (c *events) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *events) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_componentstatus.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_componentstatus.go
index 3331f177b1a..fbe445ec0de 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_componentstatus.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_componentstatus.go
@@ -57,7 +57,7 @@ func (c *FakeComponentStatuses) Delete(name string, options *api.DeleteOptions)
 	return err
 }
 
-func (c *FakeComponentStatuses) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeComponentStatuses) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewRootDeleteCollectionAction(componentstatusesResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &api.ComponentStatusList{})
@@ -73,7 +73,7 @@ func (c *FakeComponentStatuses) Get(name string, options v1.GetOptions) (result
 	return obj.(*api.ComponentStatus), err
 }
 
-func (c *FakeComponentStatuses) List(opts api.ListOptions) (result *api.ComponentStatusList, err error) {
+func (c *FakeComponentStatuses) List(opts v1.ListOptions) (result *api.ComponentStatusList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewRootListAction(componentstatusesResource, opts), &api.ComponentStatusList{})
 	if obj == nil {
@@ -94,7 +94,7 @@ func (c *FakeComponentStatuses) List(opts api.ListOptions) (result *api.Componen
 }
 
 // Watch returns a watch.Interface that watches the requested componentStatuses.
-func (c *FakeComponentStatuses) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeComponentStatuses) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewRootWatchAction(componentstatusesResource, opts))
 }
diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_configmap.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_configmap.go
index 52620c98b54..c8679d484ab 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_configmap.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_configmap.go
@@ -61,7 +61,7 @@ func (c *FakeConfigMaps) Delete(name string, options *api.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeConfigMaps) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeConfigMaps) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(configmapsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &api.ConfigMapList{})
@@ -78,7 +78,7 @@ func (c *FakeConfigMaps) Get(name string, options v1.GetOptions) (result *api.Co
 	return obj.(*api.ConfigMap), err
 }
 
-func (c *FakeConfigMaps) List(opts api.ListOptions) (result *api.ConfigMapList, err error) {
+func (c *FakeConfigMaps) List(opts v1.ListOptions) (result *api.ConfigMapList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(configmapsResource, c.ns, opts), &api.ConfigMapList{})
 
@@ -100,7 +100,7 @@ func (c *FakeConfigMaps) List(opts api.ListOptions) (result *api.ConfigMapList,
 }
 
 // Watch returns a watch.Interface that watches the requested configMaps.
-func (c *FakeConfigMaps) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeConfigMaps) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(configmapsResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_endpoints.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_endpoints.go
index ec3339ae884..9fb37e119ff 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_endpoints.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_endpoints.go
@@ -61,7 +61,7 @@ func (c *FakeEndpoints) Delete(name string, options *api.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeEndpoints) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeEndpoints) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(endpointsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &api.EndpointsList{})
@@ -78,7 +78,7 @@ func (c *FakeEndpoints) Get(name string, options v1.GetOptions) (result *api.End
 	return obj.(*api.Endpoints), err
 }
 
-func (c *FakeEndpoints) List(opts api.ListOptions) (result *api.EndpointsList, err error) {
+func (c *FakeEndpoints) List(opts v1.ListOptions) (result *api.EndpointsList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(endpointsResource, c.ns, opts), &api.EndpointsList{})
 
@@ -100,7 +100,7 @@ func (c *FakeEndpoints) List(opts api.ListOptions) (result *api.EndpointsList, e
 }
 
 // Watch returns a watch.Interface that watches the requested endpoints.
-func (c *FakeEndpoints) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeEndpoints) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(endpointsResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_event.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_event.go
index 8d2e9d12537..599d27e607b 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_event.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_event.go
@@ -61,7 +61,7 @@ func (c *FakeEvents) Delete(name string, options *api.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeEvents) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeEvents) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(eventsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &api.EventList{})
@@ -78,7 +78,7 @@ func (c *FakeEvents) Get(name string, options v1.GetOptions) (result *api.Event,
 	return obj.(*api.Event), err
 }
 
-func (c *FakeEvents) List(opts api.ListOptions) (result *api.EventList, err error) {
+func (c *FakeEvents) List(opts v1.ListOptions) (result *api.EventList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(eventsResource, c.ns, opts), &api.EventList{})
 
@@ -100,7 +100,7 @@ func (c *FakeEvents) List(opts api.ListOptions) (result *api.EventList, err erro
 }
 
 // Watch returns a watch.Interface that watches the requested events.
-func (c *FakeEvents) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeEvents) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(eventsResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_limitrange.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_limitrange.go
index c0f7f97c73c..b21df0525cf 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_limitrange.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_limitrange.go
@@ -61,7 +61,7 @@ func (c *FakeLimitRanges) Delete(name string, options *api.DeleteOptions) error
 	return err
 }
 
-func (c *FakeLimitRanges) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeLimitRanges) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(limitrangesResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &api.LimitRangeList{})
@@ -78,7 +78,7 @@ func (c *FakeLimitRanges) Get(name string, options v1.GetOptions) (result *api.L
 	return obj.(*api.LimitRange), err
 }
 
-func (c *FakeLimitRanges) List(opts api.ListOptions) (result *api.LimitRangeList, err error) {
+func (c *FakeLimitRanges) List(opts v1.ListOptions) (result *api.LimitRangeList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(limitrangesResource, c.ns, opts), &api.LimitRangeList{})
 
@@ -100,7 +100,7 @@ func (c *FakeLimitRanges) List(opts api.ListOptions) (result *api.LimitRangeList
 }
 
 // Watch returns a watch.Interface that watches the requested limitRanges.
-func (c *FakeLimitRanges) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeLimitRanges) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(limitrangesResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_namespace.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_namespace.go
index ce2595896ac..c709b3e1f31 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_namespace.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_namespace.go
@@ -66,7 +66,7 @@ func (c *FakeNamespaces) Delete(name string, options *api.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeNamespaces) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeNamespaces) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewRootDeleteCollectionAction(namespacesResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &api.NamespaceList{})
@@ -82,7 +82,7 @@ func (c *FakeNamespaces) Get(name string, options v1.GetOptions) (result *api.Na
 	return obj.(*api.Namespace), err
 }
 
-func (c *FakeNamespaces) List(opts api.ListOptions) (result *api.NamespaceList, err error) {
+func (c *FakeNamespaces) List(opts v1.ListOptions) (result *api.NamespaceList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewRootListAction(namespacesResource, opts), &api.NamespaceList{})
 	if obj == nil {
@@ -103,7 +103,7 @@ func (c *FakeNamespaces) List(opts api.ListOptions) (result *api.NamespaceList,
 }
 
 // Watch returns a watch.Interface that watches the requested namespaces.
-func (c *FakeNamespaces) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeNamespaces) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewRootWatchAction(namespacesResource, opts))
 }
diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_node.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_node.go
index 5ff6e074132..a2fca29838a 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_node.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_node.go
@@ -66,7 +66,7 @@ func (c *FakeNodes) Delete(name string, options *api.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeNodes) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeNodes) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewRootDeleteCollectionAction(nodesResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &api.NodeList{})
@@ -82,7 +82,7 @@ func (c *FakeNodes) Get(name string, options v1.GetOptions) (result *api.Node, e
 	return obj.(*api.Node), err
 }
 
-func (c *FakeNodes) List(opts api.ListOptions) (result *api.NodeList, err error) {
+func (c *FakeNodes) List(opts v1.ListOptions) (result *api.NodeList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewRootListAction(nodesResource, opts), &api.NodeList{})
 	if obj == nil {
@@ -103,7 +103,7 @@ func (c *FakeNodes) List(opts api.ListOptions) (result *api.NodeList, err error)
 }
 
 // Watch returns a watch.Interface that watches the requested nodes.
-func (c *FakeNodes) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeNodes) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewRootWatchAction(nodesResource, opts))
 }
diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_persistentvolume.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_persistentvolume.go
index fda13017e96..5240a96fd6f 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_persistentvolume.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_persistentvolume.go
@@ -66,7 +66,7 @@ func (c *FakePersistentVolumes) Delete(name string, options *api.DeleteOptions)
 	return err
 }
 
-func (c *FakePersistentVolumes) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakePersistentVolumes) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewRootDeleteCollectionAction(persistentvolumesResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &api.PersistentVolumeList{})
@@ -82,7 +82,7 @@ func (c *FakePersistentVolumes) Get(name string, options v1.GetOptions) (result
 	return obj.(*api.PersistentVolume), err
 }
 
-func (c *FakePersistentVolumes) List(opts api.ListOptions) (result *api.PersistentVolumeList, err error) {
+func (c *FakePersistentVolumes) List(opts v1.ListOptions) (result *api.PersistentVolumeList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewRootListAction(persistentvolumesResource, opts), &api.PersistentVolumeList{})
 	if obj == nil {
@@ -103,7 +103,7 @@ func (c *FakePersistentVolumes) List(opts api.ListOptions) (result *api.Persiste
 }
 
 // Watch returns a watch.Interface that watches the requested persistentVolumes.
-func (c *FakePersistentVolumes) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakePersistentVolumes) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewRootWatchAction(persistentvolumesResource, opts))
 }
diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_persistentvolumeclaim.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_persistentvolumeclaim.go
index 407b08286c2..1bf28eac140 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_persistentvolumeclaim.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_persistentvolumeclaim.go
@@ -71,7 +71,7 @@ func (c *FakePersistentVolumeClaims) Delete(name string, options *api.DeleteOpti
 	return err
 }
 
-func (c *FakePersistentVolumeClaims) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakePersistentVolumeClaims) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(persistentvolumeclaimsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &api.PersistentVolumeClaimList{})
@@ -88,7 +88,7 @@ func (c *FakePersistentVolumeClaims) Get(name string, options v1.GetOptions) (re
 	return obj.(*api.PersistentVolumeClaim), err
 }
 
-func (c *FakePersistentVolumeClaims) List(opts api.ListOptions) (result *api.PersistentVolumeClaimList, err error) {
+func (c *FakePersistentVolumeClaims) List(opts v1.ListOptions) (result *api.PersistentVolumeClaimList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(persistentvolumeclaimsResource, c.ns, opts), &api.PersistentVolumeClaimList{})
 
@@ -110,7 +110,7 @@ func (c *FakePersistentVolumeClaims) List(opts api.ListOptions) (result *api.Per
 }
 
 // Watch returns a watch.Interface that watches the requested persistentVolumeClaims.
-func (c *FakePersistentVolumeClaims) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakePersistentVolumeClaims) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(persistentvolumeclaimsResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_pod.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_pod.go
index 302fe2cfb1a..fabc232dd6a 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_pod.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_pod.go
@@ -71,7 +71,7 @@ func (c *FakePods) Delete(name string, options *api.DeleteOptions) error {
 	return err
 }
 
-func (c *FakePods) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakePods) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(podsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &api.PodList{})
@@ -88,7 +88,7 @@ func (c *FakePods) Get(name string, options v1.GetOptions) (result *api.Pod, err
 	return obj.(*api.Pod), err
 }
 
-func (c *FakePods) List(opts api.ListOptions) (result *api.PodList, err error) {
+func (c *FakePods) List(opts v1.ListOptions) (result *api.PodList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(podsResource, c.ns, opts), &api.PodList{})
 
@@ -110,7 +110,7 @@ func (c *FakePods) List(opts api.ListOptions) (result *api.PodList, err error) {
 }
 
 // Watch returns a watch.Interface that watches the requested pods.
-func (c *FakePods) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakePods) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(podsResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_podtemplate.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_podtemplate.go
index 80b4e10acb0..28de19b7c03 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_podtemplate.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_podtemplate.go
@@ -61,7 +61,7 @@ func (c *FakePodTemplates) Delete(name string, options *api.DeleteOptions) error
 	return err
 }
 
-func (c *FakePodTemplates) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakePodTemplates) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(podtemplatesResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &api.PodTemplateList{})
@@ -78,7 +78,7 @@ func (c *FakePodTemplates) Get(name string, options v1.GetOptions) (result *api.
 	return obj.(*api.PodTemplate), err
 }
 
-func (c *FakePodTemplates) List(opts api.ListOptions) (result *api.PodTemplateList, err error) {
+func (c *FakePodTemplates) List(opts v1.ListOptions) (result *api.PodTemplateList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(podtemplatesResource, c.ns, opts), &api.PodTemplateList{})
 
@@ -100,7 +100,7 @@ func (c *FakePodTemplates) List(opts api.ListOptions) (result *api.PodTemplateLi
 }
 
 // Watch returns a watch.Interface that watches the requested podTemplates.
-func (c *FakePodTemplates) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakePodTemplates) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(podtemplatesResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_replicationcontroller.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_replicationcontroller.go
index 14fe0ff5394..ef49c98b0bf 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_replicationcontroller.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_replicationcontroller.go
@@ -71,7 +71,7 @@ func (c *FakeReplicationControllers) Delete(name string, options *api.DeleteOpti
 	return err
 }
 
-func (c *FakeReplicationControllers) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeReplicationControllers) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(replicationcontrollersResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &api.ReplicationControllerList{})
@@ -88,7 +88,7 @@ func (c *FakeReplicationControllers) Get(name string, options v1.GetOptions) (re
 	return obj.(*api.ReplicationController), err
 }
 
-func (c *FakeReplicationControllers) List(opts api.ListOptions) (result *api.ReplicationControllerList, err error) {
+func (c *FakeReplicationControllers) List(opts v1.ListOptions) (result *api.ReplicationControllerList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(replicationcontrollersResource, c.ns, opts), &api.ReplicationControllerList{})
 
@@ -110,7 +110,7 @@ func (c *FakeReplicationControllers) List(opts api.ListOptions) (result *api.Rep
 }
 
 // Watch returns a watch.Interface that watches the requested replicationControllers.
-func (c *FakeReplicationControllers) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeReplicationControllers) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(replicationcontrollersResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_resourcequota.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_resourcequota.go
index 1bc2a4e4f69..d0e010fe3ba 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_resourcequota.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_resourcequota.go
@@ -71,7 +71,7 @@ func (c *FakeResourceQuotas) Delete(name string, options *api.DeleteOptions) err
 	return err
 }
 
-func (c *FakeResourceQuotas) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeResourceQuotas) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(resourcequotasResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &api.ResourceQuotaList{})
@@ -88,7 +88,7 @@ func (c *FakeResourceQuotas) Get(name string, options v1.GetOptions) (result *ap
 	return obj.(*api.ResourceQuota), err
 }
 
-func (c *FakeResourceQuotas) List(opts api.ListOptions) (result *api.ResourceQuotaList, err error) {
+func (c *FakeResourceQuotas) List(opts v1.ListOptions) (result *api.ResourceQuotaList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(resourcequotasResource, c.ns, opts), &api.ResourceQuotaList{})
 
@@ -110,7 +110,7 @@ func (c *FakeResourceQuotas) List(opts api.ListOptions) (result *api.ResourceQuo
 }
 
 // Watch returns a watch.Interface that watches the requested resourceQuotas.
-func (c *FakeResourceQuotas) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeResourceQuotas) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(resourcequotasResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_secret.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_secret.go
index 62ad836cce4..31a118ae116 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_secret.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_secret.go
@@ -61,7 +61,7 @@ func (c *FakeSecrets) Delete(name string, options *api.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeSecrets) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeSecrets) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(secretsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &api.SecretList{})
@@ -78,7 +78,7 @@ func (c *FakeSecrets) Get(name string, options v1.GetOptions) (result *api.Secre
 	return obj.(*api.Secret), err
 }
 
-func (c *FakeSecrets) List(opts api.ListOptions) (result *api.SecretList, err error) {
+func (c *FakeSecrets) List(opts v1.ListOptions) (result *api.SecretList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(secretsResource, c.ns, opts), &api.SecretList{})
 
@@ -100,7 +100,7 @@ func (c *FakeSecrets) List(opts api.ListOptions) (result *api.SecretList, err er
 }
 
 // Watch returns a watch.Interface that watches the requested secrets.
-func (c *FakeSecrets) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeSecrets) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(secretsResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_service.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_service.go
index 7fe3c369773..7ea844b230b 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_service.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_service.go
@@ -71,7 +71,7 @@ func (c *FakeServices) Delete(name string, options *api.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeServices) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeServices) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(servicesResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &api.ServiceList{})
@@ -88,7 +88,7 @@ func (c *FakeServices) Get(name string, options v1.GetOptions) (result *api.Serv
 	return obj.(*api.Service), err
 }
 
-func (c *FakeServices) List(opts api.ListOptions) (result *api.ServiceList, err error) {
+func (c *FakeServices) List(opts v1.ListOptions) (result *api.ServiceList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(servicesResource, c.ns, opts), &api.ServiceList{})
 
@@ -110,7 +110,7 @@ func (c *FakeServices) List(opts api.ListOptions) (result *api.ServiceList, err
 }
 
 // Watch returns a watch.Interface that watches the requested services.
-func (c *FakeServices) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeServices) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(servicesResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_serviceaccount.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_serviceaccount.go
index 5169fd44d33..a51b11b6736 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_serviceaccount.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_serviceaccount.go
@@ -61,7 +61,7 @@ func (c *FakeServiceAccounts) Delete(name string, options *api.DeleteOptions) er
 	return err
 }
 
-func (c *FakeServiceAccounts) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeServiceAccounts) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(serviceaccountsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &api.ServiceAccountList{})
@@ -78,7 +78,7 @@ func (c *FakeServiceAccounts) Get(name string, options v1.GetOptions) (result *a
 	return obj.(*api.ServiceAccount), err
 }
 
-func (c *FakeServiceAccounts) List(opts api.ListOptions) (result *api.ServiceAccountList, err error) {
+func (c *FakeServiceAccounts) List(opts v1.ListOptions) (result *api.ServiceAccountList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(serviceaccountsResource, c.ns, opts), &api.ServiceAccountList{})
 
@@ -100,7 +100,7 @@ func (c *FakeServiceAccounts) List(opts api.ListOptions) (result *api.ServiceAcc
 }
 
 // Watch returns a watch.Interface that watches the requested serviceAccounts.
-func (c *FakeServiceAccounts) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeServiceAccounts) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(serviceaccountsResource, c.ns, opts))
 
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 8b30bbb6e0b..7299283cffb 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/limitrange.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/limitrange.go
@@ -35,10 +35,10 @@ type LimitRangeInterface interface {
 	Create(*api.LimitRange) (*api.LimitRange, error)
 	Update(*api.LimitRange) (*api.LimitRange, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*api.LimitRange, error)
-	List(opts api.ListOptions) (*api.LimitRangeList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*api.LimitRangeList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.LimitRange, err error)
 	LimitRangeExpansion
 }
@@ -94,7 +94,7 @@ func (c *limitRanges) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *limitRanges) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *limitRanges) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("limitranges").
@@ -118,7 +118,7 @@ func (c *limitRanges) Get(name string, options v1.GetOptions) (result *api.Limit
 }
 
 // List takes label and field selectors, and returns the list of LimitRanges that match those selectors.
-func (c *limitRanges) List(opts api.ListOptions) (result *api.LimitRangeList, err error) {
+func (c *limitRanges) List(opts v1.ListOptions) (result *api.LimitRangeList, err error) {
 	result = &api.LimitRangeList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -130,7 +130,7 @@ func (c *limitRanges) List(opts api.ListOptions) (result *api.LimitRangeList, er
 }
 
 // Watch returns a watch.Interface that watches the requested limitRanges.
-func (c *limitRanges) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *limitRanges) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 7cec0560ca8..306184ae7b2 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/namespace.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/namespace.go
@@ -36,10 +36,10 @@ type NamespaceInterface interface {
 	Update(*api.Namespace) (*api.Namespace, error)
 	UpdateStatus(*api.Namespace) (*api.Namespace, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*api.Namespace, error)
-	List(opts api.ListOptions) (*api.NamespaceList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*api.NamespaceList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.Namespace, err error)
 	NamespaceExpansion
 }
@@ -105,7 +105,7 @@ func (c *namespaces) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *namespaces) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *namespaces) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Resource("namespaces").
 		VersionedParams(&listOptions, api.ParameterCodec).
@@ -127,7 +127,7 @@ func (c *namespaces) Get(name string, options v1.GetOptions) (result *api.Namesp
 }
 
 // List takes label and field selectors, and returns the list of Namespaces that match those selectors.
-func (c *namespaces) List(opts api.ListOptions) (result *api.NamespaceList, err error) {
+func (c *namespaces) List(opts v1.ListOptions) (result *api.NamespaceList, err error) {
 	result = &api.NamespaceList{}
 	err = c.client.Get().
 		Resource("namespaces").
@@ -138,7 +138,7 @@ func (c *namespaces) List(opts api.ListOptions) (result *api.NamespaceList, err
 }
 
 // Watch returns a watch.Interface that watches the requested namespaces.
-func (c *namespaces) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *namespaces) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Resource("namespaces").
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 4ee65b2ca1f..a6d384704c9 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/node.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/node.go
@@ -36,10 +36,10 @@ type NodeInterface interface {
 	Update(*api.Node) (*api.Node, error)
 	UpdateStatus(*api.Node) (*api.Node, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*api.Node, error)
-	List(opts api.ListOptions) (*api.NodeList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*api.NodeList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.Node, err error)
 	NodeExpansion
 }
@@ -105,7 +105,7 @@ func (c *nodes) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *nodes) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *nodes) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Resource("nodes").
 		VersionedParams(&listOptions, api.ParameterCodec).
@@ -127,7 +127,7 @@ func (c *nodes) Get(name string, options v1.GetOptions) (result *api.Node, err e
 }
 
 // List takes label and field selectors, and returns the list of Nodes that match those selectors.
-func (c *nodes) List(opts api.ListOptions) (result *api.NodeList, err error) {
+func (c *nodes) List(opts v1.ListOptions) (result *api.NodeList, err error) {
 	result = &api.NodeList{}
 	err = c.client.Get().
 		Resource("nodes").
@@ -138,7 +138,7 @@ func (c *nodes) List(opts api.ListOptions) (result *api.NodeList, err error) {
 }
 
 // Watch returns a watch.Interface that watches the requested nodes.
-func (c *nodes) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *nodes) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Resource("nodes").
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 88c73082759..2db5316efd4 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolume.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolume.go
@@ -36,10 +36,10 @@ type PersistentVolumeInterface interface {
 	Update(*api.PersistentVolume) (*api.PersistentVolume, error)
 	UpdateStatus(*api.PersistentVolume) (*api.PersistentVolume, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*api.PersistentVolume, error)
-	List(opts api.ListOptions) (*api.PersistentVolumeList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*api.PersistentVolumeList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.PersistentVolume, err error)
 	PersistentVolumeExpansion
 }
@@ -105,7 +105,7 @@ func (c *persistentVolumes) Delete(name string, options *api.DeleteOptions) erro
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *persistentVolumes) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *persistentVolumes) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Resource("persistentvolumes").
 		VersionedParams(&listOptions, api.ParameterCodec).
@@ -127,7 +127,7 @@ func (c *persistentVolumes) Get(name string, options v1.GetOptions) (result *api
 }
 
 // List takes label and field selectors, and returns the list of PersistentVolumes that match those selectors.
-func (c *persistentVolumes) List(opts api.ListOptions) (result *api.PersistentVolumeList, err error) {
+func (c *persistentVolumes) List(opts v1.ListOptions) (result *api.PersistentVolumeList, err error) {
 	result = &api.PersistentVolumeList{}
 	err = c.client.Get().
 		Resource("persistentvolumes").
@@ -138,7 +138,7 @@ func (c *persistentVolumes) List(opts api.ListOptions) (result *api.PersistentVo
 }
 
 // Watch returns a watch.Interface that watches the requested persistentVolumes.
-func (c *persistentVolumes) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *persistentVolumes) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Resource("persistentvolumes").
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 85ad719e65b..3fe2463fd67 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolumeclaim.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolumeclaim.go
@@ -36,10 +36,10 @@ type PersistentVolumeClaimInterface interface {
 	Update(*api.PersistentVolumeClaim) (*api.PersistentVolumeClaim, error)
 	UpdateStatus(*api.PersistentVolumeClaim) (*api.PersistentVolumeClaim, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*api.PersistentVolumeClaim, error)
-	List(opts api.ListOptions) (*api.PersistentVolumeClaimList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*api.PersistentVolumeClaimList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.PersistentVolumeClaim, err error)
 	PersistentVolumeClaimExpansion
 }
@@ -111,7 +111,7 @@ func (c *persistentVolumeClaims) Delete(name string, options *api.DeleteOptions)
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *persistentVolumeClaims) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *persistentVolumeClaims) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("persistentvolumeclaims").
@@ -135,7 +135,7 @@ func (c *persistentVolumeClaims) Get(name string, options v1.GetOptions) (result
 }
 
 // List takes label and field selectors, and returns the list of PersistentVolumeClaims that match those selectors.
-func (c *persistentVolumeClaims) List(opts api.ListOptions) (result *api.PersistentVolumeClaimList, err error) {
+func (c *persistentVolumeClaims) List(opts v1.ListOptions) (result *api.PersistentVolumeClaimList, err error) {
 	result = &api.PersistentVolumeClaimList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -147,7 +147,7 @@ func (c *persistentVolumeClaims) List(opts api.ListOptions) (result *api.Persist
 }
 
 // Watch returns a watch.Interface that watches the requested persistentVolumeClaims.
-func (c *persistentVolumeClaims) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *persistentVolumeClaims) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 5e0dce9d385..ad86a384d8a 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/pod.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/pod.go
@@ -36,10 +36,10 @@ type PodInterface interface {
 	Update(*api.Pod) (*api.Pod, error)
 	UpdateStatus(*api.Pod) (*api.Pod, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*api.Pod, error)
-	List(opts api.ListOptions) (*api.PodList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*api.PodList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.Pod, err error)
 	PodExpansion
 }
@@ -111,7 +111,7 @@ func (c *pods) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *pods) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *pods) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("pods").
@@ -135,7 +135,7 @@ func (c *pods) Get(name string, options v1.GetOptions) (result *api.Pod, err err
 }
 
 // List takes label and field selectors, and returns the list of Pods that match those selectors.
-func (c *pods) List(opts api.ListOptions) (result *api.PodList, err error) {
+func (c *pods) List(opts v1.ListOptions) (result *api.PodList, err error) {
 	result = &api.PodList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -147,7 +147,7 @@ func (c *pods) List(opts api.ListOptions) (result *api.PodList, err error) {
 }
 
 // Watch returns a watch.Interface that watches the requested pods.
-func (c *pods) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *pods) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 066f157d099..830b53a90da 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/podtemplate.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/podtemplate.go
@@ -35,10 +35,10 @@ type PodTemplateInterface interface {
 	Create(*api.PodTemplate) (*api.PodTemplate, error)
 	Update(*api.PodTemplate) (*api.PodTemplate, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*api.PodTemplate, error)
-	List(opts api.ListOptions) (*api.PodTemplateList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*api.PodTemplateList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.PodTemplate, err error)
 	PodTemplateExpansion
 }
@@ -94,7 +94,7 @@ func (c *podTemplates) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *podTemplates) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *podTemplates) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("podtemplates").
@@ -118,7 +118,7 @@ func (c *podTemplates) Get(name string, options v1.GetOptions) (result *api.PodT
 }
 
 // List takes label and field selectors, and returns the list of PodTemplates that match those selectors.
-func (c *podTemplates) List(opts api.ListOptions) (result *api.PodTemplateList, err error) {
+func (c *podTemplates) List(opts v1.ListOptions) (result *api.PodTemplateList, err error) {
 	result = &api.PodTemplateList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -130,7 +130,7 @@ func (c *podTemplates) List(opts api.ListOptions) (result *api.PodTemplateList,
 }
 
 // Watch returns a watch.Interface that watches the requested podTemplates.
-func (c *podTemplates) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *podTemplates) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 5c5f7e4524e..ae56591f19c 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/replicationcontroller.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/replicationcontroller.go
@@ -36,10 +36,10 @@ type ReplicationControllerInterface interface {
 	Update(*api.ReplicationController) (*api.ReplicationController, error)
 	UpdateStatus(*api.ReplicationController) (*api.ReplicationController, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*api.ReplicationController, error)
-	List(opts api.ListOptions) (*api.ReplicationControllerList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*api.ReplicationControllerList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.ReplicationController, err error)
 	ReplicationControllerExpansion
 }
@@ -111,7 +111,7 @@ func (c *replicationControllers) Delete(name string, options *api.DeleteOptions)
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *replicationControllers) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *replicationControllers) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("replicationcontrollers").
@@ -135,7 +135,7 @@ func (c *replicationControllers) Get(name string, options v1.GetOptions) (result
 }
 
 // List takes label and field selectors, and returns the list of ReplicationControllers that match those selectors.
-func (c *replicationControllers) List(opts api.ListOptions) (result *api.ReplicationControllerList, err error) {
+func (c *replicationControllers) List(opts v1.ListOptions) (result *api.ReplicationControllerList, err error) {
 	result = &api.ReplicationControllerList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -147,7 +147,7 @@ func (c *replicationControllers) List(opts api.ListOptions) (result *api.Replica
 }
 
 // Watch returns a watch.Interface that watches the requested replicationControllers.
-func (c *replicationControllers) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *replicationControllers) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 24cc8bae505..bb7930b0627 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/resourcequota.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/resourcequota.go
@@ -36,10 +36,10 @@ type ResourceQuotaInterface interface {
 	Update(*api.ResourceQuota) (*api.ResourceQuota, error)
 	UpdateStatus(*api.ResourceQuota) (*api.ResourceQuota, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*api.ResourceQuota, error)
-	List(opts api.ListOptions) (*api.ResourceQuotaList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*api.ResourceQuotaList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.ResourceQuota, err error)
 	ResourceQuotaExpansion
 }
@@ -111,7 +111,7 @@ func (c *resourceQuotas) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *resourceQuotas) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *resourceQuotas) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("resourcequotas").
@@ -135,7 +135,7 @@ func (c *resourceQuotas) Get(name string, options v1.GetOptions) (result *api.Re
 }
 
 // List takes label and field selectors, and returns the list of ResourceQuotas that match those selectors.
-func (c *resourceQuotas) List(opts api.ListOptions) (result *api.ResourceQuotaList, err error) {
+func (c *resourceQuotas) List(opts v1.ListOptions) (result *api.ResourceQuotaList, err error) {
 	result = &api.ResourceQuotaList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -147,7 +147,7 @@ func (c *resourceQuotas) List(opts api.ListOptions) (result *api.ResourceQuotaLi
 }
 
 // Watch returns a watch.Interface that watches the requested resourceQuotas.
-func (c *resourceQuotas) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *resourceQuotas) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 29902d461fc..8239d7988ea 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/secret.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/secret.go
@@ -35,10 +35,10 @@ type SecretInterface interface {
 	Create(*api.Secret) (*api.Secret, error)
 	Update(*api.Secret) (*api.Secret, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*api.Secret, error)
-	List(opts api.ListOptions) (*api.SecretList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*api.SecretList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.Secret, err error)
 	SecretExpansion
 }
@@ -94,7 +94,7 @@ func (c *secrets) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *secrets) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *secrets) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("secrets").
@@ -118,7 +118,7 @@ func (c *secrets) Get(name string, options v1.GetOptions) (result *api.Secret, e
 }
 
 // List takes label and field selectors, and returns the list of Secrets that match those selectors.
-func (c *secrets) List(opts api.ListOptions) (result *api.SecretList, err error) {
+func (c *secrets) List(opts v1.ListOptions) (result *api.SecretList, err error) {
 	result = &api.SecretList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -130,7 +130,7 @@ func (c *secrets) List(opts api.ListOptions) (result *api.SecretList, err error)
 }
 
 // Watch returns a watch.Interface that watches the requested secrets.
-func (c *secrets) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *secrets) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 c83fbd95ebc..9986c9ea96e 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/service.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/service.go
@@ -36,10 +36,10 @@ type ServiceInterface interface {
 	Update(*api.Service) (*api.Service, error)
 	UpdateStatus(*api.Service) (*api.Service, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*api.Service, error)
-	List(opts api.ListOptions) (*api.ServiceList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*api.ServiceList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.Service, err error)
 	ServiceExpansion
 }
@@ -111,7 +111,7 @@ func (c *services) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *services) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *services) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("services").
@@ -135,7 +135,7 @@ func (c *services) Get(name string, options v1.GetOptions) (result *api.Service,
 }
 
 // List takes label and field selectors, and returns the list of Services that match those selectors.
-func (c *services) List(opts api.ListOptions) (result *api.ServiceList, err error) {
+func (c *services) List(opts v1.ListOptions) (result *api.ServiceList, err error) {
 	result = &api.ServiceList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -147,7 +147,7 @@ func (c *services) List(opts api.ListOptions) (result *api.ServiceList, err erro
 }
 
 // Watch returns a watch.Interface that watches the requested services.
-func (c *services) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *services) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 9690913b716..5721010f25d 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/serviceaccount.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/serviceaccount.go
@@ -35,10 +35,10 @@ type ServiceAccountInterface interface {
 	Create(*api.ServiceAccount) (*api.ServiceAccount, error)
 	Update(*api.ServiceAccount) (*api.ServiceAccount, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*api.ServiceAccount, error)
-	List(opts api.ListOptions) (*api.ServiceAccountList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*api.ServiceAccountList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.ServiceAccount, err error)
 	ServiceAccountExpansion
 }
@@ -94,7 +94,7 @@ func (c *serviceAccounts) Delete(name string, options *api.DeleteOptions) error
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *serviceAccounts) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *serviceAccounts) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("serviceaccounts").
@@ -118,7 +118,7 @@ func (c *serviceAccounts) Get(name string, options v1.GetOptions) (result *api.S
 }
 
 // List takes label and field selectors, and returns the list of ServiceAccounts that match those selectors.
-func (c *serviceAccounts) List(opts api.ListOptions) (result *api.ServiceAccountList, err error) {
+func (c *serviceAccounts) List(opts v1.ListOptions) (result *api.ServiceAccountList, err error) {
 	result = &api.ServiceAccountList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -130,7 +130,7 @@ func (c *serviceAccounts) List(opts api.ListOptions) (result *api.ServiceAccount
 }
 
 // Watch returns a watch.Interface that watches the requested serviceAccounts.
-func (c *serviceAccounts) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *serviceAccounts) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 c6ab08f065f..8c8a24da002 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/daemonset.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/daemonset.go
@@ -37,10 +37,10 @@ type DaemonSetInterface interface {
 	Update(*extensions.DaemonSet) (*extensions.DaemonSet, error)
 	UpdateStatus(*extensions.DaemonSet) (*extensions.DaemonSet, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*extensions.DaemonSet, error)
-	List(opts api.ListOptions) (*extensions.DaemonSetList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*extensions.DaemonSetList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *extensions.DaemonSet, err error)
 	DaemonSetExpansion
 }
@@ -112,7 +112,7 @@ func (c *daemonSets) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *daemonSets) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *daemonSets) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("daemonsets").
@@ -136,7 +136,7 @@ func (c *daemonSets) Get(name string, options v1.GetOptions) (result *extensions
 }
 
 // List takes label and field selectors, and returns the list of DaemonSets that match those selectors.
-func (c *daemonSets) List(opts api.ListOptions) (result *extensions.DaemonSetList, err error) {
+func (c *daemonSets) List(opts v1.ListOptions) (result *extensions.DaemonSetList, err error) {
 	result = &extensions.DaemonSetList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -148,7 +148,7 @@ func (c *daemonSets) List(opts api.ListOptions) (result *extensions.DaemonSetLis
 }
 
 // Watch returns a watch.Interface that watches the requested daemonSets.
-func (c *daemonSets) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *daemonSets) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 d48ea580518..c784a779b93 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/deployment.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/deployment.go
@@ -37,10 +37,10 @@ type DeploymentInterface interface {
 	Update(*extensions.Deployment) (*extensions.Deployment, error)
 	UpdateStatus(*extensions.Deployment) (*extensions.Deployment, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*extensions.Deployment, error)
-	List(opts api.ListOptions) (*extensions.DeploymentList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*extensions.DeploymentList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *extensions.Deployment, err error)
 	DeploymentExpansion
 }
@@ -112,7 +112,7 @@ func (c *deployments) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *deployments) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *deployments) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("deployments").
@@ -136,7 +136,7 @@ func (c *deployments) Get(name string, options v1.GetOptions) (result *extension
 }
 
 // List takes label and field selectors, and returns the list of Deployments that match those selectors.
-func (c *deployments) List(opts api.ListOptions) (result *extensions.DeploymentList, err error) {
+func (c *deployments) List(opts v1.ListOptions) (result *extensions.DeploymentList, err error) {
 	result = &extensions.DeploymentList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -148,7 +148,7 @@ func (c *deployments) List(opts api.ListOptions) (result *extensions.DeploymentL
 }
 
 // Watch returns a watch.Interface that watches the requested deployments.
-func (c *deployments) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *deployments) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_daemonset.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_daemonset.go
index f2e9d13e072..7fb4a928217 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_daemonset.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_daemonset.go
@@ -72,7 +72,7 @@ func (c *FakeDaemonSets) Delete(name string, options *api.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeDaemonSets) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeDaemonSets) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(daemonsetsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &extensions.DaemonSetList{})
@@ -89,7 +89,7 @@ func (c *FakeDaemonSets) Get(name string, options v1.GetOptions) (result *extens
 	return obj.(*extensions.DaemonSet), err
 }
 
-func (c *FakeDaemonSets) List(opts api.ListOptions) (result *extensions.DaemonSetList, err error) {
+func (c *FakeDaemonSets) List(opts v1.ListOptions) (result *extensions.DaemonSetList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(daemonsetsResource, c.ns, opts), &extensions.DaemonSetList{})
 
@@ -111,7 +111,7 @@ func (c *FakeDaemonSets) List(opts api.ListOptions) (result *extensions.DaemonSe
 }
 
 // Watch returns a watch.Interface that watches the requested daemonSets.
-func (c *FakeDaemonSets) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeDaemonSets) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(daemonsetsResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_deployment.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_deployment.go
index 6c3d5654241..ef5b6144b82 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_deployment.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_deployment.go
@@ -72,7 +72,7 @@ func (c *FakeDeployments) Delete(name string, options *api.DeleteOptions) error
 	return err
 }
 
-func (c *FakeDeployments) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeDeployments) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(deploymentsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &extensions.DeploymentList{})
@@ -89,7 +89,7 @@ func (c *FakeDeployments) Get(name string, options v1.GetOptions) (result *exten
 	return obj.(*extensions.Deployment), err
 }
 
-func (c *FakeDeployments) List(opts api.ListOptions) (result *extensions.DeploymentList, err error) {
+func (c *FakeDeployments) List(opts v1.ListOptions) (result *extensions.DeploymentList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(deploymentsResource, c.ns, opts), &extensions.DeploymentList{})
 
@@ -111,7 +111,7 @@ func (c *FakeDeployments) List(opts api.ListOptions) (result *extensions.Deploym
 }
 
 // Watch returns a watch.Interface that watches the requested deployments.
-func (c *FakeDeployments) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeDeployments) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(deploymentsResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_ingress.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_ingress.go
index 060fd427a56..77beba836d1 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_ingress.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_ingress.go
@@ -72,7 +72,7 @@ func (c *FakeIngresses) Delete(name string, options *api.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeIngresses) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeIngresses) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(ingressesResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &extensions.IngressList{})
@@ -89,7 +89,7 @@ func (c *FakeIngresses) Get(name string, options v1.GetOptions) (result *extensi
 	return obj.(*extensions.Ingress), err
 }
 
-func (c *FakeIngresses) List(opts api.ListOptions) (result *extensions.IngressList, err error) {
+func (c *FakeIngresses) List(opts v1.ListOptions) (result *extensions.IngressList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(ingressesResource, c.ns, opts), &extensions.IngressList{})
 
@@ -111,7 +111,7 @@ func (c *FakeIngresses) List(opts api.ListOptions) (result *extensions.IngressLi
 }
 
 // Watch returns a watch.Interface that watches the requested ingresses.
-func (c *FakeIngresses) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeIngresses) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(ingressesResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_networkpolicy.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_networkpolicy.go
index 7f38c2ac696..9c0e5711ac2 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_networkpolicy.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_networkpolicy.go
@@ -62,7 +62,7 @@ func (c *FakeNetworkPolicies) Delete(name string, options *api.DeleteOptions) er
 	return err
 }
 
-func (c *FakeNetworkPolicies) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeNetworkPolicies) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(networkpoliciesResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &extensions.NetworkPolicyList{})
@@ -79,7 +79,7 @@ func (c *FakeNetworkPolicies) Get(name string, options v1.GetOptions) (result *e
 	return obj.(*extensions.NetworkPolicy), err
 }
 
-func (c *FakeNetworkPolicies) List(opts api.ListOptions) (result *extensions.NetworkPolicyList, err error) {
+func (c *FakeNetworkPolicies) List(opts v1.ListOptions) (result *extensions.NetworkPolicyList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(networkpoliciesResource, c.ns, opts), &extensions.NetworkPolicyList{})
 
@@ -101,7 +101,7 @@ func (c *FakeNetworkPolicies) List(opts api.ListOptions) (result *extensions.Net
 }
 
 // Watch returns a watch.Interface that watches the requested networkPolicies.
-func (c *FakeNetworkPolicies) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeNetworkPolicies) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(networkpoliciesResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_podsecuritypolicy.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_podsecuritypolicy.go
index b17e8da829c..d668d739722 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_podsecuritypolicy.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_podsecuritypolicy.go
@@ -58,7 +58,7 @@ func (c *FakePodSecurityPolicies) Delete(name string, options *api.DeleteOptions
 	return err
 }
 
-func (c *FakePodSecurityPolicies) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakePodSecurityPolicies) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewRootDeleteCollectionAction(podsecuritypoliciesResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &extensions.PodSecurityPolicyList{})
@@ -74,7 +74,7 @@ func (c *FakePodSecurityPolicies) Get(name string, options v1.GetOptions) (resul
 	return obj.(*extensions.PodSecurityPolicy), err
 }
 
-func (c *FakePodSecurityPolicies) List(opts api.ListOptions) (result *extensions.PodSecurityPolicyList, err error) {
+func (c *FakePodSecurityPolicies) List(opts v1.ListOptions) (result *extensions.PodSecurityPolicyList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewRootListAction(podsecuritypoliciesResource, opts), &extensions.PodSecurityPolicyList{})
 	if obj == nil {
@@ -95,7 +95,7 @@ func (c *FakePodSecurityPolicies) List(opts api.ListOptions) (result *extensions
 }
 
 // Watch returns a watch.Interface that watches the requested podSecurityPolicies.
-func (c *FakePodSecurityPolicies) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakePodSecurityPolicies) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewRootWatchAction(podsecuritypoliciesResource, opts))
 }
diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_replicaset.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_replicaset.go
index 36aa9216ed5..672c5d66526 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_replicaset.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_replicaset.go
@@ -72,7 +72,7 @@ func (c *FakeReplicaSets) Delete(name string, options *api.DeleteOptions) error
 	return err
 }
 
-func (c *FakeReplicaSets) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeReplicaSets) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(replicasetsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &extensions.ReplicaSetList{})
@@ -89,7 +89,7 @@ func (c *FakeReplicaSets) Get(name string, options v1.GetOptions) (result *exten
 	return obj.(*extensions.ReplicaSet), err
 }
 
-func (c *FakeReplicaSets) List(opts api.ListOptions) (result *extensions.ReplicaSetList, err error) {
+func (c *FakeReplicaSets) List(opts v1.ListOptions) (result *extensions.ReplicaSetList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(replicasetsResource, c.ns, opts), &extensions.ReplicaSetList{})
 
@@ -111,7 +111,7 @@ func (c *FakeReplicaSets) List(opts api.ListOptions) (result *extensions.Replica
 }
 
 // Watch returns a watch.Interface that watches the requested replicaSets.
-func (c *FakeReplicaSets) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeReplicaSets) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(replicasetsResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_thirdpartyresource.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_thirdpartyresource.go
index 6e5fdc49215..7b2922af56c 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_thirdpartyresource.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_thirdpartyresource.go
@@ -58,7 +58,7 @@ func (c *FakeThirdPartyResources) Delete(name string, options *api.DeleteOptions
 	return err
 }
 
-func (c *FakeThirdPartyResources) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeThirdPartyResources) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewRootDeleteCollectionAction(thirdpartyresourcesResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &extensions.ThirdPartyResourceList{})
@@ -74,7 +74,7 @@ func (c *FakeThirdPartyResources) Get(name string, options v1.GetOptions) (resul
 	return obj.(*extensions.ThirdPartyResource), err
 }
 
-func (c *FakeThirdPartyResources) List(opts api.ListOptions) (result *extensions.ThirdPartyResourceList, err error) {
+func (c *FakeThirdPartyResources) List(opts v1.ListOptions) (result *extensions.ThirdPartyResourceList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewRootListAction(thirdpartyresourcesResource, opts), &extensions.ThirdPartyResourceList{})
 	if obj == nil {
@@ -95,7 +95,7 @@ func (c *FakeThirdPartyResources) List(opts api.ListOptions) (result *extensions
 }
 
 // Watch returns a watch.Interface that watches the requested thirdPartyResources.
-func (c *FakeThirdPartyResources) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeThirdPartyResources) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewRootWatchAction(thirdpartyresourcesResource, opts))
 }
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 b026e2e33a1..6bd4e5025f3 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/ingress.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/ingress.go
@@ -37,10 +37,10 @@ type IngressInterface interface {
 	Update(*extensions.Ingress) (*extensions.Ingress, error)
 	UpdateStatus(*extensions.Ingress) (*extensions.Ingress, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*extensions.Ingress, error)
-	List(opts api.ListOptions) (*extensions.IngressList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*extensions.IngressList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *extensions.Ingress, err error)
 	IngressExpansion
 }
@@ -112,7 +112,7 @@ func (c *ingresses) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *ingresses) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *ingresses) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("ingresses").
@@ -136,7 +136,7 @@ func (c *ingresses) Get(name string, options v1.GetOptions) (result *extensions.
 }
 
 // List takes label and field selectors, and returns the list of Ingresses that match those selectors.
-func (c *ingresses) List(opts api.ListOptions) (result *extensions.IngressList, err error) {
+func (c *ingresses) List(opts v1.ListOptions) (result *extensions.IngressList, err error) {
 	result = &extensions.IngressList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -148,7 +148,7 @@ func (c *ingresses) List(opts api.ListOptions) (result *extensions.IngressList,
 }
 
 // Watch returns a watch.Interface that watches the requested ingresses.
-func (c *ingresses) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *ingresses) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 ef939abbbfe..285ec19aab5 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/networkpolicy.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/networkpolicy.go
@@ -36,10 +36,10 @@ type NetworkPolicyInterface interface {
 	Create(*extensions.NetworkPolicy) (*extensions.NetworkPolicy, error)
 	Update(*extensions.NetworkPolicy) (*extensions.NetworkPolicy, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*extensions.NetworkPolicy, error)
-	List(opts api.ListOptions) (*extensions.NetworkPolicyList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*extensions.NetworkPolicyList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *extensions.NetworkPolicy, err error)
 	NetworkPolicyExpansion
 }
@@ -95,7 +95,7 @@ func (c *networkPolicies) Delete(name string, options *api.DeleteOptions) error
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *networkPolicies) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *networkPolicies) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("networkpolicies").
@@ -119,7 +119,7 @@ func (c *networkPolicies) Get(name string, options v1.GetOptions) (result *exten
 }
 
 // List takes label and field selectors, and returns the list of NetworkPolicies that match those selectors.
-func (c *networkPolicies) List(opts api.ListOptions) (result *extensions.NetworkPolicyList, err error) {
+func (c *networkPolicies) List(opts v1.ListOptions) (result *extensions.NetworkPolicyList, err error) {
 	result = &extensions.NetworkPolicyList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -131,7 +131,7 @@ func (c *networkPolicies) List(opts api.ListOptions) (result *extensions.Network
 }
 
 // Watch returns a watch.Interface that watches the requested networkPolicies.
-func (c *networkPolicies) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *networkPolicies) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 8670364377d..b2f94f79914 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/podsecuritypolicy.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/podsecuritypolicy.go
@@ -36,10 +36,10 @@ type PodSecurityPolicyInterface interface {
 	Create(*extensions.PodSecurityPolicy) (*extensions.PodSecurityPolicy, error)
 	Update(*extensions.PodSecurityPolicy) (*extensions.PodSecurityPolicy, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*extensions.PodSecurityPolicy, error)
-	List(opts api.ListOptions) (*extensions.PodSecurityPolicyList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*extensions.PodSecurityPolicyList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *extensions.PodSecurityPolicy, err error)
 	PodSecurityPolicyExpansion
 }
@@ -90,7 +90,7 @@ func (c *podSecurityPolicies) Delete(name string, options *api.DeleteOptions) er
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *podSecurityPolicies) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *podSecurityPolicies) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Resource("podsecuritypolicies").
 		VersionedParams(&listOptions, api.ParameterCodec).
@@ -112,7 +112,7 @@ func (c *podSecurityPolicies) Get(name string, options v1.GetOptions) (result *e
 }
 
 // List takes label and field selectors, and returns the list of PodSecurityPolicies that match those selectors.
-func (c *podSecurityPolicies) List(opts api.ListOptions) (result *extensions.PodSecurityPolicyList, err error) {
+func (c *podSecurityPolicies) List(opts v1.ListOptions) (result *extensions.PodSecurityPolicyList, err error) {
 	result = &extensions.PodSecurityPolicyList{}
 	err = c.client.Get().
 		Resource("podsecuritypolicies").
@@ -123,7 +123,7 @@ func (c *podSecurityPolicies) List(opts api.ListOptions) (result *extensions.Pod
 }
 
 // Watch returns a watch.Interface that watches the requested podSecurityPolicies.
-func (c *podSecurityPolicies) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *podSecurityPolicies) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Resource("podsecuritypolicies").
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 5de36beb0f5..b931315c95c 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/replicaset.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/replicaset.go
@@ -37,10 +37,10 @@ type ReplicaSetInterface interface {
 	Update(*extensions.ReplicaSet) (*extensions.ReplicaSet, error)
 	UpdateStatus(*extensions.ReplicaSet) (*extensions.ReplicaSet, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*extensions.ReplicaSet, error)
-	List(opts api.ListOptions) (*extensions.ReplicaSetList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*extensions.ReplicaSetList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *extensions.ReplicaSet, err error)
 	ReplicaSetExpansion
 }
@@ -112,7 +112,7 @@ func (c *replicaSets) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *replicaSets) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *replicaSets) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("replicasets").
@@ -136,7 +136,7 @@ func (c *replicaSets) Get(name string, options v1.GetOptions) (result *extension
 }
 
 // List takes label and field selectors, and returns the list of ReplicaSets that match those selectors.
-func (c *replicaSets) List(opts api.ListOptions) (result *extensions.ReplicaSetList, err error) {
+func (c *replicaSets) List(opts v1.ListOptions) (result *extensions.ReplicaSetList, err error) {
 	result = &extensions.ReplicaSetList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -148,7 +148,7 @@ func (c *replicaSets) List(opts api.ListOptions) (result *extensions.ReplicaSetL
 }
 
 // Watch returns a watch.Interface that watches the requested replicaSets.
-func (c *replicaSets) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *replicaSets) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 66777e7be07..374c4af3d30 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/thirdpartyresource.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/thirdpartyresource.go
@@ -36,10 +36,10 @@ type ThirdPartyResourceInterface interface {
 	Create(*extensions.ThirdPartyResource) (*extensions.ThirdPartyResource, error)
 	Update(*extensions.ThirdPartyResource) (*extensions.ThirdPartyResource, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*extensions.ThirdPartyResource, error)
-	List(opts api.ListOptions) (*extensions.ThirdPartyResourceList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*extensions.ThirdPartyResourceList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *extensions.ThirdPartyResource, err error)
 	ThirdPartyResourceExpansion
 }
@@ -90,7 +90,7 @@ func (c *thirdPartyResources) Delete(name string, options *api.DeleteOptions) er
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *thirdPartyResources) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *thirdPartyResources) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Resource("thirdpartyresources").
 		VersionedParams(&listOptions, api.ParameterCodec).
@@ -112,7 +112,7 @@ func (c *thirdPartyResources) Get(name string, options v1.GetOptions) (result *e
 }
 
 // List takes label and field selectors, and returns the list of ThirdPartyResources that match those selectors.
-func (c *thirdPartyResources) List(opts api.ListOptions) (result *extensions.ThirdPartyResourceList, err error) {
+func (c *thirdPartyResources) List(opts v1.ListOptions) (result *extensions.ThirdPartyResourceList, err error) {
 	result = &extensions.ThirdPartyResourceList{}
 	err = c.client.Get().
 		Resource("thirdpartyresources").
@@ -123,7 +123,7 @@ func (c *thirdPartyResources) List(opts api.ListOptions) (result *extensions.Thi
 }
 
 // Watch returns a watch.Interface that watches the requested thirdPartyResources.
-func (c *thirdPartyResources) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *thirdPartyResources) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Resource("thirdpartyresources").
diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_poddisruptionbudget.go b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_poddisruptionbudget.go
index d2ab0866f93..64144b0c943 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_poddisruptionbudget.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_poddisruptionbudget.go
@@ -72,7 +72,7 @@ func (c *FakePodDisruptionBudgets) Delete(name string, options *api.DeleteOption
 	return err
 }
 
-func (c *FakePodDisruptionBudgets) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakePodDisruptionBudgets) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(poddisruptionbudgetsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &policy.PodDisruptionBudgetList{})
@@ -89,7 +89,7 @@ func (c *FakePodDisruptionBudgets) Get(name string, options v1.GetOptions) (resu
 	return obj.(*policy.PodDisruptionBudget), err
 }
 
-func (c *FakePodDisruptionBudgets) List(opts api.ListOptions) (result *policy.PodDisruptionBudgetList, err error) {
+func (c *FakePodDisruptionBudgets) List(opts v1.ListOptions) (result *policy.PodDisruptionBudgetList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(poddisruptionbudgetsResource, c.ns, opts), &policy.PodDisruptionBudgetList{})
 
@@ -111,7 +111,7 @@ func (c *FakePodDisruptionBudgets) List(opts api.ListOptions) (result *policy.Po
 }
 
 // Watch returns a watch.Interface that watches the requested podDisruptionBudgets.
-func (c *FakePodDisruptionBudgets) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakePodDisruptionBudgets) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(poddisruptionbudgetsResource, c.ns, opts))
 
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 967b64c97b8..20c639167e7 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/poddisruptionbudget.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/poddisruptionbudget.go
@@ -37,10 +37,10 @@ type PodDisruptionBudgetInterface interface {
 	Update(*policy.PodDisruptionBudget) (*policy.PodDisruptionBudget, error)
 	UpdateStatus(*policy.PodDisruptionBudget) (*policy.PodDisruptionBudget, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*policy.PodDisruptionBudget, error)
-	List(opts api.ListOptions) (*policy.PodDisruptionBudgetList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*policy.PodDisruptionBudgetList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *policy.PodDisruptionBudget, err error)
 	PodDisruptionBudgetExpansion
 }
@@ -112,7 +112,7 @@ func (c *podDisruptionBudgets) Delete(name string, options *api.DeleteOptions) e
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *podDisruptionBudgets) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *podDisruptionBudgets) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("poddisruptionbudgets").
@@ -136,7 +136,7 @@ func (c *podDisruptionBudgets) Get(name string, options v1.GetOptions) (result *
 }
 
 // List takes label and field selectors, and returns the list of PodDisruptionBudgets that match those selectors.
-func (c *podDisruptionBudgets) List(opts api.ListOptions) (result *policy.PodDisruptionBudgetList, err error) {
+func (c *podDisruptionBudgets) List(opts v1.ListOptions) (result *policy.PodDisruptionBudgetList, err error) {
 	result = &policy.PodDisruptionBudgetList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -148,7 +148,7 @@ func (c *podDisruptionBudgets) List(opts api.ListOptions) (result *policy.PodDis
 }
 
 // Watch returns a watch.Interface that watches the requested podDisruptionBudgets.
-func (c *podDisruptionBudgets) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *podDisruptionBudgets) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 f573151d1df..cee2c231ab4 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrole.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrole.go
@@ -36,10 +36,10 @@ type ClusterRoleInterface interface {
 	Create(*rbac.ClusterRole) (*rbac.ClusterRole, error)
 	Update(*rbac.ClusterRole) (*rbac.ClusterRole, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*rbac.ClusterRole, error)
-	List(opts api.ListOptions) (*rbac.ClusterRoleList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*rbac.ClusterRoleList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *rbac.ClusterRole, err error)
 	ClusterRoleExpansion
 }
@@ -90,7 +90,7 @@ func (c *clusterRoles) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *clusterRoles) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *clusterRoles) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Resource("clusterroles").
 		VersionedParams(&listOptions, api.ParameterCodec).
@@ -112,7 +112,7 @@ func (c *clusterRoles) Get(name string, options v1.GetOptions) (result *rbac.Clu
 }
 
 // List takes label and field selectors, and returns the list of ClusterRoles that match those selectors.
-func (c *clusterRoles) List(opts api.ListOptions) (result *rbac.ClusterRoleList, err error) {
+func (c *clusterRoles) List(opts v1.ListOptions) (result *rbac.ClusterRoleList, err error) {
 	result = &rbac.ClusterRoleList{}
 	err = c.client.Get().
 		Resource("clusterroles").
@@ -123,7 +123,7 @@ func (c *clusterRoles) List(opts api.ListOptions) (result *rbac.ClusterRoleList,
 }
 
 // Watch returns a watch.Interface that watches the requested clusterRoles.
-func (c *clusterRoles) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *clusterRoles) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Resource("clusterroles").
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 01d425d32de..a041a9f5c4f 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrolebinding.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrolebinding.go
@@ -36,10 +36,10 @@ type ClusterRoleBindingInterface interface {
 	Create(*rbac.ClusterRoleBinding) (*rbac.ClusterRoleBinding, error)
 	Update(*rbac.ClusterRoleBinding) (*rbac.ClusterRoleBinding, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*rbac.ClusterRoleBinding, error)
-	List(opts api.ListOptions) (*rbac.ClusterRoleBindingList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*rbac.ClusterRoleBindingList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *rbac.ClusterRoleBinding, err error)
 	ClusterRoleBindingExpansion
 }
@@ -90,7 +90,7 @@ func (c *clusterRoleBindings) Delete(name string, options *api.DeleteOptions) er
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *clusterRoleBindings) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *clusterRoleBindings) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Resource("clusterrolebindings").
 		VersionedParams(&listOptions, api.ParameterCodec).
@@ -112,7 +112,7 @@ func (c *clusterRoleBindings) Get(name string, options v1.GetOptions) (result *r
 }
 
 // List takes label and field selectors, and returns the list of ClusterRoleBindings that match those selectors.
-func (c *clusterRoleBindings) List(opts api.ListOptions) (result *rbac.ClusterRoleBindingList, err error) {
+func (c *clusterRoleBindings) List(opts v1.ListOptions) (result *rbac.ClusterRoleBindingList, err error) {
 	result = &rbac.ClusterRoleBindingList{}
 	err = c.client.Get().
 		Resource("clusterrolebindings").
@@ -123,7 +123,7 @@ func (c *clusterRoleBindings) List(opts api.ListOptions) (result *rbac.ClusterRo
 }
 
 // Watch returns a watch.Interface that watches the requested clusterRoleBindings.
-func (c *clusterRoleBindings) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *clusterRoleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Resource("clusterrolebindings").
diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_clusterrole.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_clusterrole.go
index f832a536c65..88ece4ec4fc 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_clusterrole.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_clusterrole.go
@@ -58,7 +58,7 @@ func (c *FakeClusterRoles) Delete(name string, options *api.DeleteOptions) error
 	return err
 }
 
-func (c *FakeClusterRoles) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeClusterRoles) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewRootDeleteCollectionAction(clusterrolesResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &rbac.ClusterRoleList{})
@@ -74,7 +74,7 @@ func (c *FakeClusterRoles) Get(name string, options v1.GetOptions) (result *rbac
 	return obj.(*rbac.ClusterRole), err
 }
 
-func (c *FakeClusterRoles) List(opts api.ListOptions) (result *rbac.ClusterRoleList, err error) {
+func (c *FakeClusterRoles) List(opts v1.ListOptions) (result *rbac.ClusterRoleList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewRootListAction(clusterrolesResource, opts), &rbac.ClusterRoleList{})
 	if obj == nil {
@@ -95,7 +95,7 @@ func (c *FakeClusterRoles) List(opts api.ListOptions) (result *rbac.ClusterRoleL
 }
 
 // Watch returns a watch.Interface that watches the requested clusterRoles.
-func (c *FakeClusterRoles) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeClusterRoles) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewRootWatchAction(clusterrolesResource, opts))
 }
diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_clusterrolebinding.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_clusterrolebinding.go
index 92da74880fd..568b5c27fe5 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_clusterrolebinding.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_clusterrolebinding.go
@@ -58,7 +58,7 @@ func (c *FakeClusterRoleBindings) Delete(name string, options *api.DeleteOptions
 	return err
 }
 
-func (c *FakeClusterRoleBindings) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeClusterRoleBindings) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewRootDeleteCollectionAction(clusterrolebindingsResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &rbac.ClusterRoleBindingList{})
@@ -74,7 +74,7 @@ func (c *FakeClusterRoleBindings) Get(name string, options v1.GetOptions) (resul
 	return obj.(*rbac.ClusterRoleBinding), err
 }
 
-func (c *FakeClusterRoleBindings) List(opts api.ListOptions) (result *rbac.ClusterRoleBindingList, err error) {
+func (c *FakeClusterRoleBindings) List(opts v1.ListOptions) (result *rbac.ClusterRoleBindingList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewRootListAction(clusterrolebindingsResource, opts), &rbac.ClusterRoleBindingList{})
 	if obj == nil {
@@ -95,7 +95,7 @@ func (c *FakeClusterRoleBindings) List(opts api.ListOptions) (result *rbac.Clust
 }
 
 // Watch returns a watch.Interface that watches the requested clusterRoleBindings.
-func (c *FakeClusterRoleBindings) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeClusterRoleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewRootWatchAction(clusterrolebindingsResource, opts))
 }
diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_role.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_role.go
index 9179d2eee77..0354aea4ea8 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_role.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_role.go
@@ -62,7 +62,7 @@ func (c *FakeRoles) Delete(name string, options *api.DeleteOptions) error {
 	return err
 }
 
-func (c *FakeRoles) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeRoles) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(rolesResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &rbac.RoleList{})
@@ -79,7 +79,7 @@ func (c *FakeRoles) Get(name string, options v1.GetOptions) (result *rbac.Role,
 	return obj.(*rbac.Role), err
 }
 
-func (c *FakeRoles) List(opts api.ListOptions) (result *rbac.RoleList, err error) {
+func (c *FakeRoles) List(opts v1.ListOptions) (result *rbac.RoleList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(rolesResource, c.ns, opts), &rbac.RoleList{})
 
@@ -101,7 +101,7 @@ func (c *FakeRoles) List(opts api.ListOptions) (result *rbac.RoleList, err error
 }
 
 // Watch returns a watch.Interface that watches the requested roles.
-func (c *FakeRoles) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeRoles) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(rolesResource, c.ns, opts))
 
diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_rolebinding.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_rolebinding.go
index b78aa7c1c2d..9a7cdd4bdcb 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_rolebinding.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_rolebinding.go
@@ -62,7 +62,7 @@ func (c *FakeRoleBindings) Delete(name string, options *api.DeleteOptions) error
 	return err
 }
 
-func (c *FakeRoleBindings) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeRoleBindings) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewDeleteCollectionAction(rolebindingsResource, c.ns, listOptions)
 
 	_, err := c.Fake.Invokes(action, &rbac.RoleBindingList{})
@@ -79,7 +79,7 @@ func (c *FakeRoleBindings) Get(name string, options v1.GetOptions) (result *rbac
 	return obj.(*rbac.RoleBinding), err
 }
 
-func (c *FakeRoleBindings) List(opts api.ListOptions) (result *rbac.RoleBindingList, err error) {
+func (c *FakeRoleBindings) List(opts v1.ListOptions) (result *rbac.RoleBindingList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewListAction(rolebindingsResource, c.ns, opts), &rbac.RoleBindingList{})
 
@@ -101,7 +101,7 @@ func (c *FakeRoleBindings) List(opts api.ListOptions) (result *rbac.RoleBindingL
 }
 
 // Watch returns a watch.Interface that watches the requested roleBindings.
-func (c *FakeRoleBindings) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeRoleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewWatchAction(rolebindingsResource, c.ns, opts))
 
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 a395b16bf11..3b2eff6e343 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/role.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/role.go
@@ -36,10 +36,10 @@ type RoleInterface interface {
 	Create(*rbac.Role) (*rbac.Role, error)
 	Update(*rbac.Role) (*rbac.Role, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*rbac.Role, error)
-	List(opts api.ListOptions) (*rbac.RoleList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*rbac.RoleList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *rbac.Role, err error)
 	RoleExpansion
 }
@@ -95,7 +95,7 @@ func (c *roles) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *roles) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *roles) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("roles").
@@ -119,7 +119,7 @@ func (c *roles) Get(name string, options v1.GetOptions) (result *rbac.Role, err
 }
 
 // List takes label and field selectors, and returns the list of Roles that match those selectors.
-func (c *roles) List(opts api.ListOptions) (result *rbac.RoleList, err error) {
+func (c *roles) List(opts v1.ListOptions) (result *rbac.RoleList, err error) {
 	result = &rbac.RoleList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -131,7 +131,7 @@ func (c *roles) List(opts api.ListOptions) (result *rbac.RoleList, err error) {
 }
 
 // Watch returns a watch.Interface that watches the requested roles.
-func (c *roles) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *roles) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
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 b8ab5e7a542..6492b7ba505 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rolebinding.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rolebinding.go
@@ -36,10 +36,10 @@ type RoleBindingInterface interface {
 	Create(*rbac.RoleBinding) (*rbac.RoleBinding, error)
 	Update(*rbac.RoleBinding) (*rbac.RoleBinding, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*rbac.RoleBinding, error)
-	List(opts api.ListOptions) (*rbac.RoleBindingList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*rbac.RoleBindingList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *rbac.RoleBinding, err error)
 	RoleBindingExpansion
 }
@@ -95,7 +95,7 @@ func (c *roleBindings) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *roleBindings) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *roleBindings) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("rolebindings").
@@ -119,7 +119,7 @@ func (c *roleBindings) Get(name string, options v1.GetOptions) (result *rbac.Rol
 }
 
 // List takes label and field selectors, and returns the list of RoleBindings that match those selectors.
-func (c *roleBindings) List(opts api.ListOptions) (result *rbac.RoleBindingList, err error) {
+func (c *roleBindings) List(opts v1.ListOptions) (result *rbac.RoleBindingList, err error) {
 	result = &rbac.RoleBindingList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -131,7 +131,7 @@ func (c *roleBindings) List(opts api.ListOptions) (result *rbac.RoleBindingList,
 }
 
 // Watch returns a watch.Interface that watches the requested roleBindings.
-func (c *roleBindings) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *roleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/fake_storageclass.go b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/fake_storageclass.go
index a188890d186..40e9cf596fb 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/fake_storageclass.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/fake_storageclass.go
@@ -58,7 +58,7 @@ func (c *FakeStorageClasses) Delete(name string, options *api.DeleteOptions) err
 	return err
 }
 
-func (c *FakeStorageClasses) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *FakeStorageClasses) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	action := core.NewRootDeleteCollectionAction(storageclassesResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &storage.StorageClassList{})
@@ -74,7 +74,7 @@ func (c *FakeStorageClasses) Get(name string, options v1.GetOptions) (result *st
 	return obj.(*storage.StorageClass), err
 }
 
-func (c *FakeStorageClasses) List(opts api.ListOptions) (result *storage.StorageClassList, err error) {
+func (c *FakeStorageClasses) List(opts v1.ListOptions) (result *storage.StorageClassList, err error) {
 	obj, err := c.Fake.
 		Invokes(core.NewRootListAction(storageclassesResource, opts), &storage.StorageClassList{})
 	if obj == nil {
@@ -95,7 +95,7 @@ func (c *FakeStorageClasses) List(opts api.ListOptions) (result *storage.Storage
 }
 
 // Watch returns a watch.Interface that watches the requested storageClasses.
-func (c *FakeStorageClasses) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *FakeStorageClasses) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(core.NewRootWatchAction(storageclassesResource, opts))
 }
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 ab5c6189582..c31e10916d4 100644
--- a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storageclass.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storageclass.go
@@ -36,10 +36,10 @@ type StorageClassInterface interface {
 	Create(*storage.StorageClass) (*storage.StorageClass, error)
 	Update(*storage.StorageClass) (*storage.StorageClass, error)
 	Delete(name string, options *api.DeleteOptions) error
-	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error
 	Get(name string, options v1.GetOptions) (*storage.StorageClass, error)
-	List(opts api.ListOptions) (*storage.StorageClassList, error)
-	Watch(opts api.ListOptions) (watch.Interface, error)
+	List(opts v1.ListOptions) (*storage.StorageClassList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *storage.StorageClass, err error)
 	StorageClassExpansion
 }
@@ -90,7 +90,7 @@ func (c *storageClasses) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // DeleteCollection deletes a collection of objects.
-func (c *storageClasses) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+func (c *storageClasses) DeleteCollection(options *api.DeleteOptions, listOptions v1.ListOptions) error {
 	return c.client.Delete().
 		Resource("storageclasses").
 		VersionedParams(&listOptions, api.ParameterCodec).
@@ -112,7 +112,7 @@ func (c *storageClasses) Get(name string, options v1.GetOptions) (result *storag
 }
 
 // List takes label and field selectors, and returns the list of StorageClasses that match those selectors.
-func (c *storageClasses) List(opts api.ListOptions) (result *storage.StorageClassList, err error) {
+func (c *storageClasses) List(opts v1.ListOptions) (result *storage.StorageClassList, err error) {
 	result = &storage.StorageClassList{}
 	err = c.client.Get().
 		Resource("storageclasses").
@@ -123,7 +123,7 @@ func (c *storageClasses) List(opts api.ListOptions) (result *storage.StorageClas
 }
 
 // Watch returns a watch.Interface that watches the requested storageClasses.
-func (c *storageClasses) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (c *storageClasses) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Resource("storageclasses").
diff --git a/pkg/client/informers/informers_generated/apps/internalversion/BUILD b/pkg/client/informers/informers_generated/apps/internalversion/BUILD
index 7620cc3e608..a950d4c5d51 100644
--- a/pkg/client/informers/informers_generated/apps/internalversion/BUILD
+++ b/pkg/client/informers/informers_generated/apps/internalversion/BUILD
@@ -15,13 +15,12 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api:go_default_library",
-        "//pkg/api/v1:go_default_library",
         "//pkg/apis/apps:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
         "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/apps/internalversion:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],
diff --git a/pkg/client/informers/informers_generated/apps/internalversion/statefulset.go b/pkg/client/informers/informers_generated/apps/internalversion/statefulset.go
index ebc656fc137..3487f1488d1 100644
--- a/pkg/client/informers/informers_generated/apps/internalversion/statefulset.go
+++ b/pkg/client/informers/informers_generated/apps/internalversion/statefulset.go
@@ -19,10 +19,9 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	apps "k8s.io/kubernetes/pkg/apis/apps"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
@@ -46,18 +45,10 @@ func newStatefulSetInformer(client internalclientset.Interface, resyncPeriod tim
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Apps().StatefulSets(api.NamespaceAll).List(internalOptions)
+				return client.Apps().StatefulSets(v1.NamespaceAll).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Apps().StatefulSets(api.NamespaceAll).Watch(internalOptions)
+				return client.Apps().StatefulSets(v1.NamespaceAll).Watch(options)
 			},
 		},
 		&apps.StatefulSet{},
diff --git a/pkg/client/informers/informers_generated/apps/v1beta1/BUILD b/pkg/client/informers/informers_generated/apps/v1beta1/BUILD
index 15d979a6a22..569168a372b 100644
--- a/pkg/client/informers/informers_generated/apps/v1beta1/BUILD
+++ b/pkg/client/informers/informers_generated/apps/v1beta1/BUILD
@@ -15,12 +15,12 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/v1:go_default_library",
         "//pkg/apis/apps/v1beta1:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/apps/v1beta1:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],
diff --git a/pkg/client/informers/informers_generated/apps/v1beta1/statefulset.go b/pkg/client/informers/informers_generated/apps/v1beta1/statefulset.go
index c362374d024..d410363f66c 100644
--- a/pkg/client/informers/informers_generated/apps/v1beta1/statefulset.go
+++ b/pkg/client/informers/informers_generated/apps/v1beta1/statefulset.go
@@ -19,9 +19,9 @@ limitations under the License.
 package v1beta1
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	apps_v1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
diff --git a/pkg/client/informers/informers_generated/autoscaling/internalversion/BUILD b/pkg/client/informers/informers_generated/autoscaling/internalversion/BUILD
index 5ca2df24209..4acb02c524e 100644
--- a/pkg/client/informers/informers_generated/autoscaling/internalversion/BUILD
+++ b/pkg/client/informers/informers_generated/autoscaling/internalversion/BUILD
@@ -15,13 +15,12 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api:go_default_library",
-        "//pkg/api/v1:go_default_library",
         "//pkg/apis/autoscaling:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
         "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/autoscaling/internalversion:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],
diff --git a/pkg/client/informers/informers_generated/autoscaling/internalversion/horizontalpodautoscaler.go b/pkg/client/informers/informers_generated/autoscaling/internalversion/horizontalpodautoscaler.go
index f9113d2cb1e..94e0371f78d 100644
--- a/pkg/client/informers/informers_generated/autoscaling/internalversion/horizontalpodautoscaler.go
+++ b/pkg/client/informers/informers_generated/autoscaling/internalversion/horizontalpodautoscaler.go
@@ -19,10 +19,9 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
@@ -46,18 +45,10 @@ func newHorizontalPodAutoscalerInformer(client internalclientset.Interface, resy
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Autoscaling().HorizontalPodAutoscalers(api.NamespaceAll).List(internalOptions)
+				return client.Autoscaling().HorizontalPodAutoscalers(v1.NamespaceAll).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Autoscaling().HorizontalPodAutoscalers(api.NamespaceAll).Watch(internalOptions)
+				return client.Autoscaling().HorizontalPodAutoscalers(v1.NamespaceAll).Watch(options)
 			},
 		},
 		&autoscaling.HorizontalPodAutoscaler{},
diff --git a/pkg/client/informers/informers_generated/autoscaling/v1/BUILD b/pkg/client/informers/informers_generated/autoscaling/v1/BUILD
index cbadcc9f192..eaf6ba04a88 100644
--- a/pkg/client/informers/informers_generated/autoscaling/v1/BUILD
+++ b/pkg/client/informers/informers_generated/autoscaling/v1/BUILD
@@ -15,12 +15,12 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/v1:go_default_library",
         "//pkg/apis/autoscaling/v1:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/autoscaling/v1:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],
diff --git a/pkg/client/informers/informers_generated/autoscaling/v1/horizontalpodautoscaler.go b/pkg/client/informers/informers_generated/autoscaling/v1/horizontalpodautoscaler.go
index e368fefe8fa..98766c0fed6 100644
--- a/pkg/client/informers/informers_generated/autoscaling/v1/horizontalpodautoscaler.go
+++ b/pkg/client/informers/informers_generated/autoscaling/v1/horizontalpodautoscaler.go
@@ -19,9 +19,9 @@ limitations under the License.
 package v1
 
 import (
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	autoscaling_v1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
@@ -44,11 +44,11 @@ type horizontalPodAutoscalerInformer struct {
 func newHorizontalPodAutoscalerInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
-			ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) {
-				return client.AutoscalingV1().HorizontalPodAutoscalers(api_v1.NamespaceAll).List(options)
+			ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) {
+				return client.AutoscalingV1().HorizontalPodAutoscalers(meta_v1.NamespaceAll).List(options)
 			},
-			WatchFunc: func(options api_v1.ListOptions) (watch.Interface, error) {
-				return client.AutoscalingV1().HorizontalPodAutoscalers(api_v1.NamespaceAll).Watch(options)
+			WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) {
+				return client.AutoscalingV1().HorizontalPodAutoscalers(meta_v1.NamespaceAll).Watch(options)
 			},
 		},
 		&autoscaling_v1.HorizontalPodAutoscaler{},
diff --git a/pkg/client/informers/informers_generated/batch/internalversion/BUILD b/pkg/client/informers/informers_generated/batch/internalversion/BUILD
index 20caf883433..bea13d51fa4 100644
--- a/pkg/client/informers/informers_generated/batch/internalversion/BUILD
+++ b/pkg/client/informers/informers_generated/batch/internalversion/BUILD
@@ -16,13 +16,12 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api:go_default_library",
-        "//pkg/api/v1:go_default_library",
         "//pkg/apis/batch:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
         "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/batch/internalversion:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],
diff --git a/pkg/client/informers/informers_generated/batch/internalversion/cronjob.go b/pkg/client/informers/informers_generated/batch/internalversion/cronjob.go
index 34515b102eb..d753e0d1cb3 100644
--- a/pkg/client/informers/informers_generated/batch/internalversion/cronjob.go
+++ b/pkg/client/informers/informers_generated/batch/internalversion/cronjob.go
@@ -19,10 +19,9 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	batch "k8s.io/kubernetes/pkg/apis/batch"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
@@ -46,18 +45,10 @@ func newCronJobInformer(client internalclientset.Interface, resyncPeriod time.Du
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Batch().CronJobs(api.NamespaceAll).List(internalOptions)
+				return client.Batch().CronJobs(v1.NamespaceAll).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Batch().CronJobs(api.NamespaceAll).Watch(internalOptions)
+				return client.Batch().CronJobs(v1.NamespaceAll).Watch(options)
 			},
 		},
 		&batch.CronJob{},
diff --git a/pkg/client/informers/informers_generated/batch/internalversion/job.go b/pkg/client/informers/informers_generated/batch/internalversion/job.go
index f6a2c8287ac..09175014f9d 100644
--- a/pkg/client/informers/informers_generated/batch/internalversion/job.go
+++ b/pkg/client/informers/informers_generated/batch/internalversion/job.go
@@ -19,10 +19,9 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	batch "k8s.io/kubernetes/pkg/apis/batch"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
@@ -46,18 +45,10 @@ func newJobInformer(client internalclientset.Interface, resyncPeriod time.Durati
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Batch().Jobs(api.NamespaceAll).List(internalOptions)
+				return client.Batch().Jobs(v1.NamespaceAll).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Batch().Jobs(api.NamespaceAll).Watch(internalOptions)
+				return client.Batch().Jobs(v1.NamespaceAll).Watch(options)
 			},
 		},
 		&batch.Job{},
diff --git a/pkg/client/informers/informers_generated/batch/v1/BUILD b/pkg/client/informers/informers_generated/batch/v1/BUILD
index 4595368b3ae..11a99151f72 100644
--- a/pkg/client/informers/informers_generated/batch/v1/BUILD
+++ b/pkg/client/informers/informers_generated/batch/v1/BUILD
@@ -15,12 +15,12 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/v1:go_default_library",
         "//pkg/apis/batch/v1:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/batch/v1:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],
diff --git a/pkg/client/informers/informers_generated/batch/v1/job.go b/pkg/client/informers/informers_generated/batch/v1/job.go
index ef6bf2408ae..4aa25bfdb25 100644
--- a/pkg/client/informers/informers_generated/batch/v1/job.go
+++ b/pkg/client/informers/informers_generated/batch/v1/job.go
@@ -19,9 +19,9 @@ limitations under the License.
 package v1
 
 import (
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	batch_v1 "k8s.io/kubernetes/pkg/apis/batch/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
@@ -44,11 +44,11 @@ type jobInformer struct {
 func newJobInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
-			ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) {
-				return client.BatchV1().Jobs(api_v1.NamespaceAll).List(options)
+			ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) {
+				return client.BatchV1().Jobs(meta_v1.NamespaceAll).List(options)
 			},
-			WatchFunc: func(options api_v1.ListOptions) (watch.Interface, error) {
-				return client.BatchV1().Jobs(api_v1.NamespaceAll).Watch(options)
+			WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) {
+				return client.BatchV1().Jobs(meta_v1.NamespaceAll).Watch(options)
 			},
 		},
 		&batch_v1.Job{},
diff --git a/pkg/client/informers/informers_generated/batch/v2alpha1/BUILD b/pkg/client/informers/informers_generated/batch/v2alpha1/BUILD
index 66a476bf94e..8bc18a4707e 100644
--- a/pkg/client/informers/informers_generated/batch/v2alpha1/BUILD
+++ b/pkg/client/informers/informers_generated/batch/v2alpha1/BUILD
@@ -16,12 +16,12 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/v1:go_default_library",
         "//pkg/apis/batch/v2alpha1:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/batch/v2alpha1:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],
diff --git a/pkg/client/informers/informers_generated/batch/v2alpha1/cronjob.go b/pkg/client/informers/informers_generated/batch/v2alpha1/cronjob.go
index 5e5d446e548..06b02a68ce3 100644
--- a/pkg/client/informers/informers_generated/batch/v2alpha1/cronjob.go
+++ b/pkg/client/informers/informers_generated/batch/v2alpha1/cronjob.go
@@ -19,9 +19,9 @@ limitations under the License.
 package v2alpha1
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	batch_v2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
diff --git a/pkg/client/informers/informers_generated/batch/v2alpha1/job.go b/pkg/client/informers/informers_generated/batch/v2alpha1/job.go
index a42b3b2cd02..3ba7ce9d6bb 100644
--- a/pkg/client/informers/informers_generated/batch/v2alpha1/job.go
+++ b/pkg/client/informers/informers_generated/batch/v2alpha1/job.go
@@ -19,9 +19,9 @@ limitations under the License.
 package v2alpha1
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	batch_v2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
diff --git a/pkg/client/informers/informers_generated/certificates/internalversion/BUILD b/pkg/client/informers/informers_generated/certificates/internalversion/BUILD
index 2356929573c..7427f692666 100644
--- a/pkg/client/informers/informers_generated/certificates/internalversion/BUILD
+++ b/pkg/client/informers/informers_generated/certificates/internalversion/BUILD
@@ -15,13 +15,12 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api:go_default_library",
-        "//pkg/api/v1:go_default_library",
         "//pkg/apis/certificates:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
         "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/certificates/internalversion:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],
diff --git a/pkg/client/informers/informers_generated/certificates/internalversion/certificatesigningrequest.go b/pkg/client/informers/informers_generated/certificates/internalversion/certificatesigningrequest.go
index c0152906c4d..8de7bcb393a 100644
--- a/pkg/client/informers/informers_generated/certificates/internalversion/certificatesigningrequest.go
+++ b/pkg/client/informers/informers_generated/certificates/internalversion/certificatesigningrequest.go
@@ -19,10 +19,9 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	certificates "k8s.io/kubernetes/pkg/apis/certificates"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
@@ -46,18 +45,10 @@ func newCertificateSigningRequestInformer(client internalclientset.Interface, re
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Certificates().CertificateSigningRequests().List(internalOptions)
+				return client.Certificates().CertificateSigningRequests().List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Certificates().CertificateSigningRequests().Watch(internalOptions)
+				return client.Certificates().CertificateSigningRequests().Watch(options)
 			},
 		},
 		&certificates.CertificateSigningRequest{},
diff --git a/pkg/client/informers/informers_generated/certificates/v1beta1/BUILD b/pkg/client/informers/informers_generated/certificates/v1beta1/BUILD
index 7d09017392b..98a27680c3e 100644
--- a/pkg/client/informers/informers_generated/certificates/v1beta1/BUILD
+++ b/pkg/client/informers/informers_generated/certificates/v1beta1/BUILD
@@ -15,12 +15,12 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/v1:go_default_library",
         "//pkg/apis/certificates/v1beta1:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/certificates/v1beta1:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],
diff --git a/pkg/client/informers/informers_generated/certificates/v1beta1/certificatesigningrequest.go b/pkg/client/informers/informers_generated/certificates/v1beta1/certificatesigningrequest.go
index 937d9b5b131..1e0ca83fc17 100644
--- a/pkg/client/informers/informers_generated/certificates/v1beta1/certificatesigningrequest.go
+++ b/pkg/client/informers/informers_generated/certificates/v1beta1/certificatesigningrequest.go
@@ -19,9 +19,9 @@ limitations under the License.
 package v1beta1
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	certificates_v1beta1 "k8s.io/kubernetes/pkg/apis/certificates/v1beta1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
diff --git a/pkg/client/informers/informers_generated/core/internalversion/BUILD b/pkg/client/informers/informers_generated/core/internalversion/BUILD
index 9ba70a62876..f46fd0b27d8 100644
--- a/pkg/client/informers/informers_generated/core/internalversion/BUILD
+++ b/pkg/client/informers/informers_generated/core/internalversion/BUILD
@@ -31,11 +31,11 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/v1:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
         "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/core/internalversion:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],
diff --git a/pkg/client/informers/informers_generated/core/internalversion/componentstatus.go b/pkg/client/informers/informers_generated/core/internalversion/componentstatus.go
index 7d1cb9a83de..1d6c045b100 100644
--- a/pkg/client/informers/informers_generated/core/internalversion/componentstatus.go
+++ b/pkg/client/informers/informers_generated/core/internalversion/componentstatus.go
@@ -19,10 +19,10 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
@@ -45,18 +45,10 @@ func newComponentStatusInformer(client internalclientset.Interface, resyncPeriod
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().ComponentStatuses().List(internalOptions)
+				return client.Core().ComponentStatuses().List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().ComponentStatuses().Watch(internalOptions)
+				return client.Core().ComponentStatuses().Watch(options)
 			},
 		},
 		&api.ComponentStatus{},
diff --git a/pkg/client/informers/informers_generated/core/internalversion/configmap.go b/pkg/client/informers/informers_generated/core/internalversion/configmap.go
index fab6dc79565..a23f6121cb8 100644
--- a/pkg/client/informers/informers_generated/core/internalversion/configmap.go
+++ b/pkg/client/informers/informers_generated/core/internalversion/configmap.go
@@ -19,10 +19,10 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
@@ -45,18 +45,10 @@ func newConfigMapInformer(client internalclientset.Interface, resyncPeriod time.
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().ConfigMaps(api.NamespaceAll).List(internalOptions)
+				return client.Core().ConfigMaps(v1.NamespaceAll).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().ConfigMaps(api.NamespaceAll).Watch(internalOptions)
+				return client.Core().ConfigMaps(v1.NamespaceAll).Watch(options)
 			},
 		},
 		&api.ConfigMap{},
diff --git a/pkg/client/informers/informers_generated/core/internalversion/endpoints.go b/pkg/client/informers/informers_generated/core/internalversion/endpoints.go
index 914e5e38afc..ce95bea0245 100644
--- a/pkg/client/informers/informers_generated/core/internalversion/endpoints.go
+++ b/pkg/client/informers/informers_generated/core/internalversion/endpoints.go
@@ -19,10 +19,10 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
@@ -45,18 +45,10 @@ func newEndpointsInformer(client internalclientset.Interface, resyncPeriod time.
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().Endpoints(api.NamespaceAll).List(internalOptions)
+				return client.Core().Endpoints(v1.NamespaceAll).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().Endpoints(api.NamespaceAll).Watch(internalOptions)
+				return client.Core().Endpoints(v1.NamespaceAll).Watch(options)
 			},
 		},
 		&api.Endpoints{},
diff --git a/pkg/client/informers/informers_generated/core/internalversion/event.go b/pkg/client/informers/informers_generated/core/internalversion/event.go
index 6564c26135d..3d520562d05 100644
--- a/pkg/client/informers/informers_generated/core/internalversion/event.go
+++ b/pkg/client/informers/informers_generated/core/internalversion/event.go
@@ -19,10 +19,10 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
@@ -45,18 +45,10 @@ func newEventInformer(client internalclientset.Interface, resyncPeriod time.Dura
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().Events(api.NamespaceAll).List(internalOptions)
+				return client.Core().Events(v1.NamespaceAll).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().Events(api.NamespaceAll).Watch(internalOptions)
+				return client.Core().Events(v1.NamespaceAll).Watch(options)
 			},
 		},
 		&api.Event{},
diff --git a/pkg/client/informers/informers_generated/core/internalversion/limitrange.go b/pkg/client/informers/informers_generated/core/internalversion/limitrange.go
index 204ad7d0c0b..c7840d2bfd4 100644
--- a/pkg/client/informers/informers_generated/core/internalversion/limitrange.go
+++ b/pkg/client/informers/informers_generated/core/internalversion/limitrange.go
@@ -19,10 +19,10 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
@@ -45,18 +45,10 @@ func newLimitRangeInformer(client internalclientset.Interface, resyncPeriod time
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().LimitRanges(api.NamespaceAll).List(internalOptions)
+				return client.Core().LimitRanges(v1.NamespaceAll).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().LimitRanges(api.NamespaceAll).Watch(internalOptions)
+				return client.Core().LimitRanges(v1.NamespaceAll).Watch(options)
 			},
 		},
 		&api.LimitRange{},
diff --git a/pkg/client/informers/informers_generated/core/internalversion/namespace.go b/pkg/client/informers/informers_generated/core/internalversion/namespace.go
index 860d228c063..4c0e9690f6b 100644
--- a/pkg/client/informers/informers_generated/core/internalversion/namespace.go
+++ b/pkg/client/informers/informers_generated/core/internalversion/namespace.go
@@ -19,10 +19,10 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
@@ -45,18 +45,10 @@ func newNamespaceInformer(client internalclientset.Interface, resyncPeriod time.
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().Namespaces().List(internalOptions)
+				return client.Core().Namespaces().List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().Namespaces().Watch(internalOptions)
+				return client.Core().Namespaces().Watch(options)
 			},
 		},
 		&api.Namespace{},
diff --git a/pkg/client/informers/informers_generated/core/internalversion/node.go b/pkg/client/informers/informers_generated/core/internalversion/node.go
index f221d1c06ef..53c346ddedd 100644
--- a/pkg/client/informers/informers_generated/core/internalversion/node.go
+++ b/pkg/client/informers/informers_generated/core/internalversion/node.go
@@ -19,10 +19,10 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
@@ -45,18 +45,10 @@ func newNodeInformer(client internalclientset.Interface, resyncPeriod time.Durat
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().Nodes().List(internalOptions)
+				return client.Core().Nodes().List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().Nodes().Watch(internalOptions)
+				return client.Core().Nodes().Watch(options)
 			},
 		},
 		&api.Node{},
diff --git a/pkg/client/informers/informers_generated/core/internalversion/persistentvolume.go b/pkg/client/informers/informers_generated/core/internalversion/persistentvolume.go
index d34aea736a1..2d0379e0f97 100644
--- a/pkg/client/informers/informers_generated/core/internalversion/persistentvolume.go
+++ b/pkg/client/informers/informers_generated/core/internalversion/persistentvolume.go
@@ -19,10 +19,10 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
@@ -45,18 +45,10 @@ func newPersistentVolumeInformer(client internalclientset.Interface, resyncPerio
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().PersistentVolumes().List(internalOptions)
+				return client.Core().PersistentVolumes().List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().PersistentVolumes().Watch(internalOptions)
+				return client.Core().PersistentVolumes().Watch(options)
 			},
 		},
 		&api.PersistentVolume{},
diff --git a/pkg/client/informers/informers_generated/core/internalversion/persistentvolumeclaim.go b/pkg/client/informers/informers_generated/core/internalversion/persistentvolumeclaim.go
index 58bb90b877f..d0110e4a7a4 100644
--- a/pkg/client/informers/informers_generated/core/internalversion/persistentvolumeclaim.go
+++ b/pkg/client/informers/informers_generated/core/internalversion/persistentvolumeclaim.go
@@ -19,10 +19,10 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
@@ -45,18 +45,10 @@ func newPersistentVolumeClaimInformer(client internalclientset.Interface, resync
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().PersistentVolumeClaims(api.NamespaceAll).List(internalOptions)
+				return client.Core().PersistentVolumeClaims(v1.NamespaceAll).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().PersistentVolumeClaims(api.NamespaceAll).Watch(internalOptions)
+				return client.Core().PersistentVolumeClaims(v1.NamespaceAll).Watch(options)
 			},
 		},
 		&api.PersistentVolumeClaim{},
diff --git a/pkg/client/informers/informers_generated/core/internalversion/pod.go b/pkg/client/informers/informers_generated/core/internalversion/pod.go
index 10332f5eb80..347cae76e1c 100644
--- a/pkg/client/informers/informers_generated/core/internalversion/pod.go
+++ b/pkg/client/informers/informers_generated/core/internalversion/pod.go
@@ -19,10 +19,10 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
@@ -45,18 +45,10 @@ func newPodInformer(client internalclientset.Interface, resyncPeriod time.Durati
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().Pods(api.NamespaceAll).List(internalOptions)
+				return client.Core().Pods(v1.NamespaceAll).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().Pods(api.NamespaceAll).Watch(internalOptions)
+				return client.Core().Pods(v1.NamespaceAll).Watch(options)
 			},
 		},
 		&api.Pod{},
diff --git a/pkg/client/informers/informers_generated/core/internalversion/podtemplate.go b/pkg/client/informers/informers_generated/core/internalversion/podtemplate.go
index 65e1b7a25e9..46078c54bc3 100644
--- a/pkg/client/informers/informers_generated/core/internalversion/podtemplate.go
+++ b/pkg/client/informers/informers_generated/core/internalversion/podtemplate.go
@@ -19,10 +19,10 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
@@ -45,18 +45,10 @@ func newPodTemplateInformer(client internalclientset.Interface, resyncPeriod tim
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().PodTemplates(api.NamespaceAll).List(internalOptions)
+				return client.Core().PodTemplates(v1.NamespaceAll).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().PodTemplates(api.NamespaceAll).Watch(internalOptions)
+				return client.Core().PodTemplates(v1.NamespaceAll).Watch(options)
 			},
 		},
 		&api.PodTemplate{},
diff --git a/pkg/client/informers/informers_generated/core/internalversion/replicationcontroller.go b/pkg/client/informers/informers_generated/core/internalversion/replicationcontroller.go
index 0016874ab8b..2a6df29d36b 100644
--- a/pkg/client/informers/informers_generated/core/internalversion/replicationcontroller.go
+++ b/pkg/client/informers/informers_generated/core/internalversion/replicationcontroller.go
@@ -19,10 +19,10 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
@@ -45,18 +45,10 @@ func newReplicationControllerInformer(client internalclientset.Interface, resync
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().ReplicationControllers(api.NamespaceAll).List(internalOptions)
+				return client.Core().ReplicationControllers(v1.NamespaceAll).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().ReplicationControllers(api.NamespaceAll).Watch(internalOptions)
+				return client.Core().ReplicationControllers(v1.NamespaceAll).Watch(options)
 			},
 		},
 		&api.ReplicationController{},
diff --git a/pkg/client/informers/informers_generated/core/internalversion/resourcequota.go b/pkg/client/informers/informers_generated/core/internalversion/resourcequota.go
index 7584ce60547..55d186de3b7 100644
--- a/pkg/client/informers/informers_generated/core/internalversion/resourcequota.go
+++ b/pkg/client/informers/informers_generated/core/internalversion/resourcequota.go
@@ -19,10 +19,10 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
@@ -45,18 +45,10 @@ func newResourceQuotaInformer(client internalclientset.Interface, resyncPeriod t
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().ResourceQuotas(api.NamespaceAll).List(internalOptions)
+				return client.Core().ResourceQuotas(v1.NamespaceAll).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().ResourceQuotas(api.NamespaceAll).Watch(internalOptions)
+				return client.Core().ResourceQuotas(v1.NamespaceAll).Watch(options)
 			},
 		},
 		&api.ResourceQuota{},
diff --git a/pkg/client/informers/informers_generated/core/internalversion/secret.go b/pkg/client/informers/informers_generated/core/internalversion/secret.go
index 1f627fe4b3d..db7a6f9365b 100644
--- a/pkg/client/informers/informers_generated/core/internalversion/secret.go
+++ b/pkg/client/informers/informers_generated/core/internalversion/secret.go
@@ -19,10 +19,10 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
@@ -45,18 +45,10 @@ func newSecretInformer(client internalclientset.Interface, resyncPeriod time.Dur
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().Secrets(api.NamespaceAll).List(internalOptions)
+				return client.Core().Secrets(v1.NamespaceAll).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().Secrets(api.NamespaceAll).Watch(internalOptions)
+				return client.Core().Secrets(v1.NamespaceAll).Watch(options)
 			},
 		},
 		&api.Secret{},
diff --git a/pkg/client/informers/informers_generated/core/internalversion/service.go b/pkg/client/informers/informers_generated/core/internalversion/service.go
index 7dc1705a978..9c42cbd0bcd 100644
--- a/pkg/client/informers/informers_generated/core/internalversion/service.go
+++ b/pkg/client/informers/informers_generated/core/internalversion/service.go
@@ -19,10 +19,10 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
@@ -45,18 +45,10 @@ func newServiceInformer(client internalclientset.Interface, resyncPeriod time.Du
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().Services(api.NamespaceAll).List(internalOptions)
+				return client.Core().Services(v1.NamespaceAll).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().Services(api.NamespaceAll).Watch(internalOptions)
+				return client.Core().Services(v1.NamespaceAll).Watch(options)
 			},
 		},
 		&api.Service{},
diff --git a/pkg/client/informers/informers_generated/core/internalversion/serviceaccount.go b/pkg/client/informers/informers_generated/core/internalversion/serviceaccount.go
index bd208038d5c..66667a729ec 100644
--- a/pkg/client/informers/informers_generated/core/internalversion/serviceaccount.go
+++ b/pkg/client/informers/informers_generated/core/internalversion/serviceaccount.go
@@ -19,10 +19,10 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
@@ -45,18 +45,10 @@ func newServiceAccountInformer(client internalclientset.Interface, resyncPeriod
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().ServiceAccounts(api.NamespaceAll).List(internalOptions)
+				return client.Core().ServiceAccounts(v1.NamespaceAll).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Core().ServiceAccounts(api.NamespaceAll).Watch(internalOptions)
+				return client.Core().ServiceAccounts(v1.NamespaceAll).Watch(options)
 			},
 		},
 		&api.ServiceAccount{},
diff --git a/pkg/client/informers/informers_generated/core/v1/BUILD b/pkg/client/informers/informers_generated/core/v1/BUILD
index f2a87d3c566..38a79587381 100644
--- a/pkg/client/informers/informers_generated/core/v1/BUILD
+++ b/pkg/client/informers/informers_generated/core/v1/BUILD
@@ -35,6 +35,7 @@ go_library(
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/core/v1:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],
diff --git a/pkg/client/informers/informers_generated/core/v1/componentstatus.go b/pkg/client/informers/informers_generated/core/v1/componentstatus.go
index 7f2b9fad50e..f8910089660 100644
--- a/pkg/client/informers/informers_generated/core/v1/componentstatus.go
+++ b/pkg/client/informers/informers_generated/core/v1/componentstatus.go
@@ -19,6 +19,7 @@ limitations under the License.
 package v1
 
 import (
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
@@ -43,10 +44,10 @@ type componentStatusInformer struct {
 func newComponentStatusInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
-			ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) {
+			ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) {
 				return client.CoreV1().ComponentStatuses().List(options)
 			},
-			WatchFunc: func(options api_v1.ListOptions) (watch.Interface, error) {
+			WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) {
 				return client.CoreV1().ComponentStatuses().Watch(options)
 			},
 		},
diff --git a/pkg/client/informers/informers_generated/core/v1/configmap.go b/pkg/client/informers/informers_generated/core/v1/configmap.go
index 758448d2c42..52bc2d0ee54 100644
--- a/pkg/client/informers/informers_generated/core/v1/configmap.go
+++ b/pkg/client/informers/informers_generated/core/v1/configmap.go
@@ -19,6 +19,7 @@ limitations under the License.
 package v1
 
 import (
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
@@ -43,11 +44,11 @@ type configMapInformer struct {
 func newConfigMapInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
-			ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) {
-				return client.CoreV1().ConfigMaps(api_v1.NamespaceAll).List(options)
+			ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) {
+				return client.CoreV1().ConfigMaps(meta_v1.NamespaceAll).List(options)
 			},
-			WatchFunc: func(options api_v1.ListOptions) (watch.Interface, error) {
-				return client.CoreV1().ConfigMaps(api_v1.NamespaceAll).Watch(options)
+			WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) {
+				return client.CoreV1().ConfigMaps(meta_v1.NamespaceAll).Watch(options)
 			},
 		},
 		&api_v1.ConfigMap{},
diff --git a/pkg/client/informers/informers_generated/core/v1/endpoints.go b/pkg/client/informers/informers_generated/core/v1/endpoints.go
index c037dbdb2c9..9d9ee27a4d9 100644
--- a/pkg/client/informers/informers_generated/core/v1/endpoints.go
+++ b/pkg/client/informers/informers_generated/core/v1/endpoints.go
@@ -19,6 +19,7 @@ limitations under the License.
 package v1
 
 import (
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
@@ -43,11 +44,11 @@ type endpointsInformer struct {
 func newEndpointsInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
-			ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) {
-				return client.CoreV1().Endpoints(api_v1.NamespaceAll).List(options)
+			ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) {
+				return client.CoreV1().Endpoints(meta_v1.NamespaceAll).List(options)
 			},
-			WatchFunc: func(options api_v1.ListOptions) (watch.Interface, error) {
-				return client.CoreV1().Endpoints(api_v1.NamespaceAll).Watch(options)
+			WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) {
+				return client.CoreV1().Endpoints(meta_v1.NamespaceAll).Watch(options)
 			},
 		},
 		&api_v1.Endpoints{},
diff --git a/pkg/client/informers/informers_generated/core/v1/event.go b/pkg/client/informers/informers_generated/core/v1/event.go
index 5688965febd..818fe1961b2 100644
--- a/pkg/client/informers/informers_generated/core/v1/event.go
+++ b/pkg/client/informers/informers_generated/core/v1/event.go
@@ -19,6 +19,7 @@ limitations under the License.
 package v1
 
 import (
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
@@ -43,11 +44,11 @@ type eventInformer struct {
 func newEventInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
-			ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) {
-				return client.CoreV1().Events(api_v1.NamespaceAll).List(options)
+			ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) {
+				return client.CoreV1().Events(meta_v1.NamespaceAll).List(options)
 			},
-			WatchFunc: func(options api_v1.ListOptions) (watch.Interface, error) {
-				return client.CoreV1().Events(api_v1.NamespaceAll).Watch(options)
+			WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) {
+				return client.CoreV1().Events(meta_v1.NamespaceAll).Watch(options)
 			},
 		},
 		&api_v1.Event{},
diff --git a/pkg/client/informers/informers_generated/core/v1/limitrange.go b/pkg/client/informers/informers_generated/core/v1/limitrange.go
index 1130203c3aa..2ac63b30eed 100644
--- a/pkg/client/informers/informers_generated/core/v1/limitrange.go
+++ b/pkg/client/informers/informers_generated/core/v1/limitrange.go
@@ -19,6 +19,7 @@ limitations under the License.
 package v1
 
 import (
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
@@ -43,11 +44,11 @@ type limitRangeInformer struct {
 func newLimitRangeInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
-			ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) {
-				return client.CoreV1().LimitRanges(api_v1.NamespaceAll).List(options)
+			ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) {
+				return client.CoreV1().LimitRanges(meta_v1.NamespaceAll).List(options)
 			},
-			WatchFunc: func(options api_v1.ListOptions) (watch.Interface, error) {
-				return client.CoreV1().LimitRanges(api_v1.NamespaceAll).Watch(options)
+			WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) {
+				return client.CoreV1().LimitRanges(meta_v1.NamespaceAll).Watch(options)
 			},
 		},
 		&api_v1.LimitRange{},
diff --git a/pkg/client/informers/informers_generated/core/v1/namespace.go b/pkg/client/informers/informers_generated/core/v1/namespace.go
index d62d95dae74..328c3556095 100644
--- a/pkg/client/informers/informers_generated/core/v1/namespace.go
+++ b/pkg/client/informers/informers_generated/core/v1/namespace.go
@@ -19,6 +19,7 @@ limitations under the License.
 package v1
 
 import (
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
@@ -43,10 +44,10 @@ type namespaceInformer struct {
 func newNamespaceInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
-			ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) {
+			ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) {
 				return client.CoreV1().Namespaces().List(options)
 			},
-			WatchFunc: func(options api_v1.ListOptions) (watch.Interface, error) {
+			WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) {
 				return client.CoreV1().Namespaces().Watch(options)
 			},
 		},
diff --git a/pkg/client/informers/informers_generated/core/v1/node.go b/pkg/client/informers/informers_generated/core/v1/node.go
index 857aa9a9723..b42fda3b595 100644
--- a/pkg/client/informers/informers_generated/core/v1/node.go
+++ b/pkg/client/informers/informers_generated/core/v1/node.go
@@ -19,6 +19,7 @@ limitations under the License.
 package v1
 
 import (
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
@@ -43,10 +44,10 @@ type nodeInformer struct {
 func newNodeInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
-			ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) {
+			ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) {
 				return client.CoreV1().Nodes().List(options)
 			},
-			WatchFunc: func(options api_v1.ListOptions) (watch.Interface, error) {
+			WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) {
 				return client.CoreV1().Nodes().Watch(options)
 			},
 		},
diff --git a/pkg/client/informers/informers_generated/core/v1/persistentvolume.go b/pkg/client/informers/informers_generated/core/v1/persistentvolume.go
index 13caad492e9..c5daaa77246 100644
--- a/pkg/client/informers/informers_generated/core/v1/persistentvolume.go
+++ b/pkg/client/informers/informers_generated/core/v1/persistentvolume.go
@@ -19,6 +19,7 @@ limitations under the License.
 package v1
 
 import (
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
@@ -43,10 +44,10 @@ type persistentVolumeInformer struct {
 func newPersistentVolumeInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
-			ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) {
+			ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) {
 				return client.CoreV1().PersistentVolumes().List(options)
 			},
-			WatchFunc: func(options api_v1.ListOptions) (watch.Interface, error) {
+			WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) {
 				return client.CoreV1().PersistentVolumes().Watch(options)
 			},
 		},
diff --git a/pkg/client/informers/informers_generated/core/v1/persistentvolumeclaim.go b/pkg/client/informers/informers_generated/core/v1/persistentvolumeclaim.go
index e4c1d779861..e973b35043c 100644
--- a/pkg/client/informers/informers_generated/core/v1/persistentvolumeclaim.go
+++ b/pkg/client/informers/informers_generated/core/v1/persistentvolumeclaim.go
@@ -19,6 +19,7 @@ limitations under the License.
 package v1
 
 import (
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
@@ -43,11 +44,11 @@ type persistentVolumeClaimInformer struct {
 func newPersistentVolumeClaimInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
-			ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) {
-				return client.CoreV1().PersistentVolumeClaims(api_v1.NamespaceAll).List(options)
+			ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) {
+				return client.CoreV1().PersistentVolumeClaims(meta_v1.NamespaceAll).List(options)
 			},
-			WatchFunc: func(options api_v1.ListOptions) (watch.Interface, error) {
-				return client.CoreV1().PersistentVolumeClaims(api_v1.NamespaceAll).Watch(options)
+			WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) {
+				return client.CoreV1().PersistentVolumeClaims(meta_v1.NamespaceAll).Watch(options)
 			},
 		},
 		&api_v1.PersistentVolumeClaim{},
diff --git a/pkg/client/informers/informers_generated/core/v1/pod.go b/pkg/client/informers/informers_generated/core/v1/pod.go
index 8434cc8f811..5526ef149d6 100644
--- a/pkg/client/informers/informers_generated/core/v1/pod.go
+++ b/pkg/client/informers/informers_generated/core/v1/pod.go
@@ -19,6 +19,7 @@ limitations under the License.
 package v1
 
 import (
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
@@ -43,11 +44,11 @@ type podInformer struct {
 func newPodInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
-			ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) {
-				return client.CoreV1().Pods(api_v1.NamespaceAll).List(options)
+			ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) {
+				return client.CoreV1().Pods(meta_v1.NamespaceAll).List(options)
 			},
-			WatchFunc: func(options api_v1.ListOptions) (watch.Interface, error) {
-				return client.CoreV1().Pods(api_v1.NamespaceAll).Watch(options)
+			WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) {
+				return client.CoreV1().Pods(meta_v1.NamespaceAll).Watch(options)
 			},
 		},
 		&api_v1.Pod{},
diff --git a/pkg/client/informers/informers_generated/core/v1/podtemplate.go b/pkg/client/informers/informers_generated/core/v1/podtemplate.go
index c1071cdee12..cb3b28cd809 100644
--- a/pkg/client/informers/informers_generated/core/v1/podtemplate.go
+++ b/pkg/client/informers/informers_generated/core/v1/podtemplate.go
@@ -19,6 +19,7 @@ limitations under the License.
 package v1
 
 import (
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
@@ -43,11 +44,11 @@ type podTemplateInformer struct {
 func newPodTemplateInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
-			ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) {
-				return client.CoreV1().PodTemplates(api_v1.NamespaceAll).List(options)
+			ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) {
+				return client.CoreV1().PodTemplates(meta_v1.NamespaceAll).List(options)
 			},
-			WatchFunc: func(options api_v1.ListOptions) (watch.Interface, error) {
-				return client.CoreV1().PodTemplates(api_v1.NamespaceAll).Watch(options)
+			WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) {
+				return client.CoreV1().PodTemplates(meta_v1.NamespaceAll).Watch(options)
 			},
 		},
 		&api_v1.PodTemplate{},
diff --git a/pkg/client/informers/informers_generated/core/v1/replicationcontroller.go b/pkg/client/informers/informers_generated/core/v1/replicationcontroller.go
index 6ca77ac2626..8b604ae01c5 100644
--- a/pkg/client/informers/informers_generated/core/v1/replicationcontroller.go
+++ b/pkg/client/informers/informers_generated/core/v1/replicationcontroller.go
@@ -19,6 +19,7 @@ limitations under the License.
 package v1
 
 import (
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
@@ -43,11 +44,11 @@ type replicationControllerInformer struct {
 func newReplicationControllerInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
-			ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) {
-				return client.CoreV1().ReplicationControllers(api_v1.NamespaceAll).List(options)
+			ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) {
+				return client.CoreV1().ReplicationControllers(meta_v1.NamespaceAll).List(options)
 			},
-			WatchFunc: func(options api_v1.ListOptions) (watch.Interface, error) {
-				return client.CoreV1().ReplicationControllers(api_v1.NamespaceAll).Watch(options)
+			WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) {
+				return client.CoreV1().ReplicationControllers(meta_v1.NamespaceAll).Watch(options)
 			},
 		},
 		&api_v1.ReplicationController{},
diff --git a/pkg/client/informers/informers_generated/core/v1/resourcequota.go b/pkg/client/informers/informers_generated/core/v1/resourcequota.go
index c4cc480a7a9..75b61de4820 100644
--- a/pkg/client/informers/informers_generated/core/v1/resourcequota.go
+++ b/pkg/client/informers/informers_generated/core/v1/resourcequota.go
@@ -19,6 +19,7 @@ limitations under the License.
 package v1
 
 import (
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
@@ -43,11 +44,11 @@ type resourceQuotaInformer struct {
 func newResourceQuotaInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
-			ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) {
-				return client.CoreV1().ResourceQuotas(api_v1.NamespaceAll).List(options)
+			ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) {
+				return client.CoreV1().ResourceQuotas(meta_v1.NamespaceAll).List(options)
 			},
-			WatchFunc: func(options api_v1.ListOptions) (watch.Interface, error) {
-				return client.CoreV1().ResourceQuotas(api_v1.NamespaceAll).Watch(options)
+			WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) {
+				return client.CoreV1().ResourceQuotas(meta_v1.NamespaceAll).Watch(options)
 			},
 		},
 		&api_v1.ResourceQuota{},
diff --git a/pkg/client/informers/informers_generated/core/v1/secret.go b/pkg/client/informers/informers_generated/core/v1/secret.go
index 1b3eb89a908..eb08980907d 100644
--- a/pkg/client/informers/informers_generated/core/v1/secret.go
+++ b/pkg/client/informers/informers_generated/core/v1/secret.go
@@ -19,6 +19,7 @@ limitations under the License.
 package v1
 
 import (
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
@@ -43,11 +44,11 @@ type secretInformer struct {
 func newSecretInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
-			ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) {
-				return client.CoreV1().Secrets(api_v1.NamespaceAll).List(options)
+			ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) {
+				return client.CoreV1().Secrets(meta_v1.NamespaceAll).List(options)
 			},
-			WatchFunc: func(options api_v1.ListOptions) (watch.Interface, error) {
-				return client.CoreV1().Secrets(api_v1.NamespaceAll).Watch(options)
+			WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) {
+				return client.CoreV1().Secrets(meta_v1.NamespaceAll).Watch(options)
 			},
 		},
 		&api_v1.Secret{},
diff --git a/pkg/client/informers/informers_generated/core/v1/service.go b/pkg/client/informers/informers_generated/core/v1/service.go
index 143deed20d0..f0c0315e0c1 100644
--- a/pkg/client/informers/informers_generated/core/v1/service.go
+++ b/pkg/client/informers/informers_generated/core/v1/service.go
@@ -19,6 +19,7 @@ limitations under the License.
 package v1
 
 import (
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
@@ -43,11 +44,11 @@ type serviceInformer struct {
 func newServiceInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
-			ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) {
-				return client.CoreV1().Services(api_v1.NamespaceAll).List(options)
+			ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) {
+				return client.CoreV1().Services(meta_v1.NamespaceAll).List(options)
 			},
-			WatchFunc: func(options api_v1.ListOptions) (watch.Interface, error) {
-				return client.CoreV1().Services(api_v1.NamespaceAll).Watch(options)
+			WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) {
+				return client.CoreV1().Services(meta_v1.NamespaceAll).Watch(options)
 			},
 		},
 		&api_v1.Service{},
diff --git a/pkg/client/informers/informers_generated/core/v1/serviceaccount.go b/pkg/client/informers/informers_generated/core/v1/serviceaccount.go
index 6f65e1307a1..fe787b56231 100644
--- a/pkg/client/informers/informers_generated/core/v1/serviceaccount.go
+++ b/pkg/client/informers/informers_generated/core/v1/serviceaccount.go
@@ -19,6 +19,7 @@ limitations under the License.
 package v1
 
 import (
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
@@ -43,11 +44,11 @@ type serviceAccountInformer struct {
 func newServiceAccountInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
-			ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) {
-				return client.CoreV1().ServiceAccounts(api_v1.NamespaceAll).List(options)
+			ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) {
+				return client.CoreV1().ServiceAccounts(meta_v1.NamespaceAll).List(options)
 			},
-			WatchFunc: func(options api_v1.ListOptions) (watch.Interface, error) {
-				return client.CoreV1().ServiceAccounts(api_v1.NamespaceAll).Watch(options)
+			WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) {
+				return client.CoreV1().ServiceAccounts(meta_v1.NamespaceAll).Watch(options)
 			},
 		},
 		&api_v1.ServiceAccount{},
diff --git a/pkg/client/informers/informers_generated/extensions/internalversion/BUILD b/pkg/client/informers/informers_generated/extensions/internalversion/BUILD
index f82b8e36c00..26ebb4d5b0f 100644
--- a/pkg/client/informers/informers_generated/extensions/internalversion/BUILD
+++ b/pkg/client/informers/informers_generated/extensions/internalversion/BUILD
@@ -21,13 +21,12 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api:go_default_library",
-        "//pkg/api/v1:go_default_library",
         "//pkg/apis/extensions:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
         "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/extensions/internalversion:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],
diff --git a/pkg/client/informers/informers_generated/extensions/internalversion/daemonset.go b/pkg/client/informers/informers_generated/extensions/internalversion/daemonset.go
index d18bb818102..8bbc5a317f8 100644
--- a/pkg/client/informers/informers_generated/extensions/internalversion/daemonset.go
+++ b/pkg/client/informers/informers_generated/extensions/internalversion/daemonset.go
@@ -19,10 +19,9 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
@@ -46,18 +45,10 @@ func newDaemonSetInformer(client internalclientset.Interface, resyncPeriod time.
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Extensions().DaemonSets(api.NamespaceAll).List(internalOptions)
+				return client.Extensions().DaemonSets(v1.NamespaceAll).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Extensions().DaemonSets(api.NamespaceAll).Watch(internalOptions)
+				return client.Extensions().DaemonSets(v1.NamespaceAll).Watch(options)
 			},
 		},
 		&extensions.DaemonSet{},
diff --git a/pkg/client/informers/informers_generated/extensions/internalversion/deployment.go b/pkg/client/informers/informers_generated/extensions/internalversion/deployment.go
index b31d87b9c7d..341d9e02e5a 100644
--- a/pkg/client/informers/informers_generated/extensions/internalversion/deployment.go
+++ b/pkg/client/informers/informers_generated/extensions/internalversion/deployment.go
@@ -19,10 +19,9 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
@@ -46,18 +45,10 @@ func newDeploymentInformer(client internalclientset.Interface, resyncPeriod time
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Extensions().Deployments(api.NamespaceAll).List(internalOptions)
+				return client.Extensions().Deployments(v1.NamespaceAll).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Extensions().Deployments(api.NamespaceAll).Watch(internalOptions)
+				return client.Extensions().Deployments(v1.NamespaceAll).Watch(options)
 			},
 		},
 		&extensions.Deployment{},
diff --git a/pkg/client/informers/informers_generated/extensions/internalversion/ingress.go b/pkg/client/informers/informers_generated/extensions/internalversion/ingress.go
index 60e0ef61e0f..393abc8c285 100644
--- a/pkg/client/informers/informers_generated/extensions/internalversion/ingress.go
+++ b/pkg/client/informers/informers_generated/extensions/internalversion/ingress.go
@@ -19,10 +19,9 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
@@ -46,18 +45,10 @@ func newIngressInformer(client internalclientset.Interface, resyncPeriod time.Du
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Extensions().Ingresses(api.NamespaceAll).List(internalOptions)
+				return client.Extensions().Ingresses(v1.NamespaceAll).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Extensions().Ingresses(api.NamespaceAll).Watch(internalOptions)
+				return client.Extensions().Ingresses(v1.NamespaceAll).Watch(options)
 			},
 		},
 		&extensions.Ingress{},
diff --git a/pkg/client/informers/informers_generated/extensions/internalversion/networkpolicy.go b/pkg/client/informers/informers_generated/extensions/internalversion/networkpolicy.go
index f549a60a237..3f98d839b9a 100644
--- a/pkg/client/informers/informers_generated/extensions/internalversion/networkpolicy.go
+++ b/pkg/client/informers/informers_generated/extensions/internalversion/networkpolicy.go
@@ -19,10 +19,9 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
@@ -46,18 +45,10 @@ func newNetworkPolicyInformer(client internalclientset.Interface, resyncPeriod t
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Extensions().NetworkPolicies(api.NamespaceAll).List(internalOptions)
+				return client.Extensions().NetworkPolicies(v1.NamespaceAll).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Extensions().NetworkPolicies(api.NamespaceAll).Watch(internalOptions)
+				return client.Extensions().NetworkPolicies(v1.NamespaceAll).Watch(options)
 			},
 		},
 		&extensions.NetworkPolicy{},
diff --git a/pkg/client/informers/informers_generated/extensions/internalversion/podsecuritypolicy.go b/pkg/client/informers/informers_generated/extensions/internalversion/podsecuritypolicy.go
index be6930a37e2..7f02fa7b715 100644
--- a/pkg/client/informers/informers_generated/extensions/internalversion/podsecuritypolicy.go
+++ b/pkg/client/informers/informers_generated/extensions/internalversion/podsecuritypolicy.go
@@ -19,10 +19,9 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
@@ -46,18 +45,10 @@ func newPodSecurityPolicyInformer(client internalclientset.Interface, resyncPeri
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Extensions().PodSecurityPolicies().List(internalOptions)
+				return client.Extensions().PodSecurityPolicies().List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Extensions().PodSecurityPolicies().Watch(internalOptions)
+				return client.Extensions().PodSecurityPolicies().Watch(options)
 			},
 		},
 		&extensions.PodSecurityPolicy{},
diff --git a/pkg/client/informers/informers_generated/extensions/internalversion/replicaset.go b/pkg/client/informers/informers_generated/extensions/internalversion/replicaset.go
index 65a9eca9524..2a2a4aae5de 100644
--- a/pkg/client/informers/informers_generated/extensions/internalversion/replicaset.go
+++ b/pkg/client/informers/informers_generated/extensions/internalversion/replicaset.go
@@ -19,10 +19,9 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
@@ -46,18 +45,10 @@ func newReplicaSetInformer(client internalclientset.Interface, resyncPeriod time
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Extensions().ReplicaSets(api.NamespaceAll).List(internalOptions)
+				return client.Extensions().ReplicaSets(v1.NamespaceAll).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Extensions().ReplicaSets(api.NamespaceAll).Watch(internalOptions)
+				return client.Extensions().ReplicaSets(v1.NamespaceAll).Watch(options)
 			},
 		},
 		&extensions.ReplicaSet{},
diff --git a/pkg/client/informers/informers_generated/extensions/internalversion/thirdpartyresource.go b/pkg/client/informers/informers_generated/extensions/internalversion/thirdpartyresource.go
index 97524e82834..b5f9ed666ec 100644
--- a/pkg/client/informers/informers_generated/extensions/internalversion/thirdpartyresource.go
+++ b/pkg/client/informers/informers_generated/extensions/internalversion/thirdpartyresource.go
@@ -19,10 +19,9 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
@@ -46,18 +45,10 @@ func newThirdPartyResourceInformer(client internalclientset.Interface, resyncPer
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Extensions().ThirdPartyResources().List(internalOptions)
+				return client.Extensions().ThirdPartyResources().List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Extensions().ThirdPartyResources().Watch(internalOptions)
+				return client.Extensions().ThirdPartyResources().Watch(options)
 			},
 		},
 		&extensions.ThirdPartyResource{},
diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/BUILD b/pkg/client/informers/informers_generated/extensions/v1beta1/BUILD
index cfb9ef22dfb..f318f6e4e2f 100644
--- a/pkg/client/informers/informers_generated/extensions/v1beta1/BUILD
+++ b/pkg/client/informers/informers_generated/extensions/v1beta1/BUILD
@@ -20,12 +20,12 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/v1:go_default_library",
         "//pkg/apis/extensions/v1beta1:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/extensions/v1beta1:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],
diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/daemonset.go b/pkg/client/informers/informers_generated/extensions/v1beta1/daemonset.go
index 7b4788b830e..ace8706a108 100644
--- a/pkg/client/informers/informers_generated/extensions/v1beta1/daemonset.go
+++ b/pkg/client/informers/informers_generated/extensions/v1beta1/daemonset.go
@@ -19,9 +19,9 @@ limitations under the License.
 package v1beta1
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/deployment.go b/pkg/client/informers/informers_generated/extensions/v1beta1/deployment.go
index f2e68db1355..7258772c040 100644
--- a/pkg/client/informers/informers_generated/extensions/v1beta1/deployment.go
+++ b/pkg/client/informers/informers_generated/extensions/v1beta1/deployment.go
@@ -19,9 +19,9 @@ limitations under the License.
 package v1beta1
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/ingress.go b/pkg/client/informers/informers_generated/extensions/v1beta1/ingress.go
index 495d0cf3109..d6f4541f569 100644
--- a/pkg/client/informers/informers_generated/extensions/v1beta1/ingress.go
+++ b/pkg/client/informers/informers_generated/extensions/v1beta1/ingress.go
@@ -19,9 +19,9 @@ limitations under the License.
 package v1beta1
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/podsecuritypolicy.go b/pkg/client/informers/informers_generated/extensions/v1beta1/podsecuritypolicy.go
index b9500611eb2..47567bed983 100644
--- a/pkg/client/informers/informers_generated/extensions/v1beta1/podsecuritypolicy.go
+++ b/pkg/client/informers/informers_generated/extensions/v1beta1/podsecuritypolicy.go
@@ -19,9 +19,9 @@ limitations under the License.
 package v1beta1
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/replicaset.go b/pkg/client/informers/informers_generated/extensions/v1beta1/replicaset.go
index 48f0d850070..6c4ce972cb1 100644
--- a/pkg/client/informers/informers_generated/extensions/v1beta1/replicaset.go
+++ b/pkg/client/informers/informers_generated/extensions/v1beta1/replicaset.go
@@ -19,9 +19,9 @@ limitations under the License.
 package v1beta1
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/thirdpartyresource.go b/pkg/client/informers/informers_generated/extensions/v1beta1/thirdpartyresource.go
index f6650f4e271..4313a5db559 100644
--- a/pkg/client/informers/informers_generated/extensions/v1beta1/thirdpartyresource.go
+++ b/pkg/client/informers/informers_generated/extensions/v1beta1/thirdpartyresource.go
@@ -19,9 +19,9 @@ limitations under the License.
 package v1beta1
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
diff --git a/pkg/client/informers/informers_generated/policy/internalversion/BUILD b/pkg/client/informers/informers_generated/policy/internalversion/BUILD
index 389a177393d..de6fdce541c 100644
--- a/pkg/client/informers/informers_generated/policy/internalversion/BUILD
+++ b/pkg/client/informers/informers_generated/policy/internalversion/BUILD
@@ -15,13 +15,12 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api:go_default_library",
-        "//pkg/api/v1:go_default_library",
         "//pkg/apis/policy:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
         "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/policy/internalversion:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],
diff --git a/pkg/client/informers/informers_generated/policy/internalversion/poddisruptionbudget.go b/pkg/client/informers/informers_generated/policy/internalversion/poddisruptionbudget.go
index 9afbf2f3bb0..22770bdfc74 100644
--- a/pkg/client/informers/informers_generated/policy/internalversion/poddisruptionbudget.go
+++ b/pkg/client/informers/informers_generated/policy/internalversion/poddisruptionbudget.go
@@ -19,10 +19,9 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	policy "k8s.io/kubernetes/pkg/apis/policy"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
@@ -46,18 +45,10 @@ func newPodDisruptionBudgetInformer(client internalclientset.Interface, resyncPe
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Policy().PodDisruptionBudgets(api.NamespaceAll).List(internalOptions)
+				return client.Policy().PodDisruptionBudgets(v1.NamespaceAll).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Policy().PodDisruptionBudgets(api.NamespaceAll).Watch(internalOptions)
+				return client.Policy().PodDisruptionBudgets(v1.NamespaceAll).Watch(options)
 			},
 		},
 		&policy.PodDisruptionBudget{},
diff --git a/pkg/client/informers/informers_generated/policy/v1beta1/BUILD b/pkg/client/informers/informers_generated/policy/v1beta1/BUILD
index a09bac4ad65..f20b9d9f6e2 100644
--- a/pkg/client/informers/informers_generated/policy/v1beta1/BUILD
+++ b/pkg/client/informers/informers_generated/policy/v1beta1/BUILD
@@ -15,12 +15,12 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/v1:go_default_library",
         "//pkg/apis/policy/v1beta1:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/policy/v1beta1:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],
diff --git a/pkg/client/informers/informers_generated/policy/v1beta1/poddisruptionbudget.go b/pkg/client/informers/informers_generated/policy/v1beta1/poddisruptionbudget.go
index b5ee2cdedef..a97b9137eee 100644
--- a/pkg/client/informers/informers_generated/policy/v1beta1/poddisruptionbudget.go
+++ b/pkg/client/informers/informers_generated/policy/v1beta1/poddisruptionbudget.go
@@ -19,9 +19,9 @@ limitations under the License.
 package v1beta1
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	policy_v1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
diff --git a/pkg/client/informers/informers_generated/rbac/internalversion/BUILD b/pkg/client/informers/informers_generated/rbac/internalversion/BUILD
index 1cd72e761fe..9c7613dca5e 100644
--- a/pkg/client/informers/informers_generated/rbac/internalversion/BUILD
+++ b/pkg/client/informers/informers_generated/rbac/internalversion/BUILD
@@ -18,13 +18,12 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api:go_default_library",
-        "//pkg/api/v1:go_default_library",
         "//pkg/apis/rbac:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
         "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/rbac/internalversion:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],
diff --git a/pkg/client/informers/informers_generated/rbac/internalversion/clusterrole.go b/pkg/client/informers/informers_generated/rbac/internalversion/clusterrole.go
index 04faefc2296..7df4cae9cf2 100644
--- a/pkg/client/informers/informers_generated/rbac/internalversion/clusterrole.go
+++ b/pkg/client/informers/informers_generated/rbac/internalversion/clusterrole.go
@@ -19,10 +19,9 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	rbac "k8s.io/kubernetes/pkg/apis/rbac"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
@@ -46,18 +45,10 @@ func newClusterRoleInformer(client internalclientset.Interface, resyncPeriod tim
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Rbac().ClusterRoles().List(internalOptions)
+				return client.Rbac().ClusterRoles().List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Rbac().ClusterRoles().Watch(internalOptions)
+				return client.Rbac().ClusterRoles().Watch(options)
 			},
 		},
 		&rbac.ClusterRole{},
diff --git a/pkg/client/informers/informers_generated/rbac/internalversion/clusterrolebinding.go b/pkg/client/informers/informers_generated/rbac/internalversion/clusterrolebinding.go
index 4a719167a6f..dd8804b3973 100644
--- a/pkg/client/informers/informers_generated/rbac/internalversion/clusterrolebinding.go
+++ b/pkg/client/informers/informers_generated/rbac/internalversion/clusterrolebinding.go
@@ -19,10 +19,9 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	rbac "k8s.io/kubernetes/pkg/apis/rbac"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
@@ -46,18 +45,10 @@ func newClusterRoleBindingInformer(client internalclientset.Interface, resyncPer
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Rbac().ClusterRoleBindings().List(internalOptions)
+				return client.Rbac().ClusterRoleBindings().List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Rbac().ClusterRoleBindings().Watch(internalOptions)
+				return client.Rbac().ClusterRoleBindings().Watch(options)
 			},
 		},
 		&rbac.ClusterRoleBinding{},
diff --git a/pkg/client/informers/informers_generated/rbac/internalversion/role.go b/pkg/client/informers/informers_generated/rbac/internalversion/role.go
index a5418fa4327..e324ffaba1f 100644
--- a/pkg/client/informers/informers_generated/rbac/internalversion/role.go
+++ b/pkg/client/informers/informers_generated/rbac/internalversion/role.go
@@ -19,10 +19,9 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	rbac "k8s.io/kubernetes/pkg/apis/rbac"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
@@ -46,18 +45,10 @@ func newRoleInformer(client internalclientset.Interface, resyncPeriod time.Durat
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Rbac().Roles(api.NamespaceAll).List(internalOptions)
+				return client.Rbac().Roles(v1.NamespaceAll).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Rbac().Roles(api.NamespaceAll).Watch(internalOptions)
+				return client.Rbac().Roles(v1.NamespaceAll).Watch(options)
 			},
 		},
 		&rbac.Role{},
diff --git a/pkg/client/informers/informers_generated/rbac/internalversion/rolebinding.go b/pkg/client/informers/informers_generated/rbac/internalversion/rolebinding.go
index c500ca2dc18..1db49ae6892 100644
--- a/pkg/client/informers/informers_generated/rbac/internalversion/rolebinding.go
+++ b/pkg/client/informers/informers_generated/rbac/internalversion/rolebinding.go
@@ -19,10 +19,9 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	rbac "k8s.io/kubernetes/pkg/apis/rbac"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
@@ -46,18 +45,10 @@ func newRoleBindingInformer(client internalclientset.Interface, resyncPeriod tim
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Rbac().RoleBindings(api.NamespaceAll).List(internalOptions)
+				return client.Rbac().RoleBindings(v1.NamespaceAll).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Rbac().RoleBindings(api.NamespaceAll).Watch(internalOptions)
+				return client.Rbac().RoleBindings(v1.NamespaceAll).Watch(options)
 			},
 		},
 		&rbac.RoleBinding{},
diff --git a/pkg/client/informers/informers_generated/rbac/v1alpha1/BUILD b/pkg/client/informers/informers_generated/rbac/v1alpha1/BUILD
index dfbee43c43a..ff5c67d42d2 100644
--- a/pkg/client/informers/informers_generated/rbac/v1alpha1/BUILD
+++ b/pkg/client/informers/informers_generated/rbac/v1alpha1/BUILD
@@ -18,12 +18,12 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/v1:go_default_library",
         "//pkg/apis/rbac/v1alpha1:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/rbac/v1alpha1:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],
diff --git a/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrole.go b/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrole.go
index f3474167474..86cb9087ec8 100644
--- a/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrole.go
+++ b/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrole.go
@@ -19,9 +19,9 @@ limitations under the License.
 package v1alpha1
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	rbac_v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
diff --git a/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrolebinding.go b/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrolebinding.go
index 782494559e6..70872dbb501 100644
--- a/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrolebinding.go
+++ b/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrolebinding.go
@@ -19,9 +19,9 @@ limitations under the License.
 package v1alpha1
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	rbac_v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
diff --git a/pkg/client/informers/informers_generated/rbac/v1alpha1/role.go b/pkg/client/informers/informers_generated/rbac/v1alpha1/role.go
index f370d9e358a..360ccdc2913 100644
--- a/pkg/client/informers/informers_generated/rbac/v1alpha1/role.go
+++ b/pkg/client/informers/informers_generated/rbac/v1alpha1/role.go
@@ -19,9 +19,9 @@ limitations under the License.
 package v1alpha1
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	rbac_v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
diff --git a/pkg/client/informers/informers_generated/rbac/v1alpha1/rolebinding.go b/pkg/client/informers/informers_generated/rbac/v1alpha1/rolebinding.go
index d45404b03f8..84de661128f 100644
--- a/pkg/client/informers/informers_generated/rbac/v1alpha1/rolebinding.go
+++ b/pkg/client/informers/informers_generated/rbac/v1alpha1/rolebinding.go
@@ -19,9 +19,9 @@ limitations under the License.
 package v1alpha1
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	rbac_v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
diff --git a/pkg/client/informers/informers_generated/rbac/v1beta1/BUILD b/pkg/client/informers/informers_generated/rbac/v1beta1/BUILD
index bdaec8d4e8d..0a055d90b2b 100644
--- a/pkg/client/informers/informers_generated/rbac/v1beta1/BUILD
+++ b/pkg/client/informers/informers_generated/rbac/v1beta1/BUILD
@@ -18,12 +18,12 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/v1:go_default_library",
         "//pkg/apis/rbac/v1beta1:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/rbac/v1beta1:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],
diff --git a/pkg/client/informers/informers_generated/rbac/v1beta1/clusterrole.go b/pkg/client/informers/informers_generated/rbac/v1beta1/clusterrole.go
index 253a78fd4bf..d5b240c66dc 100644
--- a/pkg/client/informers/informers_generated/rbac/v1beta1/clusterrole.go
+++ b/pkg/client/informers/informers_generated/rbac/v1beta1/clusterrole.go
@@ -19,9 +19,9 @@ limitations under the License.
 package v1beta1
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	rbac_v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
diff --git a/pkg/client/informers/informers_generated/rbac/v1beta1/clusterrolebinding.go b/pkg/client/informers/informers_generated/rbac/v1beta1/clusterrolebinding.go
index 3bb7dea1354..16d3eb9461d 100644
--- a/pkg/client/informers/informers_generated/rbac/v1beta1/clusterrolebinding.go
+++ b/pkg/client/informers/informers_generated/rbac/v1beta1/clusterrolebinding.go
@@ -19,9 +19,9 @@ limitations under the License.
 package v1beta1
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	rbac_v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
diff --git a/pkg/client/informers/informers_generated/rbac/v1beta1/role.go b/pkg/client/informers/informers_generated/rbac/v1beta1/role.go
index 665da1df520..7f777812816 100644
--- a/pkg/client/informers/informers_generated/rbac/v1beta1/role.go
+++ b/pkg/client/informers/informers_generated/rbac/v1beta1/role.go
@@ -19,9 +19,9 @@ limitations under the License.
 package v1beta1
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	rbac_v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
diff --git a/pkg/client/informers/informers_generated/rbac/v1beta1/rolebinding.go b/pkg/client/informers/informers_generated/rbac/v1beta1/rolebinding.go
index 9cf85ce221a..cbca10a6306 100644
--- a/pkg/client/informers/informers_generated/rbac/v1beta1/rolebinding.go
+++ b/pkg/client/informers/informers_generated/rbac/v1beta1/rolebinding.go
@@ -19,9 +19,9 @@ limitations under the License.
 package v1beta1
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	rbac_v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
diff --git a/pkg/client/informers/informers_generated/storage/internalversion/BUILD b/pkg/client/informers/informers_generated/storage/internalversion/BUILD
index 43f3fe2d8ca..3c1f3ba754d 100644
--- a/pkg/client/informers/informers_generated/storage/internalversion/BUILD
+++ b/pkg/client/informers/informers_generated/storage/internalversion/BUILD
@@ -15,13 +15,12 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api:go_default_library",
-        "//pkg/api/v1:go_default_library",
         "//pkg/apis/storage:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
         "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/storage/internalversion:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],
diff --git a/pkg/client/informers/informers_generated/storage/internalversion/storageclass.go b/pkg/client/informers/informers_generated/storage/internalversion/storageclass.go
index 79824676826..cfb63387d2f 100644
--- a/pkg/client/informers/informers_generated/storage/internalversion/storageclass.go
+++ b/pkg/client/informers/informers_generated/storage/internalversion/storageclass.go
@@ -19,10 +19,9 @@ limitations under the License.
 package internalversion
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	api "k8s.io/kubernetes/pkg/api"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	storage "k8s.io/kubernetes/pkg/apis/storage"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
@@ -46,18 +45,10 @@ func newStorageClassInformer(client internalclientset.Interface, resyncPeriod ti
 	sharedIndexInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Storage().StorageClasses().List(internalOptions)
+				return client.Storage().StorageClasses().List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				var internalOptions api.ListOptions
-				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.Storage().StorageClasses().Watch(internalOptions)
+				return client.Storage().StorageClasses().Watch(options)
 			},
 		},
 		&storage.StorageClass{},
diff --git a/pkg/client/informers/informers_generated/storage/v1beta1/BUILD b/pkg/client/informers/informers_generated/storage/v1beta1/BUILD
index be5ee57d88c..1142cd5e895 100644
--- a/pkg/client/informers/informers_generated/storage/v1beta1/BUILD
+++ b/pkg/client/informers/informers_generated/storage/v1beta1/BUILD
@@ -15,12 +15,12 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/v1:go_default_library",
         "//pkg/apis/storage/v1beta1:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/storage/v1beta1:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],
diff --git a/pkg/client/informers/informers_generated/storage/v1beta1/storageclass.go b/pkg/client/informers/informers_generated/storage/v1beta1/storageclass.go
index 3658e352835..d7e6ca12f39 100644
--- a/pkg/client/informers/informers_generated/storage/v1beta1/storageclass.go
+++ b/pkg/client/informers/informers_generated/storage/v1beta1/storageclass.go
@@ -19,9 +19,9 @@ limitations under the License.
 package v1beta1
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
-	v1 "k8s.io/kubernetes/pkg/api/v1"
 	storage_v1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
diff --git a/pkg/client/testing/core/BUILD b/pkg/client/testing/core/BUILD
index 4b880bed6a0..eec5a62d229 100644
--- a/pkg/client/testing/core/BUILD
+++ b/pkg/client/testing/core/BUILD
@@ -18,7 +18,6 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/v1:go_default_library",
         "//pkg/version:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/api/errors",
         "//vendor:k8s.io/apimachinery/pkg/api/meta",
diff --git a/pkg/client/typed/discovery/BUILD b/pkg/client/typed/discovery/BUILD
index d14274f1842..b0e57fec004 100644
--- a/pkg/client/typed/discovery/BUILD
+++ b/pkg/client/typed/discovery/BUILD
@@ -37,41 +37,27 @@ go_library(
 )
 
 go_test(
-    name = "go_default_test",
+    name = "go_default_xtest",
     srcs = [
         "discovery_client_test.go",
+        "helper_blackbox_test.go",
         "restmapper_test.go",
     ],
-    library = ":go_default_library",
-    tags = ["automanaged"],
-    deps = [
-        "//pkg/api:go_default_library",
-        "//pkg/api/v1:go_default_library",
-        "//pkg/client/restclient/fake:go_default_library",
-        "//vendor:github.com/emicklei/go-restful/swagger",
-        "//vendor:github.com/stretchr/testify/assert",
-        "//vendor:k8s.io/apimachinery/pkg/api/errors",
-        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
-        "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
-        "//vendor:k8s.io/apimachinery/pkg/util/sets",
-        "//vendor:k8s.io/apimachinery/pkg/version",
-        "//vendor:k8s.io/client-go/rest",
-    ],
-)
-
-go_test(
-    name = "go_default_xtest",
-    srcs = ["helper_blackbox_test.go"],
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
         "//pkg/api/testapi:go_default_library",
+        "//pkg/api/v1:go_default_library",
         "//pkg/client/restclient/fake:go_default_library",
         "//pkg/client/typed/discovery:go_default_library",
+        "//vendor:github.com/emicklei/go-restful/swagger",
+        "//vendor:github.com/stretchr/testify/assert",
+        "//vendor:k8s.io/apimachinery/pkg/api/errors",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/apimachinery/pkg/util/sets",
+        "//vendor:k8s.io/apimachinery/pkg/version",
         "//vendor:k8s.io/client-go/rest",
     ],
 )
diff --git a/pkg/client/typed/dynamic/BUILD b/pkg/client/typed/dynamic/BUILD
index bba04e7ba4e..d233726edb7 100644
--- a/pkg/client/typed/dynamic/BUILD
+++ b/pkg/client/typed/dynamic/BUILD
@@ -42,7 +42,6 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/v1:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
diff --git a/pkg/controller/certificates/BUILD b/pkg/controller/certificates/BUILD
index 2f4e7162810..64197ce2845 100644
--- a/pkg/controller/certificates/BUILD
+++ b/pkg/controller/certificates/BUILD
@@ -19,7 +19,6 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/v1:go_default_library",
         "//pkg/apis/certificates/v1beta1:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
@@ -34,6 +33,7 @@ go_library(
         "//vendor:github.com/cloudflare/cfssl/signer",
         "//vendor:github.com/cloudflare/cfssl/signer/local",
         "//vendor:github.com/golang/glog",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/util/runtime",
         "//vendor:k8s.io/apimachinery/pkg/util/wait",
diff --git a/pkg/genericapiserver/server/options/BUILD b/pkg/genericapiserver/server/options/BUILD
index b1c799b8713..158ceb2ef1f 100644
--- a/pkg/genericapiserver/server/options/BUILD
+++ b/pkg/genericapiserver/server/options/BUILD
@@ -26,6 +26,7 @@ go_library(
         "//pkg/util/config:go_default_library",
         "//vendor:github.com/golang/glog",
         "//vendor:github.com/spf13/pflag",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/apimachinery/pkg/util/net",
         "//vendor:k8s.io/apiserver/pkg/admission",
diff --git a/pkg/kubectl/metricsutil/BUILD b/pkg/kubectl/metricsutil/BUILD
index 2849462b0fc..2aeb00a00ff 100644
--- a/pkg/kubectl/metricsutil/BUILD
+++ b/pkg/kubectl/metricsutil/BUILD
@@ -20,6 +20,7 @@ go_library(
         "//pkg/api/validation:go_default_library",
         "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library",
         "//pkg/kubectl:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/labels",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/heapster/metrics/apis/metrics/v1alpha1",
diff --git a/pkg/kubelet/config/BUILD b/pkg/kubelet/config/BUILD
index f22a44fd60f..f6d850f5f41 100644
--- a/pkg/kubelet/config/BUILD
+++ b/pkg/kubelet/config/BUILD
@@ -37,6 +37,7 @@ go_library(
         "//pkg/util/hash:go_default_library",
         "//vendor:github.com/golang/glog",
         "//vendor:golang.org/x/exp/inotify",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/fields",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/types",
diff --git a/pkg/kubelet/server/BUILD b/pkg/kubelet/server/BUILD
index f26ecc7842c..60ea8b89d9b 100644
--- a/pkg/kubelet/server/BUILD
+++ b/pkg/kubelet/server/BUILD
@@ -66,7 +66,6 @@ go_test(
         "//pkg/kubelet/container/testing:go_default_library",
         "//pkg/kubelet/server/remotecommand:go_default_library",
         "//pkg/kubelet/server/stats:go_default_library",
-        "//pkg/kubelet/types:go_default_library",
         "//pkg/util/httpstream:go_default_library",
         "//pkg/util/httpstream/spdy:go_default_library",
         "//pkg/util/term:go_default_library",
diff --git a/pkg/kubelet/types/BUILD b/pkg/kubelet/types/BUILD
index 3cb18814aee..e93b7c34632 100644
--- a/pkg/kubelet/types/BUILD
+++ b/pkg/kubelet/types/BUILD
@@ -18,7 +18,10 @@ go_library(
         "types.go",
     ],
     tags = ["automanaged"],
-    deps = ["//pkg/api/v1:go_default_library"],
+    deps = [
+        "//pkg/api/v1:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
+    ],
 )
 
 go_test(
diff --git a/pkg/kubelet/util/csr/BUILD b/pkg/kubelet/util/csr/BUILD
index 7447f15a668..5dc685166d4 100644
--- a/pkg/kubelet/util/csr/BUILD
+++ b/pkg/kubelet/util/csr/BUILD
@@ -12,7 +12,6 @@ go_library(
     srcs = ["csr.go"],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/v1:go_default_library",
         "//pkg/apis/certificates/v1beta1:go_default_library",
         "//pkg/client/clientset_generated/clientset/typed/certificates/v1beta1:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
diff --git a/pkg/kubemark/BUILD b/pkg/kubemark/BUILD
index 23ce209e5d4..72dde32f894 100644
--- a/pkg/kubemark/BUILD
+++ b/pkg/kubemark/BUILD
@@ -41,6 +41,7 @@ go_library(
         "//pkg/volume/secret:go_default_library",
         "//test/utils:go_default_library",
         "//vendor:github.com/golang/glog",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/types",
     ],
 )
diff --git a/pkg/proxy/config/BUILD b/pkg/proxy/config/BUILD
index 650fc1b20e2..a243336bbf6 100644
--- a/pkg/proxy/config/BUILD
+++ b/pkg/proxy/config/BUILD
@@ -22,6 +22,7 @@ go_library(
         "//pkg/util/config:go_default_library",
         "//vendor:github.com/davecgh/go-spew/spew",
         "//vendor:github.com/golang/glog",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/fields",
         "//vendor:k8s.io/apimachinery/pkg/types",
     ],
diff --git a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD
index a8170fb8613..4b4594ff606 100644
--- a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD
+++ b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD
@@ -14,7 +14,6 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
-        "//pkg/api:go_default_library",
         "//pkg/apis/autoscaling:go_default_library",
         "//pkg/apis/autoscaling/v1:go_default_library",
         "//pkg/genericapiserver/registry/generic:go_default_library",
diff --git a/pkg/registry/extensions/networkpolicy/BUILD b/pkg/registry/extensions/networkpolicy/BUILD
index 0d5142698b9..ac64faf1a34 100644
--- a/pkg/registry/extensions/networkpolicy/BUILD
+++ b/pkg/registry/extensions/networkpolicy/BUILD
@@ -36,7 +36,6 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
-        "//pkg/api:go_default_library",
         "//pkg/apis/extensions:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apiserver/pkg/endpoints/request",
diff --git a/pkg/registry/extensions/networkpolicy/storage/BUILD b/pkg/registry/extensions/networkpolicy/storage/BUILD
index d3211414daf..f44f9ead752 100644
--- a/pkg/registry/extensions/networkpolicy/storage/BUILD
+++ b/pkg/registry/extensions/networkpolicy/storage/BUILD
@@ -14,7 +14,6 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
-        "//pkg/api:go_default_library",
         "//pkg/apis/extensions:go_default_library",
         "//pkg/genericapiserver/registry/generic:go_default_library",
         "//pkg/registry/registrytest:go_default_library",
diff --git a/pkg/registry/extensions/thirdpartyresourcedata/storage/BUILD b/pkg/registry/extensions/thirdpartyresourcedata/storage/BUILD
index a0e99ff4ef0..9e3734298ac 100644
--- a/pkg/registry/extensions/thirdpartyresourcedata/storage/BUILD
+++ b/pkg/registry/extensions/thirdpartyresourcedata/storage/BUILD
@@ -14,7 +14,6 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
-        "//pkg/api:go_default_library",
         "//pkg/apis/extensions:go_default_library",
         "//pkg/apis/extensions/v1beta1:go_default_library",
         "//pkg/genericapiserver/registry/generic:go_default_library",
diff --git a/pkg/registry/policy/poddisruptionbudget/BUILD b/pkg/registry/policy/poddisruptionbudget/BUILD
index 4d060fbef16..547817a6041 100644
--- a/pkg/registry/policy/poddisruptionbudget/BUILD
+++ b/pkg/registry/policy/poddisruptionbudget/BUILD
@@ -36,7 +36,6 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
-        "//pkg/api:go_default_library",
         "//pkg/apis/policy:go_default_library",
         "//pkg/util/intstr:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
diff --git a/pkg/storage/BUILD b/pkg/storage/BUILD
index 4ff44102c71..634621ea9ea 100644
--- a/pkg/storage/BUILD
+++ b/pkg/storage/BUILD
@@ -57,7 +57,6 @@ go_test(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/v1:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/api/errors",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
diff --git a/plugin/pkg/admission/initialresources/BUILD b/plugin/pkg/admission/initialresources/BUILD
index 9c0b6f0f5b3..4b9d47b8ed9 100644
--- a/plugin/pkg/admission/initialresources/BUILD
+++ b/plugin/pkg/admission/initialresources/BUILD
@@ -29,6 +29,7 @@ go_library(
         "//vendor:golang.org/x/oauth2/google",
         "//vendor:google.golang.org/api/cloudmonitoring/v2beta2",
         "//vendor:k8s.io/apimachinery/pkg/api/errors",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apiserver/pkg/admission",
         "//vendor:k8s.io/client-go/rest",
         "//vendor:k8s.io/client-go/tools/clientcmd",
diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/register_test.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/register_test.go
index a2082e797c6..151f99a0fb0 100644
--- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/register_test.go
+++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/register_test.go
@@ -1,3 +1,19 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package internalversion
 
 import (
diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types_swagger_doc_generated.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types_swagger_doc_generated.go
index f000655d947..43eb0f1145f 100644
--- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types_swagger_doc_generated.go
+++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types_swagger_doc_generated.go
@@ -140,6 +140,19 @@ func (ListMeta) SwaggerDoc() map[string]string {
 	return map_ListMeta
 }
 
+var map_ListOptions = map[string]string{
+	"":                "ListOptions is the query options to a standard REST list call.",
+	"labelSelector":   "A selector to restrict the list of returned objects by their labels. Defaults to everything.",
+	"fieldSelector":   "A selector to restrict the list of returned objects by their fields. Defaults to everything.",
+	"watch":           "Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.",
+	"resourceVersion": "When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history. When specified for list: - if unset, then the result is returned from remote storage based on quorum-read flag; - if it's 0, then we simply return what we currently have in cache, no guarantee; - if set to non zero, then the result is at least as fresh as given rv.",
+	"timeoutSeconds":  "Timeout for the list/watch call.",
+}
+
+func (ListOptions) SwaggerDoc() map[string]string {
+	return map_ListOptions
+}
+
 var map_ObjectMeta = map[string]string{
 	"":                           "ObjectMeta is metadata that all persisted resources must have, which includes all objects users must create.",
 	"name":                       "Name must be unique within a namespace. Is required when creating resources, although some resources may allow a client to request the generation of an appropriate name automatically. Name is primarily intended for creation idempotence and configuration definition. Cannot be updated. More info: http://kubernetes.io/docs/user-guide/identifiers#names",
diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/zz_generated.deepcopy.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/zz_generated.deepcopy.go
index 82545002399..fee73ef6d79 100644
--- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/zz_generated.deepcopy.go
+++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/zz_generated.deepcopy.go
@@ -47,6 +47,8 @@ func GetGeneratedDeepCopyFuncs() []conversion.GeneratedDeepCopyFunc {
 		{Fn: DeepCopy_v1_LabelSelector, InType: reflect.TypeOf(&LabelSelector{})},
 		{Fn: DeepCopy_v1_LabelSelectorRequirement, InType: reflect.TypeOf(&LabelSelectorRequirement{})},
 		{Fn: DeepCopy_v1_ListMeta, InType: reflect.TypeOf(&ListMeta{})},
+		{Fn: DeepCopy_v1_ListOptions, InType: reflect.TypeOf(&ListOptions{})},
+		{Fn: DeepCopy_v1_ObjectMeta, InType: reflect.TypeOf(&ObjectMeta{})},
 		{Fn: DeepCopy_v1_OwnerReference, InType: reflect.TypeOf(&OwnerReference{})},
 		{Fn: DeepCopy_v1_Patch, InType: reflect.TypeOf(&Patch{})},
 		{Fn: DeepCopy_v1_RootPaths, InType: reflect.TypeOf(&RootPaths{})},
@@ -69,16 +71,12 @@ func DeepCopy_v1_APIGroup(in interface{}, out interface{}, c *conversion.Cloner)
 		if in.Versions != nil {
 			in, out := &in.Versions, &out.Versions
 			*out = make([]GroupVersionForDiscovery, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		if in.ServerAddressByClientCIDRs != nil {
 			in, out := &in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs
 			*out = make([]ServerAddressByClientCIDR, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -93,8 +91,10 @@ func DeepCopy_v1_APIGroupList(in interface{}, out interface{}, c *conversion.Clo
 			in, out := &in.Groups, &out.Groups
 			*out = make([]APIGroup, len(*in))
 			for i := range *in {
-				if err := DeepCopy_v1_APIGroup(&(*in)[i], &(*out)[i], c); err != nil {
+				if newVal, err := c.DeepCopy(&(*in)[i]); err != nil {
 					return err
+				} else {
+					(*out)[i] = *newVal.(*APIGroup)
 				}
 			}
 		}
@@ -125,8 +125,10 @@ func DeepCopy_v1_APIResourceList(in interface{}, out interface{}, c *conversion.
 			in, out := &in.APIResources, &out.APIResources
 			*out = make([]APIResource, len(*in))
 			for i := range *in {
-				if err := DeepCopy_v1_APIResource(&(*in)[i], &(*out)[i], c); err != nil {
+				if newVal, err := c.DeepCopy(&(*in)[i]); err != nil {
 					return err
+				} else {
+					(*out)[i] = *newVal.(*APIResource)
 				}
 			}
 		}
@@ -147,9 +149,7 @@ func DeepCopy_v1_APIVersions(in interface{}, out interface{}, c *conversion.Clon
 		if in.ServerAddressByClientCIDRs != nil {
 			in, out := &in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs
 			*out = make([]ServerAddressByClientCIDR, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -269,8 +269,10 @@ func DeepCopy_v1_LabelSelector(in interface{}, out interface{}, c *conversion.Cl
 			in, out := &in.MatchExpressions, &out.MatchExpressions
 			*out = make([]LabelSelectorRequirement, len(*in))
 			for i := range *in {
-				if err := DeepCopy_v1_LabelSelectorRequirement(&(*in)[i], &(*out)[i], c); err != nil {
+				if newVal, err := c.DeepCopy(&(*in)[i]); err != nil {
 					return err
+				} else {
+					(*out)[i] = *newVal.(*LabelSelectorRequirement)
 				}
 			}
 		}
@@ -301,6 +303,70 @@ func DeepCopy_v1_ListMeta(in interface{}, out interface{}, c *conversion.Cloner)
 	}
 }
 
+func DeepCopy_v1_ListOptions(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*ListOptions)
+		out := out.(*ListOptions)
+		*out = *in
+		if in.TimeoutSeconds != nil {
+			in, out := &in.TimeoutSeconds, &out.TimeoutSeconds
+			*out = new(int64)
+			**out = **in
+		}
+		return nil
+	}
+}
+
+func DeepCopy_v1_ObjectMeta(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*ObjectMeta)
+		out := out.(*ObjectMeta)
+		*out = *in
+		out.CreationTimestamp = in.CreationTimestamp.DeepCopy()
+		if in.DeletionTimestamp != nil {
+			in, out := &in.DeletionTimestamp, &out.DeletionTimestamp
+			*out = new(Time)
+			**out = (*in).DeepCopy()
+		}
+		if in.DeletionGracePeriodSeconds != nil {
+			in, out := &in.DeletionGracePeriodSeconds, &out.DeletionGracePeriodSeconds
+			*out = new(int64)
+			**out = **in
+		}
+		if in.Labels != nil {
+			in, out := &in.Labels, &out.Labels
+			*out = make(map[string]string)
+			for key, val := range *in {
+				(*out)[key] = val
+			}
+		}
+		if in.Annotations != nil {
+			in, out := &in.Annotations, &out.Annotations
+			*out = make(map[string]string)
+			for key, val := range *in {
+				(*out)[key] = val
+			}
+		}
+		if in.OwnerReferences != nil {
+			in, out := &in.OwnerReferences, &out.OwnerReferences
+			*out = make([]OwnerReference, len(*in))
+			for i := range *in {
+				if newVal, err := c.DeepCopy(&(*in)[i]); err != nil {
+					return err
+				} else {
+					(*out)[i] = *newVal.(*OwnerReference)
+				}
+			}
+		}
+		if in.Finalizers != nil {
+			in, out := &in.Finalizers, &out.Finalizers
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		}
+		return nil
+	}
+}
+
 func DeepCopy_v1_OwnerReference(in interface{}, out interface{}, c *conversion.Cloner) error {
 	{
 		in := in.(*OwnerReference)
@@ -354,9 +420,10 @@ func DeepCopy_v1_Status(in interface{}, out interface{}, c *conversion.Cloner) e
 		*out = *in
 		if in.Details != nil {
 			in, out := &in.Details, &out.Details
-			*out = new(StatusDetails)
-			if err := DeepCopy_v1_StatusDetails(*in, *out, c); err != nil {
+			if newVal, err := c.DeepCopy(*in); err != nil {
 				return err
+			} else {
+				*out = newVal.(*StatusDetails)
 			}
 		}
 		return nil
@@ -380,9 +447,7 @@ func DeepCopy_v1_StatusDetails(in interface{}, out interface{}, c *conversion.Cl
 		if in.Causes != nil {
 			in, out := &in.Causes, &out.Causes
 			*out = make([]StatusCause, len(*in))
-			for i := range *in {
-				(*out)[i] = (*in)[i]
-			}
+			copy(*out, *in)
 		}
 		return nil
 	}
@@ -420,8 +485,10 @@ func DeepCopy_v1_WatchEvent(in interface{}, out interface{}, c *conversion.Clone
 		in := in.(*WatchEvent)
 		out := out.(*WatchEvent)
 		*out = *in
-		if err := runtime.DeepCopy_runtime_RawExtension(&in.Object, &out.Object, c); err != nil {
+		if newVal, err := c.DeepCopy(&in.Object); err != nil {
 			return err
+		} else {
+			out.Object = *newVal.(*runtime.RawExtension)
 		}
 		return nil
 	}
diff --git a/test/images/clusterapi-tester/BUILD b/test/images/clusterapi-tester/BUILD
index bdcf0e3d303..36f19f37ad4 100644
--- a/test/images/clusterapi-tester/BUILD
+++ b/test/images/clusterapi-tester/BUILD
@@ -19,10 +19,8 @@ go_library(
     srcs = ["main.go"],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/fields",
-        "//vendor:k8s.io/apimachinery/pkg/labels",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/client-go/rest",
     ],
 )
diff --git a/vendor/BUILD b/vendor/BUILD
index 037217c8560..8cf893c82be 100644
--- a/vendor/BUILD
+++ b/vendor/BUILD
@@ -8001,6 +8001,7 @@ go_test(
         "k8s.io/apimachinery/pkg/apis/meta/v1/duration_test.go",
         "k8s.io/apimachinery/pkg/apis/meta/v1/group_version_test.go",
         "k8s.io/apimachinery/pkg/apis/meta/v1/helpers_test.go",
+        "k8s.io/apimachinery/pkg/apis/meta/v1/labels_test.go",
         "k8s.io/apimachinery/pkg/apis/meta/v1/time_test.go",
         "k8s.io/apimachinery/pkg/apis/meta/v1/types_test.go",
     ],
@@ -8021,6 +8022,7 @@ go_library(
         "k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go",
         "k8s.io/apimachinery/pkg/apis/meta/v1/group_version.go",
         "k8s.io/apimachinery/pkg/apis/meta/v1/helpers.go",
+        "k8s.io/apimachinery/pkg/apis/meta/v1/labels.go",
         "k8s.io/apimachinery/pkg/apis/meta/v1/meta.go",
         "k8s.io/apimachinery/pkg/apis/meta/v1/register.go",
         "k8s.io/apimachinery/pkg/apis/meta/v1/time.go",
@@ -8039,6 +8041,7 @@ go_library(
         "//vendor:github.com/gogo/protobuf/sortkeys",
         "//vendor:github.com/google/gofuzz",
         "//vendor:k8s.io/apimachinery/pkg/conversion",
+        "//vendor:k8s.io/apimachinery/pkg/fields",
         "//vendor:k8s.io/apimachinery/pkg/labels",
         "//vendor:k8s.io/apimachinery/pkg/openapi",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
@@ -9015,7 +9018,7 @@ go_test(
     srcs = ["k8s.io/apiserver/pkg/endpoints/request/context_test.go"],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/types",
         "//vendor:k8s.io/apiserver/pkg/authentication/user",
         "//vendor:k8s.io/apiserver/pkg/endpoints/request",
@@ -10210,6 +10213,7 @@ go_library(
         "k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go",
         "k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/apis/meta/v1/group_version.go",
         "k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/apis/meta/v1/helpers.go",
+        "k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/apis/meta/v1/labels.go",
         "k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/apis/meta/v1/meta.go",
         "k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/apis/meta/v1/register.go",
         "k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/apis/meta/v1/time.go",
@@ -10228,6 +10232,7 @@ go_library(
         "//vendor:github.com/gogo/protobuf/sortkeys",
         "//vendor:github.com/google/gofuzz",
         "//vendor:k8s.io/apimachinery/pkg/conversion",
+        "//vendor:k8s.io/apimachinery/pkg/fields",
         "//vendor:k8s.io/apimachinery/pkg/labels",
         "//vendor:k8s.io/apimachinery/pkg/openapi",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
@@ -10599,29 +10604,6 @@ go_library(
     tags = ["automanaged"],
 )
 
-go_test(
-    name = "k8s.io/client-go/discovery_test",
-    srcs = [
-        "k8s.io/client-go/discovery/discovery_client_test.go",
-        "k8s.io/client-go/discovery/restmapper_test.go",
-    ],
-    library = ":k8s.io/client-go/discovery",
-    tags = ["automanaged"],
-    deps = [
-        "//vendor:github.com/emicklei/go-restful/swagger",
-        "//vendor:github.com/stretchr/testify/assert",
-        "//vendor:k8s.io/apimachinery/pkg/api/errors",
-        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
-        "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
-        "//vendor:k8s.io/apimachinery/pkg/util/sets",
-        "//vendor:k8s.io/apimachinery/pkg/version",
-        "//vendor:k8s.io/client-go/pkg/api",
-        "//vendor:k8s.io/client-go/pkg/api/v1",
-        "//vendor:k8s.io/client-go/rest",
-        "//vendor:k8s.io/client-go/rest/fake",
-    ],
-)
-
 go_library(
     name = "k8s.io/client-go/discovery",
     srcs = [
@@ -10652,16 +10634,25 @@ go_library(
 
 go_test(
     name = "k8s.io/client-go/discovery_xtest",
-    srcs = ["k8s.io/client-go/discovery/helper_blackbox_test.go"],
+    srcs = [
+        "k8s.io/client-go/discovery/discovery_client_test.go",
+        "k8s.io/client-go/discovery/helper_blackbox_test.go",
+        "k8s.io/client-go/discovery/restmapper_test.go",
+    ],
     tags = ["automanaged"],
     deps = [
+        "//vendor:github.com/emicklei/go-restful/swagger",
+        "//vendor:github.com/stretchr/testify/assert",
+        "//vendor:k8s.io/apimachinery/pkg/api/errors",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/apimachinery/pkg/util/sets",
+        "//vendor:k8s.io/apimachinery/pkg/version",
         "//vendor:k8s.io/client-go/discovery",
         "//vendor:k8s.io/client-go/pkg/api",
         "//vendor:k8s.io/client-go/pkg/api/testapi",
+        "//vendor:k8s.io/client-go/pkg/api/v1",
         "//vendor:k8s.io/client-go/rest",
         "//vendor:k8s.io/client-go/rest/fake",
     ],
@@ -10699,7 +10690,6 @@ go_test(
         "//vendor:k8s.io/apimachinery/pkg/runtime/serializer/streaming",
         "//vendor:k8s.io/apimachinery/pkg/types",
         "//vendor:k8s.io/apimachinery/pkg/watch",
-        "//vendor:k8s.io/client-go/pkg/api/v1",
         "//vendor:k8s.io/client-go/rest",
         "//vendor:k8s.io/client-go/rest/watch",
     ],
@@ -11511,7 +11501,6 @@ go_library(
         "//vendor:k8s.io/apimachinery/pkg/api/meta",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/conversion",
-        "//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",
@@ -12454,7 +12443,10 @@ go_library(
         "k8s.io/client-go/pkg/kubelet/types/types.go",
     ],
     tags = ["automanaged"],
-    deps = ["//vendor:k8s.io/client-go/pkg/api/v1"],
+    deps = [
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
+        "//vendor:k8s.io/client-go/pkg/api/v1",
+    ],
 )
 
 go_library(
@@ -12923,7 +12915,6 @@ go_library(
         "//vendor:k8s.io/apimachinery/pkg/version",
         "//vendor:k8s.io/apimachinery/pkg/watch",
         "//vendor:k8s.io/client-go/pkg/api",
-        "//vendor:k8s.io/client-go/pkg/api/v1",
         "//vendor:k8s.io/client-go/pkg/version",
         "//vendor:k8s.io/client-go/rest",
     ],
@@ -13009,7 +13000,6 @@ go_library(
         "//vendor:k8s.io/apimachinery/pkg/util/wait",
         "//vendor:k8s.io/apimachinery/pkg/watch",
         "//vendor:k8s.io/client-go/pkg/api",
-        "//vendor:k8s.io/client-go/pkg/api/v1",
         "//vendor:k8s.io/client-go/pkg/util/clock",
         "//vendor:k8s.io/client-go/rest",
     ],
@@ -13724,3 +13714,34 @@ go_library(
     srcs = ["github.com/armon/circbuf/circbuf.go"],
     tags = ["automanaged"],
 )
+
+go_test(
+    name = "k8s.io/apimachinery/pkg/apis/meta/internalversion_test",
+    srcs = ["k8s.io/apimachinery/pkg/apis/meta/internalversion/register_test.go"],
+    library = ":k8s.io/apimachinery/pkg/apis/meta/internalversion",
+    tags = ["automanaged"],
+    deps = [
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
+        "//vendor:k8s.io/apimachinery/pkg/util/diff",
+    ],
+)
+
+go_library(
+    name = "k8s.io/apimachinery/pkg/apis/meta/internalversion",
+    srcs = [
+        "k8s.io/apimachinery/pkg/apis/meta/internalversion/conversion.go",
+        "k8s.io/apimachinery/pkg/apis/meta/internalversion/register.go",
+        "k8s.io/apimachinery/pkg/apis/meta/internalversion/types.go",
+    ],
+    tags = ["automanaged"],
+    deps = [
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
+        "//vendor:k8s.io/apimachinery/pkg/conversion",
+        "//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",
+        "//vendor:k8s.io/apimachinery/pkg/runtime/serializer",
+        "//vendor:k8s.io/apimachinery/pkg/util/validation/field",
+    ],
+)