update list-gen to not import internal package in external listers

cmd/libs/go2idl/lister-gen/generators/lister.go

@@ -220,7 +220,7 @@ func (g *listerGenerator) GenerateType(c *generator.Context, t *types.Type, w io
 
 	glog.V(5).Infof("processing type %v", t)
 	m := map[string]interface{}{
-		"Resource":   c.Universe.Function(types.Name{Package: g.internalGVPkg, Name: "Resource"}),
+		"Resource":   c.Universe.Function(types.Name{Package: t.Name.Package, Name: "Resource"}),
 		"type":       t,
 		"objectMeta": g.objectMeta,
 	}

pkg/apis/autoscaling/v2alpha1/register.go

@@ -28,6 +28,11 @@ const GroupName = "autoscaling"
 // SchemeGroupVersion is group version used to register these objects
 var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v2alpha1"}
 
+// Resource takes an unqualified resource and returns a Group qualified GroupResource
+func Resource(resource string) schema.GroupResource {
+	return SchemeGroupVersion.WithResource(resource).GroupResource()
+}
+
 var (
 	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs)
 	AddToScheme   = SchemeBuilder.AddToScheme

pkg/client/listers/apps/v1beta1/deployment.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	apps "k8s.io/kubernetes/pkg/apis/apps"
 	v1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1"
 )
 
@@ -89,7 +88,7 @@ func (s deploymentNamespaceLister) Get(name string) (*v1beta1.Deployment, error)
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(apps.Resource("deployment"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("deployment"), name)
 	}
 	return obj.(*v1beta1.Deployment), nil
 }

pkg/client/listers/apps/v1beta1/scale.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	apps "k8s.io/kubernetes/pkg/apis/apps"
 	v1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1"
 )
 
@@ -89,7 +88,7 @@ func (s scaleNamespaceLister) Get(name string) (*v1beta1.Scale, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(apps.Resource("scale"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("scale"), name)
 	}
 	return obj.(*v1beta1.Scale), nil
 }

pkg/client/listers/apps/v1beta1/statefulset.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	apps "k8s.io/kubernetes/pkg/apis/apps"
 	v1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1"
 )
 
@@ -89,7 +88,7 @@ func (s statefulSetNamespaceLister) Get(name string) (*v1beta1.StatefulSet, erro
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(apps.Resource("statefulset"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("statefulset"), name)
 	}
 	return obj.(*v1beta1.StatefulSet), nil
 }

pkg/client/listers/authentication/v1/tokenreview.go

@@ -23,7 +23,6 @@ import (
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	authentication "k8s.io/kubernetes/pkg/apis/authentication"
 	v1 "k8s.io/kubernetes/pkg/apis/authentication/v1"
 )
 
@@ -62,7 +61,7 @@ func (s *tokenReviewLister) Get(name string) (*v1.TokenReview, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(authentication.Resource("tokenreview"), name)
+		return nil, errors.NewNotFound(v1.Resource("tokenreview"), name)
 	}
 	return obj.(*v1.TokenReview), nil
 }

pkg/client/listers/authentication/v1beta1/tokenreview.go

@@ -23,7 +23,6 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	authentication "k8s.io/kubernetes/pkg/apis/authentication"
 	v1beta1 "k8s.io/kubernetes/pkg/apis/authentication/v1beta1"
 )
 
@@ -62,7 +61,7 @@ func (s *tokenReviewLister) Get(name string) (*v1beta1.TokenReview, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(authentication.Resource("tokenreview"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("tokenreview"), name)
 	}
 	return obj.(*v1beta1.TokenReview), nil
 }

pkg/client/listers/authorization/v1/localsubjectaccessreview.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	authorization "k8s.io/kubernetes/pkg/apis/authorization"
 	v1 "k8s.io/kubernetes/pkg/apis/authorization/v1"
 )
 
@@ -89,7 +88,7 @@ func (s localSubjectAccessReviewNamespaceLister) Get(name string) (*v1.LocalSubj
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(authorization.Resource("localsubjectaccessreview"), name)
+		return nil, errors.NewNotFound(v1.Resource("localsubjectaccessreview"), name)
 	}
 	return obj.(*v1.LocalSubjectAccessReview), nil
 }

pkg/client/listers/authorization/v1/selfsubjectaccessreview.go

@@ -23,7 +23,6 @@ import (
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	authorization "k8s.io/kubernetes/pkg/apis/authorization"
 	v1 "k8s.io/kubernetes/pkg/apis/authorization/v1"
 )
 
@@ -62,7 +61,7 @@ func (s *selfSubjectAccessReviewLister) Get(name string) (*v1.SelfSubjectAccessR
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(authorization.Resource("selfsubjectaccessreview"), name)
+		return nil, errors.NewNotFound(v1.Resource("selfsubjectaccessreview"), name)
 	}
 	return obj.(*v1.SelfSubjectAccessReview), nil
 }

pkg/client/listers/authorization/v1/subjectaccessreview.go

@@ -23,7 +23,6 @@ import (
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	authorization "k8s.io/kubernetes/pkg/apis/authorization"
 	v1 "k8s.io/kubernetes/pkg/apis/authorization/v1"
 )
 
@@ -62,7 +61,7 @@ func (s *subjectAccessReviewLister) Get(name string) (*v1.SubjectAccessReview, e
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(authorization.Resource("subjectaccessreview"), name)
+		return nil, errors.NewNotFound(v1.Resource("subjectaccessreview"), name)
 	}
 	return obj.(*v1.SubjectAccessReview), nil
 }

pkg/client/listers/authorization/v1beta1/localsubjectaccessreview.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	authorization "k8s.io/kubernetes/pkg/apis/authorization"
 	v1beta1 "k8s.io/kubernetes/pkg/apis/authorization/v1beta1"
 )
 
@@ -89,7 +88,7 @@ func (s localSubjectAccessReviewNamespaceLister) Get(name string) (*v1beta1.Loca
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(authorization.Resource("localsubjectaccessreview"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("localsubjectaccessreview"), name)
 	}
 	return obj.(*v1beta1.LocalSubjectAccessReview), nil
 }

