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

Kubernetes-commit: 0bac9b6aaabfe3dcf50fdcbdddfc8b4eb5aa805e
This commit is contained in:
Chao Xu 2017-04-26 14:14:56 -07:00 committed by Kubernetes Publisher
parent 6bc1999690
commit 3fa06e848c
45 changed files with 49 additions and 88 deletions

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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