From 3fa06e848c1f75109065552dc8601d386d780af9 Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Wed, 26 Apr 2017 14:14:56 -0700 Subject: [PATCH] update list-gen to not import internal package in external listers Kubernetes-commit: 0bac9b6aaabfe3dcf50fdcbdddfc8b4eb5aa805e --- listers/apps/v1beta1/deployment.go | 3 +-- listers/apps/v1beta1/scale.go | 3 +-- listers/apps/v1beta1/statefulset.go | 3 +-- listers/autoscaling/v1/horizontalpodautoscaler.go | 3 +-- listers/autoscaling/v2alpha1/horizontalpodautoscaler.go | 3 +-- listers/batch/v1/job.go | 3 +-- listers/batch/v2alpha1/cronjob.go | 3 +-- listers/certificates/v1beta1/certificatesigningrequest.go | 3 +-- listers/core/v1/componentstatus.go | 3 +-- listers/core/v1/configmap.go | 3 +-- listers/core/v1/endpoints.go | 3 +-- listers/core/v1/event.go | 3 +-- listers/core/v1/limitrange.go | 3 +-- listers/core/v1/namespace.go | 3 +-- listers/core/v1/node.go | 3 +-- listers/core/v1/persistentvolume.go | 3 +-- listers/core/v1/persistentvolumeclaim.go | 3 +-- listers/core/v1/pod.go | 3 +-- listers/core/v1/podtemplate.go | 3 +-- listers/core/v1/replicationcontroller.go | 3 +-- listers/core/v1/resourcequota.go | 3 +-- listers/core/v1/secret.go | 3 +-- listers/core/v1/service.go | 3 +-- listers/core/v1/serviceaccount.go | 3 +-- listers/extensions/v1beta1/daemonset.go | 3 +-- listers/extensions/v1beta1/deployment.go | 3 +-- listers/extensions/v1beta1/ingress.go | 3 +-- listers/extensions/v1beta1/podsecuritypolicy.go | 3 +-- listers/extensions/v1beta1/replicaset.go | 3 +-- listers/extensions/v1beta1/scale.go | 3 +-- listers/extensions/v1beta1/thirdpartyresource.go | 3 +-- listers/policy/v1beta1/eviction.go | 3 +-- listers/policy/v1beta1/poddisruptionbudget.go | 3 +-- listers/rbac/v1alpha1/clusterrole.go | 3 +-- listers/rbac/v1alpha1/clusterrolebinding.go | 3 +-- listers/rbac/v1alpha1/role.go | 3 +-- listers/rbac/v1alpha1/rolebinding.go | 3 +-- listers/rbac/v1beta1/clusterrole.go | 3 +-- listers/rbac/v1beta1/clusterrolebinding.go | 3 +-- listers/rbac/v1beta1/role.go | 3 +-- listers/rbac/v1beta1/rolebinding.go | 3 +-- listers/settings/v1alpha1/podpreset.go | 3 +-- listers/storage/v1/storageclass.go | 3 +-- listers/storage/v1beta1/storageclass.go | 3 +-- pkg/apis/autoscaling/v2alpha1/register.go | 5 +++++ 45 files changed, 49 insertions(+), 88 deletions(-) diff --git a/listers/apps/v1beta1/deployment.go b/listers/apps/v1beta1/deployment.go index abc7b8b2..210f7617 100644 --- a/listers/apps/v1beta1/deployment.go +++ b/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/listers/apps/v1beta1/scale.go b/listers/apps/v1beta1/scale.go index 216d9210..293a3f66 100644 --- a/listers/apps/v1beta1/scale.go +++ b/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/listers/apps/v1beta1/statefulset.go b/listers/apps/v1beta1/statefulset.go index 5bb90340..e987dbb1 100644 --- a/listers/apps/v1beta1/statefulset.go +++ b/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/listers/autoscaling/v1/horizontalpodautoscaler.go b/listers/autoscaling/v1/horizontalpodautoscaler.go index faa7688c..ff340fe2 100644 --- a/listers/autoscaling/v1/horizontalpodautoscaler.go +++ b/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/listers/autoscaling/v2alpha1/horizontalpodautoscaler.go b/listers/autoscaling/v2alpha1/horizontalpodautoscaler.go index 534f9970..77c5203e 100644 --- a/listers/autoscaling/v2alpha1/horizontalpodautoscaler.go +++ b/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/listers/batch/v1/job.go b/listers/batch/v1/job.go index 83d37e64..442c3a9e 100644 --- a/listers/batch/v1/job.go +++ b/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/listers/batch/v2alpha1/cronjob.go b/listers/batch/v2alpha1/cronjob.go index 57b874cf..d45b6139 100644 --- a/listers/batch/v2alpha1/cronjob.go +++ b/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/listers/certificates/v1beta1/certificatesigningrequest.go b/listers/certificates/v1beta1/certificatesigningrequest.go index 5c7f4322..d4d39939 100644 --- a/listers/certificates/v1beta1/certificatesigningrequest.go +++ b/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/listers/core/v1/componentstatus.go b/listers/core/v1/componentstatus.go index a40deded..1069130c 100644 --- a/listers/core/v1/componentstatus.go +++ b/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/listers/core/v1/configmap.go b/listers/core/v1/configmap.go index 32124ded..ff36729e 100644 --- a/listers/core/v1/configmap.go +++ b/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/listers/core/v1/endpoints.go b/listers/core/v1/endpoints.go index 0092e135..483de04b 100644 --- a/listers/core/v1/endpoints.go +++ b/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/listers/core/v1/event.go b/listers/core/v1/event.go index f30e033a..952fb93a 100644 --- a/listers/core/v1/event.go +++ b/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/listers/core/v1/limitrange.go b/listers/core/v1/limitrange.go index 3ad2aeae..05d2c756 100644 --- a/listers/core/v1/limitrange.go +++ b/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/listers/core/v1/namespace.go b/listers/core/v1/namespace.go index 23f03604..c5328cf1 100644 --- a/listers/core/v1/namespace.go +++ b/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/listers/core/v1/node.go b/listers/core/v1/node.go index 9b729e83..7bbc4e58 100644 --- a/listers/core/v1/node.go +++ b/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/listers/core/v1/persistentvolume.go b/listers/core/v1/persistentvolume.go index 837c736c..e60b1bc2 100644 --- a/listers/core/v1/persistentvolume.go +++ b/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/listers/core/v1/persistentvolumeclaim.go b/listers/core/v1/persistentvolumeclaim.go index 6b8aea80..b4a77429 100644 --- a/listers/core/v1/persistentvolumeclaim.go +++ b/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/listers/core/v1/pod.go b/listers/core/v1/pod.go index d5b78ee3..83fe3535 100644 --- a/listers/core/v1/pod.go +++ b/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/listers/core/v1/podtemplate.go b/listers/core/v1/podtemplate.go index fadd11fb..c5a595f3 100644 --- a/listers/core/v1/podtemplate.go +++ b/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/listers/core/v1/replicationcontroller.go b/listers/core/v1/replicationcontroller.go index a38e5d7c..b25b1dc9 100644 --- a/listers/core/v1/replicationcontroller.go +++ b/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/listers/core/v1/resourcequota.go b/listers/core/v1/resourcequota.go index 1a30bc62..f09a5b8c 100644 --- a/listers/core/v1/resourcequota.go +++ b/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/listers/core/v1/secret.go b/listers/core/v1/secret.go index 150bd945..598f700c 100644 --- a/listers/core/v1/secret.go +++ b/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/listers/core/v1/service.go b/listers/core/v1/service.go index 30d22c15..e4048faa 100644 --- a/listers/core/v1/service.go +++ b/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/listers/core/v1/serviceaccount.go b/listers/core/v1/serviceaccount.go index 9c079339..0250051b 100644 --- a/listers/core/v1/serviceaccount.go +++ b/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/listers/extensions/v1beta1/daemonset.go b/listers/extensions/v1beta1/daemonset.go index 14cebbf5..aa763d45 100644 --- a/listers/extensions/v1beta1/daemonset.go +++ b/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/listers/extensions/v1beta1/deployment.go b/listers/extensions/v1beta1/deployment.go index 5c67b0d6..4c9a31f8 100644 --- a/listers/extensions/v1beta1/deployment.go +++ b/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/listers/extensions/v1beta1/ingress.go b/listers/extensions/v1beta1/ingress.go index 3f0fe3bc..9232635e 100644 --- a/listers/extensions/v1beta1/ingress.go +++ b/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/listers/extensions/v1beta1/podsecuritypolicy.go b/listers/extensions/v1beta1/podsecuritypolicy.go index c4990dde..ed136426 100644 --- a/listers/extensions/v1beta1/podsecuritypolicy.go +++ b/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/listers/extensions/v1beta1/replicaset.go b/listers/extensions/v1beta1/replicaset.go index 17bb1827..f07c5e65 100644 --- a/listers/extensions/v1beta1/replicaset.go +++ b/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/listers/extensions/v1beta1/scale.go b/listers/extensions/v1beta1/scale.go index 5b80c233..bfcb2382 100644 --- a/listers/extensions/v1beta1/scale.go +++ b/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/listers/extensions/v1beta1/thirdpartyresource.go b/listers/extensions/v1beta1/thirdpartyresource.go index e2bf171b..e1b91fc0 100644 --- a/listers/extensions/v1beta1/thirdpartyresource.go +++ b/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/listers/policy/v1beta1/eviction.go b/listers/policy/v1beta1/eviction.go index 150835c6..dc9ea3c7 100644 --- a/listers/policy/v1beta1/eviction.go +++ b/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/listers/policy/v1beta1/poddisruptionbudget.go b/listers/policy/v1beta1/poddisruptionbudget.go index 65294df0..f3a5677d 100644 --- a/listers/policy/v1beta1/poddisruptionbudget.go +++ b/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/listers/rbac/v1alpha1/clusterrole.go b/listers/rbac/v1alpha1/clusterrole.go index 9ca59849..98c7b9bd 100644 --- a/listers/rbac/v1alpha1/clusterrole.go +++ b/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/listers/rbac/v1alpha1/clusterrolebinding.go b/listers/rbac/v1alpha1/clusterrolebinding.go index 1bc98e63..3016525c 100644 --- a/listers/rbac/v1alpha1/clusterrolebinding.go +++ b/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/listers/rbac/v1alpha1/role.go b/listers/rbac/v1alpha1/role.go index cbd22197..18478e2a 100644 --- a/listers/rbac/v1alpha1/role.go +++ b/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/listers/rbac/v1alpha1/rolebinding.go b/listers/rbac/v1alpha1/rolebinding.go index 4828048a..b9b395df 100644 --- a/listers/rbac/v1alpha1/rolebinding.go +++ b/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/listers/rbac/v1beta1/clusterrole.go b/listers/rbac/v1beta1/clusterrole.go index b59b6952..f963c740 100644 --- a/listers/rbac/v1beta1/clusterrole.go +++ b/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/listers/rbac/v1beta1/clusterrolebinding.go b/listers/rbac/v1beta1/clusterrolebinding.go index 3d83381b..2826023c 100644 --- a/listers/rbac/v1beta1/clusterrolebinding.go +++ b/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/listers/rbac/v1beta1/role.go b/listers/rbac/v1beta1/role.go index 2e792977..b1f37a75 100644 --- a/listers/rbac/v1beta1/role.go +++ b/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/listers/rbac/v1beta1/rolebinding.go b/listers/rbac/v1beta1/rolebinding.go index 1a5b1ae7..9f75e097 100644 --- a/listers/rbac/v1beta1/rolebinding.go +++ b/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/listers/settings/v1alpha1/podpreset.go b/listers/settings/v1alpha1/podpreset.go index 77de0241..68c89413 100644 --- a/listers/settings/v1alpha1/podpreset.go +++ b/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/listers/storage/v1/storageclass.go b/listers/storage/v1/storageclass.go index 9fae85a2..29dc6f5f 100644 --- a/listers/storage/v1/storageclass.go +++ b/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/listers/storage/v1beta1/storageclass.go b/listers/storage/v1beta1/storageclass.go index 513046c8..9d876c4a 100644 --- a/listers/storage/v1beta1/storageclass.go +++ b/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/pkg/apis/autoscaling/v2alpha1/register.go b/pkg/apis/autoscaling/v2alpha1/register.go index 2fc437f9..29b40faf 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