pkg/client/listers/authorization/v1beta1/selfsubjectaccessreview.go

@@ -23,7 +23,6 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	authorization "k8s.io/kubernetes/pkg/apis/authorization"
 	v1beta1 "k8s.io/kubernetes/pkg/apis/authorization/v1beta1"
 )
 
@@ -62,7 +61,7 @@ func (s *selfSubjectAccessReviewLister) Get(name string) (*v1beta1.SelfSubjectAc
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(authorization.Resource("selfsubjectaccessreview"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("selfsubjectaccessreview"), name)
 	}
 	return obj.(*v1beta1.SelfSubjectAccessReview), nil
 }

pkg/client/listers/authorization/v1beta1/subjectaccessreview.go

@@ -23,7 +23,6 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	authorization "k8s.io/kubernetes/pkg/apis/authorization"
 	v1beta1 "k8s.io/kubernetes/pkg/apis/authorization/v1beta1"
 )
 
@@ -62,7 +61,7 @@ func (s *subjectAccessReviewLister) Get(name string) (*v1beta1.SubjectAccessRevi
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(authorization.Resource("subjectaccessreview"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("subjectaccessreview"), name)
 	}
 	return obj.(*v1beta1.SubjectAccessReview), nil
 }

pkg/client/listers/autoscaling/v1/horizontalpodautoscaler.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling"
 	v1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1"
 )
 
@@ -89,7 +88,7 @@ func (s horizontalPodAutoscalerNamespaceLister) Get(name string) (*v1.Horizontal
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(autoscaling.Resource("horizontalpodautoscaler"), name)
+		return nil, errors.NewNotFound(v1.Resource("horizontalpodautoscaler"), name)
 	}
 	return obj.(*v1.HorizontalPodAutoscaler), nil
 }

pkg/client/listers/autoscaling/v2alpha1/horizontalpodautoscaler.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling"
 	v2alpha1 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1"
 )
 
@@ -89,7 +88,7 @@ func (s horizontalPodAutoscalerNamespaceLister) Get(name string) (*v2alpha1.Hori
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(autoscaling.Resource("horizontalpodautoscaler"), name)
+		return nil, errors.NewNotFound(v2alpha1.Resource("horizontalpodautoscaler"), name)
 	}
 	return obj.(*v2alpha1.HorizontalPodAutoscaler), nil
 }

pkg/client/listers/batch/v1/job.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	batch "k8s.io/kubernetes/pkg/apis/batch"
 	v1 "k8s.io/kubernetes/pkg/apis/batch/v1"
 )
 
@@ -89,7 +88,7 @@ func (s jobNamespaceLister) Get(name string) (*v1.Job, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(batch.Resource("job"), name)
+		return nil, errors.NewNotFound(v1.Resource("job"), name)
 	}
 	return obj.(*v1.Job), nil
 }

pkg/client/listers/batch/v2alpha1/cronjob.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	batch "k8s.io/kubernetes/pkg/apis/batch"
 	v2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1"
 )
 
@@ -89,7 +88,7 @@ func (s cronJobNamespaceLister) Get(name string) (*v2alpha1.CronJob, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(batch.Resource("cronjob"), name)
+		return nil, errors.NewNotFound(v2alpha1.Resource("cronjob"), name)
 	}
 	return obj.(*v2alpha1.CronJob), nil
 }

pkg/client/listers/certificates/v1beta1/certificatesigningrequest.go

@@ -23,7 +23,6 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	certificates "k8s.io/kubernetes/pkg/apis/certificates"
 	v1beta1 "k8s.io/kubernetes/pkg/apis/certificates/v1beta1"
 )
 
@@ -62,7 +61,7 @@ func (s *certificateSigningRequestLister) Get(name string) (*v1beta1.Certificate
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(certificates.Resource("certificatesigningrequest"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("certificatesigningrequest"), name)
 	}
 	return obj.(*v1beta1.CertificateSigningRequest), nil
 }

pkg/client/listers/core/v1/componentstatus.go

@@ -23,7 +23,6 @@ import (
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	api "k8s.io/kubernetes/pkg/api"
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 )
 
@@ -62,7 +61,7 @@ func (s *componentStatusLister) Get(name string) (*v1.ComponentStatus, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("componentstatus"), name)
+		return nil, errors.NewNotFound(v1.Resource("componentstatus"), name)
 	}
 	return obj.(*v1.ComponentStatus), nil
 }

pkg/client/listers/core/v1/configmap.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	api "k8s.io/kubernetes/pkg/api"
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 )
 
@@ -89,7 +88,7 @@ func (s configMapNamespaceLister) Get(name string) (*v1.ConfigMap, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("configmap"), name)
+		return nil, errors.NewNotFound(v1.Resource("configmap"), name)
 	}
 	return obj.(*v1.ConfigMap), nil
 }

pkg/client/listers/core/v1/endpoints.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	api "k8s.io/kubernetes/pkg/api"
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 )
 
@@ -89,7 +88,7 @@ func (s endpointsNamespaceLister) Get(name string) (*v1.Endpoints, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("endpoints"), name)
+		return nil, errors.NewNotFound(v1.Resource("endpoints"), name)
 	}
 	return obj.(*v1.Endpoints), nil
 }

pkg/client/listers/core/v1/event.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	api "k8s.io/kubernetes/pkg/api"
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 )
 
@@ -89,7 +88,7 @@ func (s eventNamespaceLister) Get(name string) (*v1.Event, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("event"), name)
+		return nil, errors.NewNotFound(v1.Resource("event"), name)
 	}
 	return obj.(*v1.Event), nil
 }

pkg/client/listers/core/v1/limitrange.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	api "k8s.io/kubernetes/pkg/api"
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 )
 
@@ -89,7 +88,7 @@ func (s limitRangeNamespaceLister) Get(name string) (*v1.LimitRange, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("limitrange"), name)
+		return nil, errors.NewNotFound(v1.Resource("limitrange"), name)
 	}
 	return obj.(*v1.LimitRange), nil
 }

pkg/client/listers/core/v1/namespace.go

