From 0bac9b6aaabfe3dcf50fdcbdddfc8b4eb5aa805e Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Wed, 26 Apr 2017 14:14:56 -0700 Subject: [PATCH 1/2] update list-gen to not import internal package in external listers --- cmd/libs/go2idl/lister-gen/generators/lister.go | 2 +- pkg/apis/autoscaling/v2alpha1/register.go | 5 +++++ pkg/client/listers/apps/v1beta1/deployment.go | 3 +-- pkg/client/listers/apps/v1beta1/scale.go | 3 +-- pkg/client/listers/apps/v1beta1/statefulset.go | 3 +-- pkg/client/listers/authentication/v1/tokenreview.go | 3 +-- pkg/client/listers/authentication/v1beta1/tokenreview.go | 3 +-- .../listers/authorization/v1/localsubjectaccessreview.go | 3 +-- .../listers/authorization/v1/selfsubjectaccessreview.go | 3 +-- pkg/client/listers/authorization/v1/subjectaccessreview.go | 3 +-- .../authorization/v1beta1/localsubjectaccessreview.go | 3 +-- .../listers/authorization/v1beta1/selfsubjectaccessreview.go | 3 +-- .../listers/authorization/v1beta1/subjectaccessreview.go | 3 +-- pkg/client/listers/autoscaling/v1/horizontalpodautoscaler.go | 3 +-- .../listers/autoscaling/v2alpha1/horizontalpodautoscaler.go | 3 +-- pkg/client/listers/batch/v1/job.go | 3 +-- pkg/client/listers/batch/v2alpha1/cronjob.go | 3 +-- .../certificates/v1beta1/certificatesigningrequest.go | 3 +-- pkg/client/listers/core/v1/componentstatus.go | 3 +-- pkg/client/listers/core/v1/configmap.go | 3 +-- pkg/client/listers/core/v1/endpoints.go | 3 +-- pkg/client/listers/core/v1/event.go | 3 +-- pkg/client/listers/core/v1/limitrange.go | 3 +-- pkg/client/listers/core/v1/namespace.go | 3 +-- pkg/client/listers/core/v1/node.go | 3 +-- pkg/client/listers/core/v1/persistentvolume.go | 3 +-- pkg/client/listers/core/v1/persistentvolumeclaim.go | 3 +-- pkg/client/listers/core/v1/pod.go | 3 +-- pkg/client/listers/core/v1/podtemplate.go | 3 +-- pkg/client/listers/core/v1/replicationcontroller.go | 3 +-- pkg/client/listers/core/v1/resourcequota.go | 3 +-- pkg/client/listers/core/v1/secret.go | 3 +-- pkg/client/listers/core/v1/service.go | 3 +-- pkg/client/listers/core/v1/serviceaccount.go | 3 +-- pkg/client/listers/extensions/v1beta1/daemonset.go | 3 +-- pkg/client/listers/extensions/v1beta1/deployment.go | 3 +-- pkg/client/listers/extensions/v1beta1/ingress.go | 3 +-- pkg/client/listers/extensions/v1beta1/podsecuritypolicy.go | 3 +-- pkg/client/listers/extensions/v1beta1/replicaset.go | 3 +-- pkg/client/listers/extensions/v1beta1/scale.go | 3 +-- pkg/client/listers/extensions/v1beta1/thirdpartyresource.go | 3 +-- pkg/client/listers/imagepolicy/v1alpha1/imagereview.go | 3 +-- pkg/client/listers/policy/v1alpha1/poddisruptionbudget.go | 3 +-- pkg/client/listers/policy/v1beta1/eviction.go | 3 +-- pkg/client/listers/policy/v1beta1/poddisruptionbudget.go | 3 +-- pkg/client/listers/rbac/v1alpha1/clusterrole.go | 3 +-- pkg/client/listers/rbac/v1alpha1/clusterrolebinding.go | 3 +-- pkg/client/listers/rbac/v1alpha1/role.go | 3 +-- pkg/client/listers/rbac/v1alpha1/rolebinding.go | 3 +-- pkg/client/listers/rbac/v1beta1/clusterrole.go | 3 +-- pkg/client/listers/rbac/v1beta1/clusterrolebinding.go | 3 +-- pkg/client/listers/rbac/v1beta1/role.go | 3 +-- pkg/client/listers/rbac/v1beta1/rolebinding.go | 3 +-- pkg/client/listers/settings/v1alpha1/podpreset.go | 3 +-- pkg/client/listers/storage/v1/storageclass.go | 3 +-- pkg/client/listers/storage/v1beta1/storageclass.go | 3 +-- .../src/k8s.io/client-go/listers/apps/v1beta1/deployment.go | 3 +-- staging/src/k8s.io/client-go/listers/apps/v1beta1/scale.go | 3 +-- .../src/k8s.io/client-go/listers/apps/v1beta1/statefulset.go | 3 +-- .../listers/autoscaling/v1/horizontalpodautoscaler.go | 3 +-- .../listers/autoscaling/v2alpha1/horizontalpodautoscaler.go | 3 +-- staging/src/k8s.io/client-go/listers/batch/v1/job.go | 3 +-- .../src/k8s.io/client-go/listers/batch/v2alpha1/cronjob.go | 3 +-- .../certificates/v1beta1/certificatesigningrequest.go | 3 +-- .../src/k8s.io/client-go/listers/core/v1/componentstatus.go | 3 +-- staging/src/k8s.io/client-go/listers/core/v1/configmap.go | 3 +-- staging/src/k8s.io/client-go/listers/core/v1/endpoints.go | 3 +-- staging/src/k8s.io/client-go/listers/core/v1/event.go | 3 +-- staging/src/k8s.io/client-go/listers/core/v1/limitrange.go | 3 +-- staging/src/k8s.io/client-go/listers/core/v1/namespace.go | 3 +-- staging/src/k8s.io/client-go/listers/core/v1/node.go | 3 +-- .../src/k8s.io/client-go/listers/core/v1/persistentvolume.go | 3 +-- .../client-go/listers/core/v1/persistentvolumeclaim.go | 3 +-- staging/src/k8s.io/client-go/listers/core/v1/pod.go | 3 +-- staging/src/k8s.io/client-go/listers/core/v1/podtemplate.go | 3 +-- .../client-go/listers/core/v1/replicationcontroller.go | 3 +-- .../src/k8s.io/client-go/listers/core/v1/resourcequota.go | 3 +-- staging/src/k8s.io/client-go/listers/core/v1/secret.go | 3 +-- staging/src/k8s.io/client-go/listers/core/v1/service.go | 3 +-- .../src/k8s.io/client-go/listers/core/v1/serviceaccount.go | 3 +-- .../k8s.io/client-go/listers/extensions/v1beta1/daemonset.go | 3 +-- .../client-go/listers/extensions/v1beta1/deployment.go | 3 +-- .../k8s.io/client-go/listers/extensions/v1beta1/ingress.go | 3 +-- .../listers/extensions/v1beta1/podsecuritypolicy.go | 3 +-- .../client-go/listers/extensions/v1beta1/replicaset.go | 3 +-- .../src/k8s.io/client-go/listers/extensions/v1beta1/scale.go | 3 +-- .../listers/extensions/v1beta1/thirdpartyresource.go | 3 +-- .../src/k8s.io/client-go/listers/policy/v1beta1/eviction.go | 3 +-- .../client-go/listers/policy/v1beta1/poddisruptionbudget.go | 3 +-- .../k8s.io/client-go/listers/rbac/v1alpha1/clusterrole.go | 3 +-- .../client-go/listers/rbac/v1alpha1/clusterrolebinding.go | 3 +-- staging/src/k8s.io/client-go/listers/rbac/v1alpha1/role.go | 3 +-- .../k8s.io/client-go/listers/rbac/v1alpha1/rolebinding.go | 3 +-- .../src/k8s.io/client-go/listers/rbac/v1beta1/clusterrole.go | 3 +-- .../client-go/listers/rbac/v1beta1/clusterrolebinding.go | 3 +-- staging/src/k8s.io/client-go/listers/rbac/v1beta1/role.go | 3 +-- .../src/k8s.io/client-go/listers/rbac/v1beta1/rolebinding.go | 3 +-- .../k8s.io/client-go/listers/settings/v1alpha1/podpreset.go | 3 +-- .../src/k8s.io/client-go/listers/storage/v1/storageclass.go | 3 +-- .../k8s.io/client-go/listers/storage/v1beta1/storageclass.go | 3 +-- .../client-go/pkg/apis/autoscaling/v2alpha1/register.go | 5 +++++ .../pkg/apis/apiregistration/v1alpha1/register.go | 5 +++++ .../client/listers/apiregistration/v1alpha1/apiservice.go | 3 +-- 103 files changed, 115 insertions(+), 199 deletions(-) diff --git a/cmd/libs/go2idl/lister-gen/generators/lister.go b/cmd/libs/go2idl/lister-gen/generators/lister.go index 3df4cbb183a..794284d23a9 100644 --- a/cmd/libs/go2idl/lister-gen/generators/lister.go +++ b/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, } diff --git a/pkg/apis/autoscaling/v2alpha1/register.go b/pkg/apis/autoscaling/v2alpha1/register.go index 2fc437f9393..29b40faf324 100644 --- a/pkg/apis/autoscaling/v2alpha1/register.go +++ b/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 diff --git a/pkg/client/listers/apps/v1beta1/deployment.go b/pkg/client/listers/apps/v1beta1/deployment.go index ba8404dde1a..41c0300b9fb 100644 --- a/pkg/client/listers/apps/v1beta1/deployment.go +++ b/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 } diff --git a/pkg/client/listers/apps/v1beta1/scale.go b/pkg/client/listers/apps/v1beta1/scale.go index 96e4384a8a2..5f587cc0e86 100644 --- a/pkg/client/listers/apps/v1beta1/scale.go +++ b/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 } diff --git a/pkg/client/listers/apps/v1beta1/statefulset.go b/pkg/client/listers/apps/v1beta1/statefulset.go index 1d29db54c8e..03bcd475817 100644 --- a/pkg/client/listers/apps/v1beta1/statefulset.go +++ b/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 } diff --git a/pkg/client/listers/authentication/v1/tokenreview.go b/pkg/client/listers/authentication/v1/tokenreview.go index 630f7251065..aab044fe102 100644 --- a/pkg/client/listers/authentication/v1/tokenreview.go +++ b/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 } diff --git a/pkg/client/listers/authentication/v1beta1/tokenreview.go b/pkg/client/listers/authentication/v1beta1/tokenreview.go index 1bc2454a5ac..97cfe344195 100644 --- a/pkg/client/listers/authentication/v1beta1/tokenreview.go +++ b/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 } diff --git a/pkg/client/listers/authorization/v1/localsubjectaccessreview.go b/pkg/client/listers/authorization/v1/localsubjectaccessreview.go index aa4de9eddc3..e6fa3b325a3 100644 --- a/pkg/client/listers/authorization/v1/localsubjectaccessreview.go +++ b/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 } diff --git a/pkg/client/listers/authorization/v1/selfsubjectaccessreview.go b/pkg/client/listers/authorization/v1/selfsubjectaccessreview.go index c67a09e4430..ae5758e901c 100644 --- a/pkg/client/listers/authorization/v1/selfsubjectaccessreview.go +++ b/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 } diff --git a/pkg/client/listers/authorization/v1/subjectaccessreview.go b/pkg/client/listers/authorization/v1/subjectaccessreview.go index 5f1da2fdc3c..4a36cff22aa 100644 --- a/pkg/client/listers/authorization/v1/subjectaccessreview.go +++ b/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 } diff --git a/pkg/client/listers/authorization/v1beta1/localsubjectaccessreview.go b/pkg/client/listers/authorization/v1beta1/localsubjectaccessreview.go index 79bfe2b92ce..40b3278cb5b 100644 --- a/pkg/client/listers/authorization/v1beta1/localsubjectaccessreview.go +++ b/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 } diff --git a/pkg/client/listers/authorization/v1beta1/selfsubjectaccessreview.go b/pkg/client/listers/authorization/v1beta1/selfsubjectaccessreview.go index 6bb100ebb5b..197e15b5c83 100644 --- a/pkg/client/listers/authorization/v1beta1/selfsubjectaccessreview.go +++ b/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 } diff --git a/pkg/client/listers/authorization/v1beta1/subjectaccessreview.go b/pkg/client/listers/authorization/v1beta1/subjectaccessreview.go index f52e1c0ba8e..b4b877d936f 100644 --- a/pkg/client/listers/authorization/v1beta1/subjectaccessreview.go +++ b/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 } diff --git a/pkg/client/listers/autoscaling/v1/horizontalpodautoscaler.go b/pkg/client/listers/autoscaling/v1/horizontalpodautoscaler.go index 4e5f2fb6483..16e429c8cc3 100644 --- a/pkg/client/listers/autoscaling/v1/horizontalpodautoscaler.go +++ b/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 } diff --git a/pkg/client/listers/autoscaling/v2alpha1/horizontalpodautoscaler.go b/pkg/client/listers/autoscaling/v2alpha1/horizontalpodautoscaler.go index 46cc73b8669..6015de88c43 100644 --- a/pkg/client/listers/autoscaling/v2alpha1/horizontalpodautoscaler.go +++ b/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 } diff --git a/pkg/client/listers/batch/v1/job.go b/pkg/client/listers/batch/v1/job.go index bcd42ce0488..63388500728 100644 --- a/pkg/client/listers/batch/v1/job.go +++ b/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 } diff --git a/pkg/client/listers/batch/v2alpha1/cronjob.go b/pkg/client/listers/batch/v2alpha1/cronjob.go index ca3cb3cd074..46043bc5223 100644 --- a/pkg/client/listers/batch/v2alpha1/cronjob.go +++ b/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 } diff --git a/pkg/client/listers/certificates/v1beta1/certificatesigningrequest.go b/pkg/client/listers/certificates/v1beta1/certificatesigningrequest.go index 6fa75460b62..5dba8ae5178 100644 --- a/pkg/client/listers/certificates/v1beta1/certificatesigningrequest.go +++ b/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 } diff --git a/pkg/client/listers/core/v1/componentstatus.go b/pkg/client/listers/core/v1/componentstatus.go index b02a1034e65..5c25e56db68 100644 --- a/pkg/client/listers/core/v1/componentstatus.go +++ b/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 } diff --git a/pkg/client/listers/core/v1/configmap.go b/pkg/client/listers/core/v1/configmap.go index 88304a2c952..1b5b840e2de 100644 --- a/pkg/client/listers/core/v1/configmap.go +++ b/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 } diff --git a/pkg/client/listers/core/v1/endpoints.go b/pkg/client/listers/core/v1/endpoints.go index c438c85b31a..4f7328abace 100644 --- a/pkg/client/listers/core/v1/endpoints.go +++ b/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 } diff --git a/pkg/client/listers/core/v1/event.go b/pkg/client/listers/core/v1/event.go index 3146c9d2bee..4dd40caf35e 100644 --- a/pkg/client/listers/core/v1/event.go +++ b/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 } diff --git a/pkg/client/listers/core/v1/limitrange.go b/pkg/client/listers/core/v1/limitrange.go index 2252049e126..eb503055bb2 100644 --- a/pkg/client/listers/core/v1/limitrange.go +++ b/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 } diff --git a/pkg/client/listers/core/v1/namespace.go b/pkg/client/listers/core/v1/namespace.go index 2bbf390139a..c08a385a58e 100644 --- a/pkg/client/listers/core/v1/namespace.go +++ b/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 } diff --git a/pkg/client/listers/core/v1/node.go b/pkg/client/listers/core/v1/node.go index b0cd78c2604..29a4196f21b 100644 --- a/pkg/client/listers/core/v1/node.go +++ b/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 } diff --git a/pkg/client/listers/core/v1/persistentvolume.go b/pkg/client/listers/core/v1/persistentvolume.go index 9d8e1deadd5..b77a9d53267 100644 --- a/pkg/client/listers/core/v1/persistentvolume.go +++ b/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 } diff --git a/pkg/client/listers/core/v1/persistentvolumeclaim.go b/pkg/client/listers/core/v1/persistentvolumeclaim.go index 7b24b793965..b5b7cbab1dc 100644 --- a/pkg/client/listers/core/v1/persistentvolumeclaim.go +++ b/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 } diff --git a/pkg/client/listers/core/v1/pod.go b/pkg/client/listers/core/v1/pod.go index d806d2189be..a17da07d320 100644 --- a/pkg/client/listers/core/v1/pod.go +++ b/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 } diff --git a/pkg/client/listers/core/v1/podtemplate.go b/pkg/client/listers/core/v1/podtemplate.go index f0a585153ab..0f7dbc48f85 100644 --- a/pkg/client/listers/core/v1/podtemplate.go +++ b/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 } diff --git a/pkg/client/listers/core/v1/replicationcontroller.go b/pkg/client/listers/core/v1/replicationcontroller.go index 3e0ece496ef..5777a581df9 100644 --- a/pkg/client/listers/core/v1/replicationcontroller.go +++ b/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 } diff --git a/pkg/client/listers/core/v1/resourcequota.go b/pkg/client/listers/core/v1/resourcequota.go index 1128e1e22a2..ac0576c04c2 100644 --- a/pkg/client/listers/core/v1/resourcequota.go +++ b/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 } diff --git a/pkg/client/listers/core/v1/secret.go b/pkg/client/listers/core/v1/secret.go index d689dc7797a..a488ef7fc35 100644 --- a/pkg/client/listers/core/v1/secret.go +++ b/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 } diff --git a/pkg/client/listers/core/v1/service.go b/pkg/client/listers/core/v1/service.go index 87dff3d5823..d9304508978 100644 --- a/pkg/client/listers/core/v1/service.go +++ b/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 } diff --git a/pkg/client/listers/core/v1/serviceaccount.go b/pkg/client/listers/core/v1/serviceaccount.go index c83072b5d49..66afa4c37d7 100644 --- a/pkg/client/listers/core/v1/serviceaccount.go +++ b/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 } diff --git a/pkg/client/listers/extensions/v1beta1/daemonset.go b/pkg/client/listers/extensions/v1beta1/daemonset.go index 0fbbc2886f2..fd4c6e7f13d 100644 --- a/pkg/client/listers/extensions/v1beta1/daemonset.go +++ b/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 } diff --git a/pkg/client/listers/extensions/v1beta1/deployment.go b/pkg/client/listers/extensions/v1beta1/deployment.go index 48f7d43aa8d..a128c363bc4 100644 --- a/pkg/client/listers/extensions/v1beta1/deployment.go +++ b/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 } diff --git a/pkg/client/listers/extensions/v1beta1/ingress.go b/pkg/client/listers/extensions/v1beta1/ingress.go index 54ca34931e7..7607e8e6493 100644 --- a/pkg/client/listers/extensions/v1beta1/ingress.go +++ b/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 } diff --git a/pkg/client/listers/extensions/v1beta1/podsecuritypolicy.go b/pkg/client/listers/extensions/v1beta1/podsecuritypolicy.go index 66d5d5c8400..f9f6a789e5d 100644 --- a/pkg/client/listers/extensions/v1beta1/podsecuritypolicy.go +++ b/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 } diff --git a/pkg/client/listers/extensions/v1beta1/replicaset.go b/pkg/client/listers/extensions/v1beta1/replicaset.go index 66c379ae32c..4ce63df6f53 100644 --- a/pkg/client/listers/extensions/v1beta1/replicaset.go +++ b/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 } diff --git a/pkg/client/listers/extensions/v1beta1/scale.go b/pkg/client/listers/extensions/v1beta1/scale.go index f5cd37d5a29..9306fa50125 100644 --- a/pkg/client/listers/extensions/v1beta1/scale.go +++ b/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 } diff --git a/pkg/client/listers/extensions/v1beta1/thirdpartyresource.go b/pkg/client/listers/extensions/v1beta1/thirdpartyresource.go index 5daf2dd0c3b..7f24863acd3 100644 --- a/pkg/client/listers/extensions/v1beta1/thirdpartyresource.go +++ b/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 } diff --git a/pkg/client/listers/imagepolicy/v1alpha1/imagereview.go b/pkg/client/listers/imagepolicy/v1alpha1/imagereview.go index 75c72b966d3..eda2191407c 100644 --- a/pkg/client/listers/imagepolicy/v1alpha1/imagereview.go +++ b/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 } diff --git a/pkg/client/listers/policy/v1alpha1/poddisruptionbudget.go b/pkg/client/listers/policy/v1alpha1/poddisruptionbudget.go index 9540700f585..5f97ae91937 100644 --- a/pkg/client/listers/policy/v1alpha1/poddisruptionbudget.go +++ b/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 } diff --git a/pkg/client/listers/policy/v1beta1/eviction.go b/pkg/client/listers/policy/v1beta1/eviction.go index 71a520788a3..4ab05df6994 100644 --- a/pkg/client/listers/policy/v1beta1/eviction.go +++ b/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 } diff --git a/pkg/client/listers/policy/v1beta1/poddisruptionbudget.go b/pkg/client/listers/policy/v1beta1/poddisruptionbudget.go index 533b3f20b97..1db86c0a1e8 100644 --- a/pkg/client/listers/policy/v1beta1/poddisruptionbudget.go +++ b/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 } diff --git a/pkg/client/listers/rbac/v1alpha1/clusterrole.go b/pkg/client/listers/rbac/v1alpha1/clusterrole.go index b6d970df99a..2d1a6849a53 100644 --- a/pkg/client/listers/rbac/v1alpha1/clusterrole.go +++ b/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 } diff --git a/pkg/client/listers/rbac/v1alpha1/clusterrolebinding.go b/pkg/client/listers/rbac/v1alpha1/clusterrolebinding.go index 4a72a414eb9..4aa41409d45 100644 --- a/pkg/client/listers/rbac/v1alpha1/clusterrolebinding.go +++ b/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 } diff --git a/pkg/client/listers/rbac/v1alpha1/role.go b/pkg/client/listers/rbac/v1alpha1/role.go index 491af59bea8..adff34cd528 100644 --- a/pkg/client/listers/rbac/v1alpha1/role.go +++ b/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 } diff --git a/pkg/client/listers/rbac/v1alpha1/rolebinding.go b/pkg/client/listers/rbac/v1alpha1/rolebinding.go index 1e3e86b6c63..159207af9f5 100644 --- a/pkg/client/listers/rbac/v1alpha1/rolebinding.go +++ b/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 } diff --git a/pkg/client/listers/rbac/v1beta1/clusterrole.go b/pkg/client/listers/rbac/v1beta1/clusterrole.go index a9bd9f7c6ad..a9dfcdca177 100644 --- a/pkg/client/listers/rbac/v1beta1/clusterrole.go +++ b/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 } diff --git a/pkg/client/listers/rbac/v1beta1/clusterrolebinding.go b/pkg/client/listers/rbac/v1beta1/clusterrolebinding.go index d58d0f3a33e..9a795f30d1e 100644 --- a/pkg/client/listers/rbac/v1beta1/clusterrolebinding.go +++ b/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 } diff --git a/pkg/client/listers/rbac/v1beta1/role.go b/pkg/client/listers/rbac/v1beta1/role.go index 247cb86902a..c340a38f6e8 100644 --- a/pkg/client/listers/rbac/v1beta1/role.go +++ b/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 } diff --git a/pkg/client/listers/rbac/v1beta1/rolebinding.go b/pkg/client/listers/rbac/v1beta1/rolebinding.go index 69405eeedb4..0298ee5244e 100644 --- a/pkg/client/listers/rbac/v1beta1/rolebinding.go +++ b/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 } diff --git a/pkg/client/listers/settings/v1alpha1/podpreset.go b/pkg/client/listers/settings/v1alpha1/podpreset.go index b6b6deb50c8..6eaad138a3a 100644 --- a/pkg/client/listers/settings/v1alpha1/podpreset.go +++ b/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 } diff --git a/pkg/client/listers/storage/v1/storageclass.go b/pkg/client/listers/storage/v1/storageclass.go index 4895367c78b..f41e47ddfe1 100644 --- a/pkg/client/listers/storage/v1/storageclass.go +++ b/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 } diff --git a/pkg/client/listers/storage/v1beta1/storageclass.go b/pkg/client/listers/storage/v1beta1/storageclass.go index 495805a0bd4..b9a3a8b51bb 100644 --- a/pkg/client/listers/storage/v1beta1/storageclass.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/apps/v1beta1/deployment.go b/staging/src/k8s.io/client-go/listers/apps/v1beta1/deployment.go index abc7b8b24f2..210f76170c5 100644 --- a/staging/src/k8s.io/client-go/listers/apps/v1beta1/deployment.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/apps/v1beta1/scale.go b/staging/src/k8s.io/client-go/listers/apps/v1beta1/scale.go index 216d9210f4e..293a3f6637b 100644 --- a/staging/src/k8s.io/client-go/listers/apps/v1beta1/scale.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/apps/v1beta1/statefulset.go b/staging/src/k8s.io/client-go/listers/apps/v1beta1/statefulset.go index 5bb903405f6..e987dbb12de 100644 --- a/staging/src/k8s.io/client-go/listers/apps/v1beta1/statefulset.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/autoscaling/v1/horizontalpodautoscaler.go b/staging/src/k8s.io/client-go/listers/autoscaling/v1/horizontalpodautoscaler.go index faa7688cf60..ff340fe29c1 100644 --- a/staging/src/k8s.io/client-go/listers/autoscaling/v1/horizontalpodautoscaler.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/autoscaling/v2alpha1/horizontalpodautoscaler.go b/staging/src/k8s.io/client-go/listers/autoscaling/v2alpha1/horizontalpodautoscaler.go index 534f9970944..77c5203ec4e 100644 --- a/staging/src/k8s.io/client-go/listers/autoscaling/v2alpha1/horizontalpodautoscaler.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/batch/v1/job.go b/staging/src/k8s.io/client-go/listers/batch/v1/job.go index 83d37e64286..442c3a9edab 100644 --- a/staging/src/k8s.io/client-go/listers/batch/v1/job.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/batch/v2alpha1/cronjob.go b/staging/src/k8s.io/client-go/listers/batch/v2alpha1/cronjob.go index 57b874cf1e7..d45b6139e06 100644 --- a/staging/src/k8s.io/client-go/listers/batch/v2alpha1/cronjob.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/certificates/v1beta1/certificatesigningrequest.go b/staging/src/k8s.io/client-go/listers/certificates/v1beta1/certificatesigningrequest.go index 5c7f4322a59..d4d39939da1 100644 --- a/staging/src/k8s.io/client-go/listers/certificates/v1beta1/certificatesigningrequest.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/core/v1/componentstatus.go b/staging/src/k8s.io/client-go/listers/core/v1/componentstatus.go index a40deded29c..1069130c050 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/componentstatus.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/core/v1/configmap.go b/staging/src/k8s.io/client-go/listers/core/v1/configmap.go index 32124dedbc7..ff36729ea0f 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/configmap.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/core/v1/endpoints.go b/staging/src/k8s.io/client-go/listers/core/v1/endpoints.go index 0092e135b40..483de04b20d 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/endpoints.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/core/v1/event.go b/staging/src/k8s.io/client-go/listers/core/v1/event.go index f30e033a90d..952fb93a05d 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/event.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/core/v1/limitrange.go b/staging/src/k8s.io/client-go/listers/core/v1/limitrange.go index 3ad2aeae4a3..05d2c756ed7 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/limitrange.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/core/v1/namespace.go b/staging/src/k8s.io/client-go/listers/core/v1/namespace.go index 23f036046b7..c5328cf163e 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/namespace.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/core/v1/node.go b/staging/src/k8s.io/client-go/listers/core/v1/node.go index 9b729e83351..7bbc4e58e2b 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/node.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/core/v1/persistentvolume.go b/staging/src/k8s.io/client-go/listers/core/v1/persistentvolume.go index 837c736ca66..e60b1bc2634 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/persistentvolume.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/core/v1/persistentvolumeclaim.go b/staging/src/k8s.io/client-go/listers/core/v1/persistentvolumeclaim.go index 6b8aea80d47..b4a7742972a 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/persistentvolumeclaim.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/core/v1/pod.go b/staging/src/k8s.io/client-go/listers/core/v1/pod.go index d5b78ee393a..83fe353584c 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/pod.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/core/v1/podtemplate.go b/staging/src/k8s.io/client-go/listers/core/v1/podtemplate.go index fadd11fbeab..c5a595f35cb 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/podtemplate.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/core/v1/replicationcontroller.go b/staging/src/k8s.io/client-go/listers/core/v1/replicationcontroller.go index a38e5d7cc42..b25b1dc9b15 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/replicationcontroller.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/core/v1/resourcequota.go b/staging/src/k8s.io/client-go/listers/core/v1/resourcequota.go index 1a30bc6286c..f09a5b8cb7d 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/resourcequota.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/core/v1/secret.go b/staging/src/k8s.io/client-go/listers/core/v1/secret.go index 150bd9450e0..598f700cce8 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/secret.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/core/v1/service.go b/staging/src/k8s.io/client-go/listers/core/v1/service.go index 30d22c154be..e4048faa8f4 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/service.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/core/v1/serviceaccount.go b/staging/src/k8s.io/client-go/listers/core/v1/serviceaccount.go index 9c07933995d..0250051b0a3 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/serviceaccount.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/daemonset.go b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/daemonset.go index 14cebbf50c5..aa763d45900 100644 --- a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/daemonset.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/deployment.go b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/deployment.go index 5c67b0d653b..4c9a31f867f 100644 --- a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/deployment.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/ingress.go b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/ingress.go index 3f0fe3bc45f..9232635e931 100644 --- a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/ingress.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/podsecuritypolicy.go b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/podsecuritypolicy.go index c4990dde28d..ed136426472 100644 --- a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/podsecuritypolicy.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/replicaset.go b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/replicaset.go index 17bb1827ae5..f07c5e65917 100644 --- a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/replicaset.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/scale.go b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/scale.go index 5b80c233d00..bfcb23829e7 100644 --- a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/scale.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/thirdpartyresource.go b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/thirdpartyresource.go index e2bf171b640..e1b91fc07a5 100644 --- a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/thirdpartyresource.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/policy/v1beta1/eviction.go b/staging/src/k8s.io/client-go/listers/policy/v1beta1/eviction.go index 150835c6edb..dc9ea3c7f90 100644 --- a/staging/src/k8s.io/client-go/listers/policy/v1beta1/eviction.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/policy/v1beta1/poddisruptionbudget.go b/staging/src/k8s.io/client-go/listers/policy/v1beta1/poddisruptionbudget.go index 65294df0474..f3a5677d5cb 100644 --- a/staging/src/k8s.io/client-go/listers/policy/v1beta1/poddisruptionbudget.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/clusterrole.go b/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/clusterrole.go index 9ca59849f26..98c7b9bd57f 100644 --- a/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/clusterrole.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/clusterrolebinding.go b/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/clusterrolebinding.go index 1bc98e6397c..3016525c03d 100644 --- a/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/clusterrolebinding.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/role.go b/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/role.go index cbd22197328..18478e2ab1c 100644 --- a/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/role.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/rolebinding.go b/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/rolebinding.go index 4828048a366..b9b395dfa84 100644 --- a/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/rolebinding.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/rbac/v1beta1/clusterrole.go b/staging/src/k8s.io/client-go/listers/rbac/v1beta1/clusterrole.go index b59b6952e25..f963c7406f3 100644 --- a/staging/src/k8s.io/client-go/listers/rbac/v1beta1/clusterrole.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/rbac/v1beta1/clusterrolebinding.go b/staging/src/k8s.io/client-go/listers/rbac/v1beta1/clusterrolebinding.go index 3d83381bbdb..2826023c578 100644 --- a/staging/src/k8s.io/client-go/listers/rbac/v1beta1/clusterrolebinding.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/rbac/v1beta1/role.go b/staging/src/k8s.io/client-go/listers/rbac/v1beta1/role.go index 2e792977547..b1f37a75ebf 100644 --- a/staging/src/k8s.io/client-go/listers/rbac/v1beta1/role.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/rbac/v1beta1/rolebinding.go b/staging/src/k8s.io/client-go/listers/rbac/v1beta1/rolebinding.go index 1a5b1ae77b8..9f75e097431 100644 --- a/staging/src/k8s.io/client-go/listers/rbac/v1beta1/rolebinding.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/settings/v1alpha1/podpreset.go b/staging/src/k8s.io/client-go/listers/settings/v1alpha1/podpreset.go index 77de0241f7f..68c894136c0 100644 --- a/staging/src/k8s.io/client-go/listers/settings/v1alpha1/podpreset.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/storage/v1/storageclass.go b/staging/src/k8s.io/client-go/listers/storage/v1/storageclass.go index 9fae85a2945..29dc6f5f776 100644 --- a/staging/src/k8s.io/client-go/listers/storage/v1/storageclass.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/listers/storage/v1beta1/storageclass.go b/staging/src/k8s.io/client-go/listers/storage/v1beta1/storageclass.go index 513046c8a1b..9d876c4ab5c 100644 --- a/staging/src/k8s.io/client-go/listers/storage/v1beta1/storageclass.go +++ b/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 } diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v2alpha1/register.go b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v2alpha1/register.go index 2fc437f9393..29b40faf324 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v2alpha1/register.go +++ b/staging/src/k8s.io/client-go/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 diff --git a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/register.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/register.go index f056093e3a9..3fe2e66d2e4 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/register.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/register.go @@ -27,6 +27,11 @@ const GroupName = "apiregistration.k8s.io" // SchemeGroupVersion is group version used to register these objects var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"} +// Resource takes an unqualified resource and returns back a Group qualified GroupResource +func Resource(resource string) schema.GroupResource { + return SchemeGroupVersion.WithResource(resource).GroupResource() +} + var ( SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) AddToScheme = SchemeBuilder.AddToScheme diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/apiservice.go b/staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/apiservice.go index f5a1303927c..cc6a37356b6 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/apiservice.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/apiservice.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" - apiregistration "k8s.io/kube-aggregator/pkg/apis/apiregistration" v1alpha1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1" ) @@ -62,7 +61,7 @@ func (s *aPIServiceLister) Get(name string) (*v1alpha1.APIService, error) { return nil, err } if !exists { - return nil, errors.NewNotFound(apiregistration.Resource("apiservice"), name) + return nil, errors.NewNotFound(v1alpha1.Resource("apiservice"), name) } return obj.(*v1alpha1.APIService), nil } From ee61ffb4b15afc5e2a63eea687e95accb46fd44f Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Wed, 26 Apr 2017 14:27:13 -0700 Subject: [PATCH 2/2] bazel --- pkg/client/listers/apps/v1beta1/BUILD | 1 - pkg/client/listers/authentication/v1/BUILD | 1 - pkg/client/listers/authentication/v1beta1/BUILD | 1 - pkg/client/listers/authorization/v1/BUILD | 1 - pkg/client/listers/authorization/v1beta1/BUILD | 1 - pkg/client/listers/autoscaling/v1/BUILD | 1 - pkg/client/listers/autoscaling/v2alpha1/BUILD | 1 - pkg/client/listers/batch/v1/BUILD | 1 - pkg/client/listers/batch/v2alpha1/BUILD | 1 - pkg/client/listers/certificates/v1beta1/BUILD | 1 - pkg/client/listers/core/v1/BUILD | 1 - pkg/client/listers/extensions/v1beta1/BUILD | 1 - pkg/client/listers/imagepolicy/v1alpha1/BUILD | 1 - pkg/client/listers/policy/v1alpha1/BUILD | 1 - pkg/client/listers/policy/v1beta1/BUILD | 1 - pkg/client/listers/rbac/v1alpha1/BUILD | 1 - pkg/client/listers/rbac/v1beta1/BUILD | 1 - pkg/client/listers/settings/v1alpha1/BUILD | 1 - pkg/client/listers/storage/v1/BUILD | 1 - pkg/client/listers/storage/v1beta1/BUILD | 1 - staging/src/k8s.io/client-go/listers/apps/v1beta1/BUILD | 1 - staging/src/k8s.io/client-go/listers/autoscaling/v1/BUILD | 1 - staging/src/k8s.io/client-go/listers/autoscaling/v2alpha1/BUILD | 1 - staging/src/k8s.io/client-go/listers/batch/v1/BUILD | 1 - staging/src/k8s.io/client-go/listers/batch/v2alpha1/BUILD | 1 - staging/src/k8s.io/client-go/listers/certificates/v1beta1/BUILD | 1 - staging/src/k8s.io/client-go/listers/core/v1/BUILD | 1 - staging/src/k8s.io/client-go/listers/extensions/v1beta1/BUILD | 1 - staging/src/k8s.io/client-go/listers/policy/v1beta1/BUILD | 1 - staging/src/k8s.io/client-go/listers/rbac/v1alpha1/BUILD | 1 - staging/src/k8s.io/client-go/listers/rbac/v1beta1/BUILD | 1 - staging/src/k8s.io/client-go/listers/settings/v1alpha1/BUILD | 1 - staging/src/k8s.io/client-go/listers/storage/v1/BUILD | 1 - staging/src/k8s.io/client-go/listers/storage/v1beta1/BUILD | 1 - .../pkg/client/listers/apiregistration/v1alpha1/BUILD | 1 - 35 files changed, 35 deletions(-) diff --git a/pkg/client/listers/apps/v1beta1/BUILD b/pkg/client/listers/apps/v1beta1/BUILD index cdfc5775fa9..87137b8a7a5 100644 --- a/pkg/client/listers/apps/v1beta1/BUILD +++ b/pkg/client/listers/apps/v1beta1/BUILD @@ -19,7 +19,6 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/v1:go_default_library", - "//pkg/apis/apps:go_default_library", "//pkg/apis/apps/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/pkg/client/listers/authentication/v1/BUILD b/pkg/client/listers/authentication/v1/BUILD index eff74f491b4..df48ebefe84 100644 --- a/pkg/client/listers/authentication/v1/BUILD +++ b/pkg/client/listers/authentication/v1/BUILD @@ -15,7 +15,6 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/apis/authentication:go_default_library", "//pkg/apis/authentication/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/pkg/client/listers/authentication/v1beta1/BUILD b/pkg/client/listers/authentication/v1beta1/BUILD index 2c11ed8c911..a198bf15425 100644 --- a/pkg/client/listers/authentication/v1beta1/BUILD +++ b/pkg/client/listers/authentication/v1beta1/BUILD @@ -15,7 +15,6 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/apis/authentication:go_default_library", "//pkg/apis/authentication/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/pkg/client/listers/authorization/v1/BUILD b/pkg/client/listers/authorization/v1/BUILD index be2ee29871f..b704ddbbc81 100644 --- a/pkg/client/listers/authorization/v1/BUILD +++ b/pkg/client/listers/authorization/v1/BUILD @@ -17,7 +17,6 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/apis/authorization:go_default_library", "//pkg/apis/authorization/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/pkg/client/listers/authorization/v1beta1/BUILD b/pkg/client/listers/authorization/v1beta1/BUILD index b752ce0831a..c7f87953296 100644 --- a/pkg/client/listers/authorization/v1beta1/BUILD +++ b/pkg/client/listers/authorization/v1beta1/BUILD @@ -17,7 +17,6 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/apis/authorization:go_default_library", "//pkg/apis/authorization/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/pkg/client/listers/autoscaling/v1/BUILD b/pkg/client/listers/autoscaling/v1/BUILD index f02366448c0..ea82322b4ad 100644 --- a/pkg/client/listers/autoscaling/v1/BUILD +++ b/pkg/client/listers/autoscaling/v1/BUILD @@ -15,7 +15,6 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", diff --git a/pkg/client/listers/autoscaling/v2alpha1/BUILD b/pkg/client/listers/autoscaling/v2alpha1/BUILD index 8be51f3941a..22d0835b0fa 100644 --- a/pkg/client/listers/autoscaling/v2alpha1/BUILD +++ b/pkg/client/listers/autoscaling/v2alpha1/BUILD @@ -15,7 +15,6 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling/v2alpha1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", diff --git a/pkg/client/listers/batch/v1/BUILD b/pkg/client/listers/batch/v1/BUILD index 0e3cbfb3e42..160bcf1ebc5 100644 --- a/pkg/client/listers/batch/v1/BUILD +++ b/pkg/client/listers/batch/v1/BUILD @@ -17,7 +17,6 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/v1:go_default_library", - "//pkg/apis/batch:go_default_library", "//pkg/apis/batch/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/pkg/client/listers/batch/v2alpha1/BUILD b/pkg/client/listers/batch/v2alpha1/BUILD index 9ed6b35ca61..b644e174994 100644 --- a/pkg/client/listers/batch/v2alpha1/BUILD +++ b/pkg/client/listers/batch/v2alpha1/BUILD @@ -15,7 +15,6 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/apis/batch:go_default_library", "//pkg/apis/batch/v2alpha1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", diff --git a/pkg/client/listers/certificates/v1beta1/BUILD b/pkg/client/listers/certificates/v1beta1/BUILD index 1c22be78285..6b97705ad39 100644 --- a/pkg/client/listers/certificates/v1beta1/BUILD +++ b/pkg/client/listers/certificates/v1beta1/BUILD @@ -15,7 +15,6 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/apis/certificates:go_default_library", "//pkg/apis/certificates/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/pkg/client/listers/core/v1/BUILD b/pkg/client/listers/core/v1/BUILD index 3e55170c053..8fa88dc0bb6 100644 --- a/pkg/client/listers/core/v1/BUILD +++ b/pkg/client/listers/core/v1/BUILD @@ -33,7 +33,6 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/pkg/client/listers/extensions/v1beta1/BUILD b/pkg/client/listers/extensions/v1beta1/BUILD index 22ce7422d52..2292129b3b8 100644 --- a/pkg/client/listers/extensions/v1beta1/BUILD +++ b/pkg/client/listers/extensions/v1beta1/BUILD @@ -26,7 +26,6 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/v1:go_default_library", - "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/pkg/client/listers/imagepolicy/v1alpha1/BUILD b/pkg/client/listers/imagepolicy/v1alpha1/BUILD index 82422b5626e..aa768a7d6dc 100644 --- a/pkg/client/listers/imagepolicy/v1alpha1/BUILD +++ b/pkg/client/listers/imagepolicy/v1alpha1/BUILD @@ -15,7 +15,6 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/apis/imagepolicy:go_default_library", "//pkg/apis/imagepolicy/v1alpha1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/pkg/client/listers/policy/v1alpha1/BUILD b/pkg/client/listers/policy/v1alpha1/BUILD index a1917f073b1..1e8d4ce5726 100644 --- a/pkg/client/listers/policy/v1alpha1/BUILD +++ b/pkg/client/listers/policy/v1alpha1/BUILD @@ -15,7 +15,6 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/apis/policy:go_default_library", "//pkg/apis/policy/v1alpha1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", diff --git a/pkg/client/listers/policy/v1beta1/BUILD b/pkg/client/listers/policy/v1beta1/BUILD index debf530d576..806a0efe3c5 100644 --- a/pkg/client/listers/policy/v1beta1/BUILD +++ b/pkg/client/listers/policy/v1beta1/BUILD @@ -18,7 +18,6 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/v1:go_default_library", - "//pkg/apis/policy:go_default_library", "//pkg/apis/policy/v1beta1:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", diff --git a/pkg/client/listers/rbac/v1alpha1/BUILD b/pkg/client/listers/rbac/v1alpha1/BUILD index 888d9f4ae55..6cccdbd6dc2 100644 --- a/pkg/client/listers/rbac/v1alpha1/BUILD +++ b/pkg/client/listers/rbac/v1alpha1/BUILD @@ -18,7 +18,6 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/v1alpha1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/pkg/client/listers/rbac/v1beta1/BUILD b/pkg/client/listers/rbac/v1beta1/BUILD index e84b98cf608..60a465d1cae 100644 --- a/pkg/client/listers/rbac/v1beta1/BUILD +++ b/pkg/client/listers/rbac/v1beta1/BUILD @@ -18,7 +18,6 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/pkg/client/listers/settings/v1alpha1/BUILD b/pkg/client/listers/settings/v1alpha1/BUILD index 4f6a4d0ef3f..526685b0428 100644 --- a/pkg/client/listers/settings/v1alpha1/BUILD +++ b/pkg/client/listers/settings/v1alpha1/BUILD @@ -15,7 +15,6 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/apis/settings:go_default_library", "//pkg/apis/settings/v1alpha1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", diff --git a/pkg/client/listers/storage/v1/BUILD b/pkg/client/listers/storage/v1/BUILD index 5b2a530c0ae..6cd44207574 100644 --- a/pkg/client/listers/storage/v1/BUILD +++ b/pkg/client/listers/storage/v1/BUILD @@ -15,7 +15,6 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/apis/storage:go_default_library", "//pkg/apis/storage/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/pkg/client/listers/storage/v1beta1/BUILD b/pkg/client/listers/storage/v1beta1/BUILD index 223f90ee1ef..80666f95551 100644 --- a/pkg/client/listers/storage/v1beta1/BUILD +++ b/pkg/client/listers/storage/v1beta1/BUILD @@ -15,7 +15,6 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/apis/storage:go_default_library", "//pkg/apis/storage/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/staging/src/k8s.io/client-go/listers/apps/v1beta1/BUILD b/staging/src/k8s.io/client-go/listers/apps/v1beta1/BUILD index 1e1ce99583b..f7b566c9420 100644 --- a/staging/src/k8s.io/client-go/listers/apps/v1beta1/BUILD +++ b/staging/src/k8s.io/client-go/listers/apps/v1beta1/BUILD @@ -22,7 +22,6 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library", - "//vendor/k8s.io/client-go/pkg/apis/apps:go_default_library", "//vendor/k8s.io/client-go/pkg/apis/apps/v1beta1:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", ], diff --git a/staging/src/k8s.io/client-go/listers/autoscaling/v1/BUILD b/staging/src/k8s.io/client-go/listers/autoscaling/v1/BUILD index ecf067c9a50..c98c3a1f3ee 100644 --- a/staging/src/k8s.io/client-go/listers/autoscaling/v1/BUILD +++ b/staging/src/k8s.io/client-go/listers/autoscaling/v1/BUILD @@ -17,7 +17,6 @@ go_library( deps = [ "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", - "//vendor/k8s.io/client-go/pkg/apis/autoscaling:go_default_library", "//vendor/k8s.io/client-go/pkg/apis/autoscaling/v1:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", ], diff --git a/staging/src/k8s.io/client-go/listers/autoscaling/v2alpha1/BUILD b/staging/src/k8s.io/client-go/listers/autoscaling/v2alpha1/BUILD index d87332274a6..6812c9e6313 100644 --- a/staging/src/k8s.io/client-go/listers/autoscaling/v2alpha1/BUILD +++ b/staging/src/k8s.io/client-go/listers/autoscaling/v2alpha1/BUILD @@ -17,7 +17,6 @@ go_library( deps = [ "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", - "//vendor/k8s.io/client-go/pkg/apis/autoscaling:go_default_library", "//vendor/k8s.io/client-go/pkg/apis/autoscaling/v2alpha1:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", ], diff --git a/staging/src/k8s.io/client-go/listers/batch/v1/BUILD b/staging/src/k8s.io/client-go/listers/batch/v1/BUILD index a499f6429f2..d2146fcc9d3 100644 --- a/staging/src/k8s.io/client-go/listers/batch/v1/BUILD +++ b/staging/src/k8s.io/client-go/listers/batch/v1/BUILD @@ -20,7 +20,6 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library", - "//vendor/k8s.io/client-go/pkg/apis/batch:go_default_library", "//vendor/k8s.io/client-go/pkg/apis/batch/v1:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", ], diff --git a/staging/src/k8s.io/client-go/listers/batch/v2alpha1/BUILD b/staging/src/k8s.io/client-go/listers/batch/v2alpha1/BUILD index 617cdd8395f..84ff16d88ac 100644 --- a/staging/src/k8s.io/client-go/listers/batch/v2alpha1/BUILD +++ b/staging/src/k8s.io/client-go/listers/batch/v2alpha1/BUILD @@ -17,7 +17,6 @@ go_library( deps = [ "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", - "//vendor/k8s.io/client-go/pkg/apis/batch:go_default_library", "//vendor/k8s.io/client-go/pkg/apis/batch/v2alpha1:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", ], diff --git a/staging/src/k8s.io/client-go/listers/certificates/v1beta1/BUILD b/staging/src/k8s.io/client-go/listers/certificates/v1beta1/BUILD index 6d347ca52c8..0bafbfbc7e6 100644 --- a/staging/src/k8s.io/client-go/listers/certificates/v1beta1/BUILD +++ b/staging/src/k8s.io/client-go/listers/certificates/v1beta1/BUILD @@ -18,7 +18,6 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", - "//vendor/k8s.io/client-go/pkg/apis/certificates:go_default_library", "//vendor/k8s.io/client-go/pkg/apis/certificates/v1beta1:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", ], diff --git a/staging/src/k8s.io/client-go/listers/core/v1/BUILD b/staging/src/k8s.io/client-go/listers/core/v1/BUILD index 2c267dac2bc..73de3065a8d 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/BUILD +++ b/staging/src/k8s.io/client-go/listers/core/v1/BUILD @@ -36,7 +36,6 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", - "//vendor/k8s.io/client-go/pkg/api:go_default_library", "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", ], diff --git a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/BUILD b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/BUILD index c3a543c06fc..5549d3938d6 100644 --- a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/BUILD +++ b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/BUILD @@ -28,7 +28,6 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library", - "//vendor/k8s.io/client-go/pkg/apis/extensions:go_default_library", "//vendor/k8s.io/client-go/pkg/apis/extensions/v1beta1:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", ], diff --git a/staging/src/k8s.io/client-go/listers/policy/v1beta1/BUILD b/staging/src/k8s.io/client-go/listers/policy/v1beta1/BUILD index 1463971edd4..dcae183c93c 100644 --- a/staging/src/k8s.io/client-go/listers/policy/v1beta1/BUILD +++ b/staging/src/k8s.io/client-go/listers/policy/v1beta1/BUILD @@ -22,7 +22,6 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library", - "//vendor/k8s.io/client-go/pkg/apis/policy:go_default_library", "//vendor/k8s.io/client-go/pkg/apis/policy/v1beta1:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", ], diff --git a/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/BUILD b/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/BUILD index b6f9fc797f9..f97046b7545 100644 --- a/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/BUILD +++ b/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/BUILD @@ -21,7 +21,6 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", - "//vendor/k8s.io/client-go/pkg/apis/rbac:go_default_library", "//vendor/k8s.io/client-go/pkg/apis/rbac/v1alpha1:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", ], diff --git a/staging/src/k8s.io/client-go/listers/rbac/v1beta1/BUILD b/staging/src/k8s.io/client-go/listers/rbac/v1beta1/BUILD index df5d552bcb3..c8a44a9b522 100644 --- a/staging/src/k8s.io/client-go/listers/rbac/v1beta1/BUILD +++ b/staging/src/k8s.io/client-go/listers/rbac/v1beta1/BUILD @@ -21,7 +21,6 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", - "//vendor/k8s.io/client-go/pkg/apis/rbac:go_default_library", "//vendor/k8s.io/client-go/pkg/apis/rbac/v1beta1:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", ], diff --git a/staging/src/k8s.io/client-go/listers/settings/v1alpha1/BUILD b/staging/src/k8s.io/client-go/listers/settings/v1alpha1/BUILD index c49ca47cbd3..b073927bb3f 100644 --- a/staging/src/k8s.io/client-go/listers/settings/v1alpha1/BUILD +++ b/staging/src/k8s.io/client-go/listers/settings/v1alpha1/BUILD @@ -17,7 +17,6 @@ go_library( deps = [ "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", - "//vendor/k8s.io/client-go/pkg/apis/settings:go_default_library", "//vendor/k8s.io/client-go/pkg/apis/settings/v1alpha1:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", ], diff --git a/staging/src/k8s.io/client-go/listers/storage/v1/BUILD b/staging/src/k8s.io/client-go/listers/storage/v1/BUILD index bffb70006ef..2dfee2eaa0f 100644 --- a/staging/src/k8s.io/client-go/listers/storage/v1/BUILD +++ b/staging/src/k8s.io/client-go/listers/storage/v1/BUILD @@ -18,7 +18,6 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", - "//vendor/k8s.io/client-go/pkg/apis/storage:go_default_library", "//vendor/k8s.io/client-go/pkg/apis/storage/v1:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", ], diff --git a/staging/src/k8s.io/client-go/listers/storage/v1beta1/BUILD b/staging/src/k8s.io/client-go/listers/storage/v1beta1/BUILD index 7b50931f49b..e2b74c885d6 100644 --- a/staging/src/k8s.io/client-go/listers/storage/v1beta1/BUILD +++ b/staging/src/k8s.io/client-go/listers/storage/v1beta1/BUILD @@ -18,7 +18,6 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", - "//vendor/k8s.io/client-go/pkg/apis/storage:go_default_library", "//vendor/k8s.io/client-go/pkg/apis/storage/v1beta1:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", ], diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/BUILD b/staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/BUILD index ef91cde3f4a..26e603980cf 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/BUILD +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/BUILD @@ -19,7 +19,6 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", - "//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library", ], )