@@ -23,7 +23,6 @@ import (
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	api "k8s.io/kubernetes/pkg/api"
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 )
 
@@ -62,7 +61,7 @@ func (s *namespaceLister) Get(name string) (*v1.Namespace, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("namespace"), name)
+		return nil, errors.NewNotFound(v1.Resource("namespace"), name)
 	}
 	return obj.(*v1.Namespace), nil
 }

pkg/client/listers/core/v1/node.go

@@ -23,7 +23,6 @@ import (
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	api "k8s.io/kubernetes/pkg/api"
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 )
 
@@ -62,7 +61,7 @@ func (s *nodeLister) Get(name string) (*v1.Node, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("node"), name)
+		return nil, errors.NewNotFound(v1.Resource("node"), name)
 	}
 	return obj.(*v1.Node), nil
 }

pkg/client/listers/core/v1/persistentvolume.go

@@ -23,7 +23,6 @@ import (
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	api "k8s.io/kubernetes/pkg/api"
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 )
 
@@ -62,7 +61,7 @@ func (s *persistentVolumeLister) Get(name string) (*v1.PersistentVolume, error)
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("persistentvolume"), name)
+		return nil, errors.NewNotFound(v1.Resource("persistentvolume"), name)
 	}
 	return obj.(*v1.PersistentVolume), nil
 }

pkg/client/listers/core/v1/persistentvolumeclaim.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	api "k8s.io/kubernetes/pkg/api"
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 )
 
@@ -89,7 +88,7 @@ func (s persistentVolumeClaimNamespaceLister) Get(name string) (*v1.PersistentVo
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("persistentvolumeclaim"), name)
+		return nil, errors.NewNotFound(v1.Resource("persistentvolumeclaim"), name)
 	}
 	return obj.(*v1.PersistentVolumeClaim), nil
 }

pkg/client/listers/core/v1/pod.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	api "k8s.io/kubernetes/pkg/api"
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 )
 
@@ -89,7 +88,7 @@ func (s podNamespaceLister) Get(name string) (*v1.Pod, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("pod"), name)
+		return nil, errors.NewNotFound(v1.Resource("pod"), name)
 	}
 	return obj.(*v1.Pod), nil
 }

pkg/client/listers/core/v1/podtemplate.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	api "k8s.io/kubernetes/pkg/api"
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 )
 
@@ -89,7 +88,7 @@ func (s podTemplateNamespaceLister) Get(name string) (*v1.PodTemplate, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("podtemplate"), name)
+		return nil, errors.NewNotFound(v1.Resource("podtemplate"), name)
 	}
 	return obj.(*v1.PodTemplate), nil
 }

pkg/client/listers/core/v1/replicationcontroller.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	api "k8s.io/kubernetes/pkg/api"
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 )
 
@@ -89,7 +88,7 @@ func (s replicationControllerNamespaceLister) Get(name string) (*v1.ReplicationC
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("replicationcontroller"), name)
+		return nil, errors.NewNotFound(v1.Resource("replicationcontroller"), name)
 	}
 	return obj.(*v1.ReplicationController), nil
 }

pkg/client/listers/core/v1/resourcequota.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	api "k8s.io/kubernetes/pkg/api"
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 )
 
@@ -89,7 +88,7 @@ func (s resourceQuotaNamespaceLister) Get(name string) (*v1.ResourceQuota, error
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("resourcequota"), name)
+		return nil, errors.NewNotFound(v1.Resource("resourcequota"), name)
 	}
 	return obj.(*v1.ResourceQuota), nil
 }

pkg/client/listers/core/v1/secret.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	api "k8s.io/kubernetes/pkg/api"
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 )
 
@@ -89,7 +88,7 @@ func (s secretNamespaceLister) Get(name string) (*v1.Secret, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("secret"), name)
+		return nil, errors.NewNotFound(v1.Resource("secret"), name)
 	}
 	return obj.(*v1.Secret), nil
 }

pkg/client/listers/core/v1/service.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	api "k8s.io/kubernetes/pkg/api"
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 )
 
@@ -89,7 +88,7 @@ func (s serviceNamespaceLister) Get(name string) (*v1.Service, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("service"), name)
+		return nil, errors.NewNotFound(v1.Resource("service"), name)
 	}
 	return obj.(*v1.Service), nil
 }

pkg/client/listers/core/v1/serviceaccount.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	api "k8s.io/kubernetes/pkg/api"
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 )
 
@@ -89,7 +88,7 @@ func (s serviceAccountNamespaceLister) Get(name string) (*v1.ServiceAccount, err
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("serviceaccount"), name)
+		return nil, errors.NewNotFound(v1.Resource("serviceaccount"), name)
 	}
 	return obj.(*v1.ServiceAccount), nil
 }

pkg/client/listers/extensions/v1beta1/daemonset.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 )
 
@@ -89,7 +88,7 @@ func (s daemonSetNamespaceLister) Get(name string) (*v1beta1.DaemonSet, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(extensions.Resource("daemonset"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("daemonset"), name)
 	}
 	return obj.(*v1beta1.DaemonSet), nil
 }

pkg/client/listers/extensions/v1beta1/deployment.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 )
 
@@ -89,7 +88,7 @@ func (s deploymentNamespaceLister) Get(name string) (*v1beta1.Deployment, error)
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(extensions.Resource("deployment"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("deployment"), name)
 	}
 	return obj.(*v1beta1.Deployment), nil
 }

pkg/client/listers/extensions/v1beta1/ingress.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 )
 
@@ -89,7 +88,7 @@ func (s ingressNamespaceLister) Get(name string) (*v1beta1.Ingress, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(extensions.Resource("ingress"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("ingress"), name)
 	}
 	return obj.(*v1beta1.Ingress), nil
 }

pkg/client/listers/extensions/v1beta1/podsecuritypolicy.go

@@ -23,7 +23,6 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 )
 
@@ -62,7 +61,7 @@ func (s *podSecurityPolicyLister) Get(name string) (*v1beta1.PodSecurityPolicy,
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(extensions.Resource("podsecuritypolicy"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("podsecuritypolicy"), name)
 	}
 	return obj.(*v1beta1.PodSecurityPolicy), nil
 }

pkg/client/listers/extensions/v1beta1/replicaset.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 )
 
@@ -89,7 +88,7 @@ func (s replicaSetNamespaceLister) Get(name string) (*v1beta1.ReplicaSet, error)
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(extensions.Resource("replicaset"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("replicaset"), name)
 	}
 	return obj.(*v1beta1.ReplicaSet), nil
 }

pkg/client/listers/extensions/v1beta1/scale.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 )
 
@@ -89,7 +88,7 @@ func (s scaleNamespaceLister) Get(name string) (*v1beta1.Scale, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(extensions.Resource("scale"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("scale"), name)
 	}
 	return obj.(*v1beta1.Scale), nil
 }

pkg/client/listers/extensions/v1beta1/thirdpartyresource.go

@@ -23,7 +23,6 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 )
 
@@ -62,7 +61,7 @@ func (s *thirdPartyResourceLister) Get(name string) (*v1beta1.ThirdPartyResource
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(extensions.Resource("thirdpartyresource"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("thirdpartyresource"), name)
 	}
 	return obj.(*v1beta1.ThirdPartyResource), nil
 }

pkg/client/listers/imagepolicy/v1alpha1/imagereview.go

@@ -23,7 +23,6 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	imagepolicy "k8s.io/kubernetes/pkg/apis/imagepolicy"
 	v1alpha1 "k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1"
 )
 
@@ -62,7 +61,7 @@ func (s *imageReviewLister) Get(name string) (*v1alpha1.ImageReview, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(imagepolicy.Resource("imagereview"), name)
+		return nil, errors.NewNotFound(v1alpha1.Resource("imagereview"), name)
 	}
 	return obj.(*v1alpha1.ImageReview), nil
 }

pkg/client/listers/policy/v1alpha1/poddisruptionbudget.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	policy "k8s.io/kubernetes/pkg/apis/policy"
 	v1alpha1 "k8s.io/kubernetes/pkg/apis/policy/v1alpha1"
 )
 
@@ -89,7 +88,7 @@ func (s podDisruptionBudgetNamespaceLister) Get(name string) (*v1alpha1.PodDisru
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(policy.Resource("poddisruptionbudget"), name)
+		return nil, errors.NewNotFound(v1alpha1.Resource("poddisruptionbudget"), name)
 	}
 	return obj.(*v1alpha1.PodDisruptionBudget), nil
 }

pkg/client/listers/policy/v1beta1/eviction.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	policy "k8s.io/kubernetes/pkg/apis/policy"
 	v1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1"
 )
 
@@ -89,7 +88,7 @@ func (s evictionNamespaceLister) Get(name string) (*v1beta1.Eviction, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(policy.Resource("eviction"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("eviction"), name)
 	}
 	return obj.(*v1beta1.Eviction), nil
 }

pkg/client/listers/policy/v1beta1/poddisruptionbudget.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	policy "k8s.io/kubernetes/pkg/apis/policy"
 	v1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1"
 )
 
@@ -89,7 +88,7 @@ func (s podDisruptionBudgetNamespaceLister) Get(name string) (*v1beta1.PodDisrup
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(policy.Resource("poddisruptionbudget"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("poddisruptionbudget"), name)
 	}
 	return obj.(*v1beta1.PodDisruptionBudget), nil
 }

pkg/client/listers/rbac/v1alpha1/clusterrole.go

@@ -23,7 +23,6 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	rbac "k8s.io/kubernetes/pkg/apis/rbac"
 	v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
 )
 
@@ -62,7 +61,7 @@ func (s *clusterRoleLister) Get(name string) (*v1alpha1.ClusterRole, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(rbac.Resource("clusterrole"), name)
+		return nil, errors.NewNotFound(v1alpha1.Resource("clusterrole"), name)
 	}
 	return obj.(*v1alpha1.ClusterRole), nil
 }

pkg/client/listers/rbac/v1alpha1/clusterrolebinding.go

@@ -23,7 +23,6 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	rbac "k8s.io/kubernetes/pkg/apis/rbac"
 	v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
 )
 
@@ -62,7 +61,7 @@ func (s *clusterRoleBindingLister) Get(name string) (*v1alpha1.ClusterRoleBindin
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(rbac.Resource("clusterrolebinding"), name)
+		return nil, errors.NewNotFound(v1alpha1.Resource("clusterrolebinding"), name)
 	}
 	return obj.(*v1alpha1.ClusterRoleBinding), nil
 }

pkg/client/listers/rbac/v1alpha1/role.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	rbac "k8s.io/kubernetes/pkg/apis/rbac"
 	v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
 )
 
@@ -89,7 +88,7 @@ func (s roleNamespaceLister) Get(name string) (*v1alpha1.Role, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(rbac.Resource("role"), name)
+		return nil, errors.NewNotFound(v1alpha1.Resource("role"), name)
 	}
 	return obj.(*v1alpha1.Role), nil
 }

pkg/client/listers/rbac/v1alpha1/rolebinding.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	rbac "k8s.io/kubernetes/pkg/apis/rbac"
 	v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
 )
 
@@ -89,7 +88,7 @@ func (s roleBindingNamespaceLister) Get(name string) (*v1alpha1.RoleBinding, err
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(rbac.Resource("rolebinding"), name)
+		return nil, errors.NewNotFound(v1alpha1.Resource("rolebinding"), name)
 	}
 	return obj.(*v1alpha1.RoleBinding), nil
 }

pkg/client/listers/rbac/v1beta1/clusterrole.go

@@ -23,7 +23,6 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	rbac "k8s.io/kubernetes/pkg/apis/rbac"
 	v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1"
 )
 
@@ -62,7 +61,7 @@ func (s *clusterRoleLister) Get(name string) (*v1beta1.ClusterRole, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(rbac.Resource("clusterrole"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("clusterrole"), name)
 	}
 	return obj.(*v1beta1.ClusterRole), nil
 }

pkg/client/listers/rbac/v1beta1/clusterrolebinding.go

@@ -23,7 +23,6 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	rbac "k8s.io/kubernetes/pkg/apis/rbac"
 	v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1"
 )
 
@@ -62,7 +61,7 @@ func (s *clusterRoleBindingLister) Get(name string) (*v1beta1.ClusterRoleBinding
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(rbac.Resource("clusterrolebinding"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("clusterrolebinding"), name)
 	}
 	return obj.(*v1beta1.ClusterRoleBinding), nil
 }

pkg/client/listers/rbac/v1beta1/role.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	rbac "k8s.io/kubernetes/pkg/apis/rbac"
 	v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1"
 )
 
@@ -89,7 +88,7 @@ func (s roleNamespaceLister) Get(name string) (*v1beta1.Role, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(rbac.Resource("role"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("role"), name)
 	}
 	return obj.(*v1beta1.Role), nil
 }

pkg/client/listers/rbac/v1beta1/rolebinding.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	rbac "k8s.io/kubernetes/pkg/apis/rbac"
 	v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1"
 )
 
@@ -89,7 +88,7 @@ func (s roleBindingNamespaceLister) Get(name string) (*v1beta1.RoleBinding, erro
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(rbac.Resource("rolebinding"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("rolebinding"), name)
 	}
 	return obj.(*v1beta1.RoleBinding), nil
 }

pkg/client/listers/settings/v1alpha1/podpreset.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	settings "k8s.io/kubernetes/pkg/apis/settings"
 	v1alpha1 "k8s.io/kubernetes/pkg/apis/settings/v1alpha1"
 )
 
@@ -89,7 +88,7 @@ func (s podPresetNamespaceLister) Get(name string) (*v1alpha1.PodPreset, error)
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(settings.Resource("podpreset"), name)
+		return nil, errors.NewNotFound(v1alpha1.Resource("podpreset"), name)
 	}
 	return obj.(*v1alpha1.PodPreset), nil
 }

pkg/client/listers/storage/v1/storageclass.go

@@ -23,7 +23,6 @@ import (
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	storage "k8s.io/kubernetes/pkg/apis/storage"
 	v1 "k8s.io/kubernetes/pkg/apis/storage/v1"
 )
 
@@ -62,7 +61,7 @@ func (s *storageClassLister) Get(name string) (*v1.StorageClass, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(storage.Resource("storageclass"), name)
+		return nil, errors.NewNotFound(v1.Resource("storageclass"), name)
 	}
 	return obj.(*v1.StorageClass), nil
 }

pkg/client/listers/storage/v1beta1/storageclass.go

@@ -23,7 +23,6 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	storage "k8s.io/kubernetes/pkg/apis/storage"
 	v1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1"
 )
 
@@ -62,7 +61,7 @@ func (s *storageClassLister) Get(name string) (*v1beta1.StorageClass, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(storage.Resource("storageclass"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("storageclass"), name)
 	}
 	return obj.(*v1beta1.StorageClass), nil
 }

staging/src/k8s.io/client-go/listers/apps/v1beta1/deployment.go

@@ -21,7 +21,6 @@ package v1beta1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	apps "k8s.io/client-go/pkg/apis/apps"
 	v1beta1 "k8s.io/client-go/pkg/apis/apps/v1beta1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s deploymentNamespaceLister) Get(name string) (*v1beta1.Deployment, error)
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(apps.Resource("deployment"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("deployment"), name)
 	}
 	return obj.(*v1beta1.Deployment), nil
 }

staging/src/k8s.io/client-go/listers/apps/v1beta1/scale.go

@@ -21,7 +21,6 @@ package v1beta1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	apps "k8s.io/client-go/pkg/apis/apps"
 	v1beta1 "k8s.io/client-go/pkg/apis/apps/v1beta1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s scaleNamespaceLister) Get(name string) (*v1beta1.Scale, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(apps.Resource("scale"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("scale"), name)
 	}
 	return obj.(*v1beta1.Scale), nil
 }

staging/src/k8s.io/client-go/listers/apps/v1beta1/statefulset.go

@@ -21,7 +21,6 @@ package v1beta1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	apps "k8s.io/client-go/pkg/apis/apps"
 	v1beta1 "k8s.io/client-go/pkg/apis/apps/v1beta1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s statefulSetNamespaceLister) Get(name string) (*v1beta1.StatefulSet, erro
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(apps.Resource("statefulset"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("statefulset"), name)
 	}
 	return obj.(*v1beta1.StatefulSet), nil
 }

staging/src/k8s.io/client-go/listers/autoscaling/v1/horizontalpodautoscaler.go

@@ -21,7 +21,6 @@ package v1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	autoscaling "k8s.io/client-go/pkg/apis/autoscaling"
 	v1 "k8s.io/client-go/pkg/apis/autoscaling/v1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s horizontalPodAutoscalerNamespaceLister) Get(name string) (*v1.Horizontal
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(autoscaling.Resource("horizontalpodautoscaler"), name)
+		return nil, errors.NewNotFound(v1.Resource("horizontalpodautoscaler"), name)
 	}
 	return obj.(*v1.HorizontalPodAutoscaler), nil
 }

staging/src/k8s.io/client-go/listers/autoscaling/v2alpha1/horizontalpodautoscaler.go

@@ -21,7 +21,6 @@ package v2alpha1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	autoscaling "k8s.io/client-go/pkg/apis/autoscaling"
 	v2alpha1 "k8s.io/client-go/pkg/apis/autoscaling/v2alpha1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s horizontalPodAutoscalerNamespaceLister) Get(name string) (*v2alpha1.Hori
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(autoscaling.Resource("horizontalpodautoscaler"), name)
+		return nil, errors.NewNotFound(v2alpha1.Resource("horizontalpodautoscaler"), name)
 	}
 	return obj.(*v2alpha1.HorizontalPodAutoscaler), nil
 }

staging/src/k8s.io/client-go/listers/batch/v1/job.go

@@ -21,7 +21,6 @@ package v1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	batch "k8s.io/client-go/pkg/apis/batch"
 	v1 "k8s.io/client-go/pkg/apis/batch/v1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s jobNamespaceLister) Get(name string) (*v1.Job, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(batch.Resource("job"), name)
+		return nil, errors.NewNotFound(v1.Resource("job"), name)
 	}
 	return obj.(*v1.Job), nil
 }

staging/src/k8s.io/client-go/listers/batch/v2alpha1/cronjob.go

@@ -21,7 +21,6 @@ package v2alpha1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	batch "k8s.io/client-go/pkg/apis/batch"
 	v2alpha1 "k8s.io/client-go/pkg/apis/batch/v2alpha1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s cronJobNamespaceLister) Get(name string) (*v2alpha1.CronJob, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(batch.Resource("cronjob"), name)
+		return nil, errors.NewNotFound(v2alpha1.Resource("cronjob"), name)
 	}
 	return obj.(*v2alpha1.CronJob), nil
 }

staging/src/k8s.io/client-go/listers/certificates/v1beta1/certificatesigningrequest.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
-	certificates "k8s.io/client-go/pkg/apis/certificates"
 	v1beta1 "k8s.io/client-go/pkg/apis/certificates/v1beta1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -62,7 +61,7 @@ func (s *certificateSigningRequestLister) Get(name string) (*v1beta1.Certificate
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(certificates.Resource("certificatesigningrequest"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("certificatesigningrequest"), name)
 	}
 	return obj.(*v1beta1.CertificateSigningRequest), nil
 }

staging/src/k8s.io/client-go/listers/core/v1/componentstatus.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
-	api "k8s.io/client-go/pkg/api"
 	v1 "k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -62,7 +61,7 @@ func (s *componentStatusLister) Get(name string) (*v1.ComponentStatus, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("componentstatus"), name)
+		return nil, errors.NewNotFound(v1.Resource("componentstatus"), name)
 	}
 	return obj.(*v1.ComponentStatus), nil
 }

staging/src/k8s.io/client-go/listers/core/v1/configmap.go

@@ -21,7 +21,6 @@ package v1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	api "k8s.io/client-go/pkg/api"
 	v1 "k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s configMapNamespaceLister) Get(name string) (*v1.ConfigMap, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("configmap"), name)
+		return nil, errors.NewNotFound(v1.Resource("configmap"), name)
 	}
 	return obj.(*v1.ConfigMap), nil
 }

staging/src/k8s.io/client-go/listers/core/v1/endpoints.go

@@ -21,7 +21,6 @@ package v1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	api "k8s.io/client-go/pkg/api"
 	v1 "k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s endpointsNamespaceLister) Get(name string) (*v1.Endpoints, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("endpoints"), name)
+		return nil, errors.NewNotFound(v1.Resource("endpoints"), name)
 	}
 	return obj.(*v1.Endpoints), nil
 }

staging/src/k8s.io/client-go/listers/core/v1/event.go

@@ -21,7 +21,6 @@ package v1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	api "k8s.io/client-go/pkg/api"
 	v1 "k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s eventNamespaceLister) Get(name string) (*v1.Event, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("event"), name)
+		return nil, errors.NewNotFound(v1.Resource("event"), name)
 	}
 	return obj.(*v1.Event), nil
 }

staging/src/k8s.io/client-go/listers/core/v1/limitrange.go

@@ -21,7 +21,6 @@ package v1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	api "k8s.io/client-go/pkg/api"
 	v1 "k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s limitRangeNamespaceLister) Get(name string) (*v1.LimitRange, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("limitrange"), name)
+		return nil, errors.NewNotFound(v1.Resource("limitrange"), name)
 	}
 	return obj.(*v1.LimitRange), nil
 }

staging/src/k8s.io/client-go/listers/core/v1/namespace.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
-	api "k8s.io/client-go/pkg/api"
 	v1 "k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -62,7 +61,7 @@ func (s *namespaceLister) Get(name string) (*v1.Namespace, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("namespace"), name)
+		return nil, errors.NewNotFound(v1.Resource("namespace"), name)
 	}
 	return obj.(*v1.Namespace), nil
 }

staging/src/k8s.io/client-go/listers/core/v1/node.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
-	api "k8s.io/client-go/pkg/api"
 	v1 "k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -62,7 +61,7 @@ func (s *nodeLister) Get(name string) (*v1.Node, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("node"), name)
+		return nil, errors.NewNotFound(v1.Resource("node"), name)
 	}
 	return obj.(*v1.Node), nil
 }

staging/src/k8s.io/client-go/listers/core/v1/persistentvolume.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
-	api "k8s.io/client-go/pkg/api"
 	v1 "k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -62,7 +61,7 @@ func (s *persistentVolumeLister) Get(name string) (*v1.PersistentVolume, error)
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("persistentvolume"), name)
+		return nil, errors.NewNotFound(v1.Resource("persistentvolume"), name)
 	}
 	return obj.(*v1.PersistentVolume), nil
 }

staging/src/k8s.io/client-go/listers/core/v1/persistentvolumeclaim.go

@@ -21,7 +21,6 @@ package v1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	api "k8s.io/client-go/pkg/api"
 	v1 "k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s persistentVolumeClaimNamespaceLister) Get(name string) (*v1.PersistentVo
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("persistentvolumeclaim"), name)
+		return nil, errors.NewNotFound(v1.Resource("persistentvolumeclaim"), name)
 	}
 	return obj.(*v1.PersistentVolumeClaim), nil
 }

staging/src/k8s.io/client-go/listers/core/v1/pod.go

@@ -21,7 +21,6 @@ package v1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	api "k8s.io/client-go/pkg/api"
 	v1 "k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s podNamespaceLister) Get(name string) (*v1.Pod, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("pod"), name)
+		return nil, errors.NewNotFound(v1.Resource("pod"), name)
 	}
 	return obj.(*v1.Pod), nil
 }

staging/src/k8s.io/client-go/listers/core/v1/podtemplate.go

@@ -21,7 +21,6 @@ package v1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	api "k8s.io/client-go/pkg/api"
 	v1 "k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s podTemplateNamespaceLister) Get(name string) (*v1.PodTemplate, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("podtemplate"), name)
+		return nil, errors.NewNotFound(v1.Resource("podtemplate"), name)
 	}
 	return obj.(*v1.PodTemplate), nil
 }

staging/src/k8s.io/client-go/listers/core/v1/replicationcontroller.go

@@ -21,7 +21,6 @@ package v1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	api "k8s.io/client-go/pkg/api"
 	v1 "k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s replicationControllerNamespaceLister) Get(name string) (*v1.ReplicationC
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("replicationcontroller"), name)
+		return nil, errors.NewNotFound(v1.Resource("replicationcontroller"), name)
 	}
 	return obj.(*v1.ReplicationController), nil
 }

staging/src/k8s.io/client-go/listers/core/v1/resourcequota.go

@@ -21,7 +21,6 @@ package v1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	api "k8s.io/client-go/pkg/api"
 	v1 "k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s resourceQuotaNamespaceLister) Get(name string) (*v1.ResourceQuota, error
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("resourcequota"), name)
+		return nil, errors.NewNotFound(v1.Resource("resourcequota"), name)
 	}
 	return obj.(*v1.ResourceQuota), nil
 }

staging/src/k8s.io/client-go/listers/core/v1/secret.go

@@ -21,7 +21,6 @@ package v1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	api "k8s.io/client-go/pkg/api"
 	v1 "k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s secretNamespaceLister) Get(name string) (*v1.Secret, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("secret"), name)
+		return nil, errors.NewNotFound(v1.Resource("secret"), name)
 	}
 	return obj.(*v1.Secret), nil
 }

staging/src/k8s.io/client-go/listers/core/v1/service.go

@@ -21,7 +21,6 @@ package v1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	api "k8s.io/client-go/pkg/api"
 	v1 "k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s serviceNamespaceLister) Get(name string) (*v1.Service, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("service"), name)
+		return nil, errors.NewNotFound(v1.Resource("service"), name)
 	}
 	return obj.(*v1.Service), nil
 }

staging/src/k8s.io/client-go/listers/core/v1/serviceaccount.go

@@ -21,7 +21,6 @@ package v1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	api "k8s.io/client-go/pkg/api"
 	v1 "k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s serviceAccountNamespaceLister) Get(name string) (*v1.ServiceAccount, err
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(api.Resource("serviceaccount"), name)
+		return nil, errors.NewNotFound(v1.Resource("serviceaccount"), name)
 	}
 	return obj.(*v1.ServiceAccount), nil
 }

staging/src/k8s.io/client-go/listers/extensions/v1beta1/daemonset.go

@@ -21,7 +21,6 @@ package v1beta1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	extensions "k8s.io/client-go/pkg/apis/extensions"
 	v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s daemonSetNamespaceLister) Get(name string) (*v1beta1.DaemonSet, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(extensions.Resource("daemonset"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("daemonset"), name)
 	}
 	return obj.(*v1beta1.DaemonSet), nil
 }

staging/src/k8s.io/client-go/listers/extensions/v1beta1/deployment.go

@@ -21,7 +21,6 @@ package v1beta1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	extensions "k8s.io/client-go/pkg/apis/extensions"
 	v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s deploymentNamespaceLister) Get(name string) (*v1beta1.Deployment, error)
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(extensions.Resource("deployment"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("deployment"), name)
 	}
 	return obj.(*v1beta1.Deployment), nil
 }

staging/src/k8s.io/client-go/listers/extensions/v1beta1/ingress.go

@@ -21,7 +21,6 @@ package v1beta1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	extensions "k8s.io/client-go/pkg/apis/extensions"
 	v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s ingressNamespaceLister) Get(name string) (*v1beta1.Ingress, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(extensions.Resource("ingress"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("ingress"), name)
 	}
 	return obj.(*v1beta1.Ingress), nil
 }

staging/src/k8s.io/client-go/listers/extensions/v1beta1/podsecuritypolicy.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
-	extensions "k8s.io/client-go/pkg/apis/extensions"
 	v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -62,7 +61,7 @@ func (s *podSecurityPolicyLister) Get(name string) (*v1beta1.PodSecurityPolicy,
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(extensions.Resource("podsecuritypolicy"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("podsecuritypolicy"), name)
 	}
 	return obj.(*v1beta1.PodSecurityPolicy), nil
 }

staging/src/k8s.io/client-go/listers/extensions/v1beta1/replicaset.go

@@ -21,7 +21,6 @@ package v1beta1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	extensions "k8s.io/client-go/pkg/apis/extensions"
 	v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s replicaSetNamespaceLister) Get(name string) (*v1beta1.ReplicaSet, error)
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(extensions.Resource("replicaset"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("replicaset"), name)
 	}
 	return obj.(*v1beta1.ReplicaSet), nil
 }

staging/src/k8s.io/client-go/listers/extensions/v1beta1/scale.go

@@ -21,7 +21,6 @@ package v1beta1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	extensions "k8s.io/client-go/pkg/apis/extensions"
 	v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s scaleNamespaceLister) Get(name string) (*v1beta1.Scale, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(extensions.Resource("scale"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("scale"), name)
 	}
 	return obj.(*v1beta1.Scale), nil
 }

staging/src/k8s.io/client-go/listers/extensions/v1beta1/thirdpartyresource.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
-	extensions "k8s.io/client-go/pkg/apis/extensions"
 	v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -62,7 +61,7 @@ func (s *thirdPartyResourceLister) Get(name string) (*v1beta1.ThirdPartyResource
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(extensions.Resource("thirdpartyresource"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("thirdpartyresource"), name)
 	}
 	return obj.(*v1beta1.ThirdPartyResource), nil
 }

staging/src/k8s.io/client-go/listers/policy/v1beta1/eviction.go

@@ -21,7 +21,6 @@ package v1beta1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	policy "k8s.io/client-go/pkg/apis/policy"
 	v1beta1 "k8s.io/client-go/pkg/apis/policy/v1beta1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s evictionNamespaceLister) Get(name string) (*v1beta1.Eviction, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(policy.Resource("eviction"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("eviction"), name)
 	}
 	return obj.(*v1beta1.Eviction), nil
 }

staging/src/k8s.io/client-go/listers/policy/v1beta1/poddisruptionbudget.go

@@ -21,7 +21,6 @@ package v1beta1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	policy "k8s.io/client-go/pkg/apis/policy"
 	v1beta1 "k8s.io/client-go/pkg/apis/policy/v1beta1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s podDisruptionBudgetNamespaceLister) Get(name string) (*v1beta1.PodDisrup
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(policy.Resource("poddisruptionbudget"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("poddisruptionbudget"), name)
 	}
 	return obj.(*v1beta1.PodDisruptionBudget), nil
 }

staging/src/k8s.io/client-go/listers/rbac/v1alpha1/clusterrole.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
-	rbac "k8s.io/client-go/pkg/apis/rbac"
 	v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -62,7 +61,7 @@ func (s *clusterRoleLister) Get(name string) (*v1alpha1.ClusterRole, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(rbac.Resource("clusterrole"), name)
+		return nil, errors.NewNotFound(v1alpha1.Resource("clusterrole"), name)
 	}
 	return obj.(*v1alpha1.ClusterRole), nil
 }

staging/src/k8s.io/client-go/listers/rbac/v1alpha1/clusterrolebinding.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
-	rbac "k8s.io/client-go/pkg/apis/rbac"
 	v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -62,7 +61,7 @@ func (s *clusterRoleBindingLister) Get(name string) (*v1alpha1.ClusterRoleBindin
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(rbac.Resource("clusterrolebinding"), name)
+		return nil, errors.NewNotFound(v1alpha1.Resource("clusterrolebinding"), name)
 	}
 	return obj.(*v1alpha1.ClusterRoleBinding), nil
 }

staging/src/k8s.io/client-go/listers/rbac/v1alpha1/role.go

@@ -21,7 +21,6 @@ package v1alpha1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	rbac "k8s.io/client-go/pkg/apis/rbac"
 	v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s roleNamespaceLister) Get(name string) (*v1alpha1.Role, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(rbac.Resource("role"), name)
+		return nil, errors.NewNotFound(v1alpha1.Resource("role"), name)
 	}
 	return obj.(*v1alpha1.Role), nil
 }

staging/src/k8s.io/client-go/listers/rbac/v1alpha1/rolebinding.go

@@ -21,7 +21,6 @@ package v1alpha1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	rbac "k8s.io/client-go/pkg/apis/rbac"
 	v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s roleBindingNamespaceLister) Get(name string) (*v1alpha1.RoleBinding, err
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(rbac.Resource("rolebinding"), name)
+		return nil, errors.NewNotFound(v1alpha1.Resource("rolebinding"), name)
 	}
 	return obj.(*v1alpha1.RoleBinding), nil
 }

staging/src/k8s.io/client-go/listers/rbac/v1beta1/clusterrole.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
-	rbac "k8s.io/client-go/pkg/apis/rbac"
 	v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -62,7 +61,7 @@ func (s *clusterRoleLister) Get(name string) (*v1beta1.ClusterRole, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(rbac.Resource("clusterrole"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("clusterrole"), name)
 	}
 	return obj.(*v1beta1.ClusterRole), nil
 }

staging/src/k8s.io/client-go/listers/rbac/v1beta1/clusterrolebinding.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
-	rbac "k8s.io/client-go/pkg/apis/rbac"
 	v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -62,7 +61,7 @@ func (s *clusterRoleBindingLister) Get(name string) (*v1beta1.ClusterRoleBinding
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(rbac.Resource("clusterrolebinding"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("clusterrolebinding"), name)
 	}
 	return obj.(*v1beta1.ClusterRoleBinding), nil
 }

staging/src/k8s.io/client-go/listers/rbac/v1beta1/role.go

@@ -21,7 +21,6 @@ package v1beta1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	rbac "k8s.io/client-go/pkg/apis/rbac"
 	v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s roleNamespaceLister) Get(name string) (*v1beta1.Role, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(rbac.Resource("role"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("role"), name)
 	}
 	return obj.(*v1beta1.Role), nil
 }

staging/src/k8s.io/client-go/listers/rbac/v1beta1/rolebinding.go

@@ -21,7 +21,6 @@ package v1beta1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	rbac "k8s.io/client-go/pkg/apis/rbac"
 	v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s roleBindingNamespaceLister) Get(name string) (*v1beta1.RoleBinding, erro
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(rbac.Resource("rolebinding"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("rolebinding"), name)
 	}
 	return obj.(*v1beta1.RoleBinding), nil
 }

staging/src/k8s.io/client-go/listers/settings/v1alpha1/podpreset.go

@@ -21,7 +21,6 @@ package v1alpha1
 import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
-	settings "k8s.io/client-go/pkg/apis/settings"
 	v1alpha1 "k8s.io/client-go/pkg/apis/settings/v1alpha1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -89,7 +88,7 @@ func (s podPresetNamespaceLister) Get(name string) (*v1alpha1.PodPreset, error)
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(settings.Resource("podpreset"), name)
+		return nil, errors.NewNotFound(v1alpha1.Resource("podpreset"), name)
 	}
 	return obj.(*v1alpha1.PodPreset), nil
 }

staging/src/k8s.io/client-go/listers/storage/v1/storageclass.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
-	storage "k8s.io/client-go/pkg/apis/storage"
 	v1 "k8s.io/client-go/pkg/apis/storage/v1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -62,7 +61,7 @@ func (s *storageClassLister) Get(name string) (*v1.StorageClass, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(storage.Resource("storageclass"), name)
+		return nil, errors.NewNotFound(v1.Resource("storageclass"), name)
 	}
 	return obj.(*v1.StorageClass), nil
 }

staging/src/k8s.io/client-go/listers/storage/v1beta1/storageclass.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
-	storage "k8s.io/client-go/pkg/apis/storage"
 	v1beta1 "k8s.io/client-go/pkg/apis/storage/v1beta1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -62,7 +61,7 @@ func (s *storageClassLister) Get(name string) (*v1beta1.StorageClass, error) {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(storage.Resource("storageclass"), name)
+		return nil, errors.NewNotFound(v1beta1.Resource("storageclass"), name)
 	}
 	return obj.(*v1beta1.StorageClass), nil
 }