diff --git a/cmd/libs/go2idl/lister-gen/generators/lister.go b/cmd/libs/go2idl/lister-gen/generators/lister.go index 59f226b7f76..47d8cb931b6 100644 --- a/cmd/libs/go2idl/lister-gen/generators/lister.go +++ b/cmd/libs/go2idl/lister-gen/generators/lister.go @@ -97,6 +97,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat } var gv clientgentypes.GroupVersion + var internalGVPkg string if isInternal(objectMeta) { lastSlash := strings.LastIndex(p.Path, "/") @@ -104,10 +105,13 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat glog.Fatalf("error constructing internal group version for package %q", p.Path) } gv.Group = clientgentypes.Group(p.Path[lastSlash+1:]) + internalGVPkg = p.Path } else { parts := strings.Split(p.Path, "/") gv.Group = clientgentypes.Group(parts[len(parts)-2]) gv.Version = clientgentypes.Version(parts[len(parts)-1]) + + internalGVPkg = strings.Join(parts[0:len(parts)-1], "/") } packageList = append(packageList, &generator.DefaultPackage{ @@ -126,6 +130,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat }, outputPackage: arguments.OutputPackagePath, groupVersion: gv, + internalGVPkg: internalGVPkg, typeToGenerate: t, imports: generator.NewImportTracker(), objectMeta: objectMeta, @@ -175,6 +180,7 @@ type listerGenerator struct { generator.DefaultGen outputPackage string groupVersion clientgentypes.GroupVersion + internalGVPkg string typeToGenerate *types.Type imports namer.ImportTracker objectMeta *types.Type @@ -206,7 +212,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{}{ - "group": g.groupVersion.Group.String(), + "Resource": c.Universe.Function(types.Name{Package: g.internalGVPkg, Name: "Resource"}), "type": t, "objectMeta": g.objectMeta, } @@ -295,7 +301,7 @@ func (s *$.type|private$Lister) Get(name string) (*$.type|raw$, error) { return nil, err } if !exists { - return nil, errors.NewNotFound($.group$.Resource("$.type|lowercaseSingular$"), name) + return nil, errors.NewNotFound($.Resource|raw$("$.type|lowercaseSingular$"), name) } return obj.(*$.type|raw$), nil } @@ -338,7 +344,7 @@ func (s $.type|private$NamespaceLister) Get(name string) (*$.type|raw$, error) { return nil, err } if !exists { - return nil, errors.NewNotFound($.group$.Resource("$.type|lowercaseSingular$"), name) + return nil, errors.NewNotFound($.Resource|raw$("$.type|lowercaseSingular$"), name) } return obj.(*$.type|raw$), nil } diff --git a/pkg/client/lister/BUILD b/pkg/client/lister/BUILD deleted file mode 100644 index 6e160634cd9..00000000000 --- a/pkg/client/lister/BUILD +++ /dev/null @@ -1,47 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_binary", - "go_library", - "go_test", - "cgo_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "zz_generated.listers.apps.go", - "zz_generated.listers.authentication.go", - "zz_generated.listers.authorization.go", - "zz_generated.listers.autoscaling.go", - "zz_generated.listers.batch.go", - "zz_generated.listers.certificates.go", - "zz_generated.listers.core.go", - "zz_generated.listers.extensions.go", - "zz_generated.listers.imagepolicy.go", - "zz_generated.listers.policy.go", - "zz_generated.listers.rbac.go", - "zz_generated.listers.storage.go", - ], - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/api/errors:go_default_library", - "//pkg/apis/apps:go_default_library", - "//pkg/apis/authentication:go_default_library", - "//pkg/apis/authorization:go_default_library", - "//pkg/apis/autoscaling:go_default_library", - "//pkg/apis/batch:go_default_library", - "//pkg/apis/certificates:go_default_library", - "//pkg/apis/extensions:go_default_library", - "//pkg/apis/imagepolicy:go_default_library", - "//pkg/apis/policy:go_default_library", - "//pkg/apis/rbac:go_default_library", - "//pkg/apis/storage:go_default_library", - "//pkg/client/cache:go_default_library", - "//pkg/labels:go_default_library", - ], -) diff --git a/pkg/client/listers/apps/v1alpha1/BUILD b/pkg/client/listers/apps/v1alpha1/BUILD index 55cbed3bbac..19a1e4fd632 100644 --- a/pkg/client/listers/apps/v1alpha1/BUILD +++ b/pkg/client/listers/apps/v1alpha1/BUILD @@ -16,6 +16,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/errors:go_default_library", + "//pkg/apis/apps:go_default_library", "//pkg/apis/apps/v1alpha1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/labels:go_default_library", diff --git a/pkg/client/listers/apps/v1alpha1/zz_generated.statefulset.go b/pkg/client/listers/apps/v1alpha1/zz_generated.statefulset.go index 9354ae710f4..c5aad354829 100644 --- a/pkg/client/listers/apps/v1alpha1/zz_generated.statefulset.go +++ b/pkg/client/listers/apps/v1alpha1/zz_generated.statefulset.go @@ -20,6 +20,7 @@ package v1alpha1 import ( "k8s.io/kubernetes/pkg/api/errors" + apps "k8s.io/kubernetes/pkg/apis/apps" v1alpha1 "k8s.io/kubernetes/pkg/apis/apps/v1alpha1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/client/listers/authentication/v1beta1/BUILD b/pkg/client/listers/authentication/v1beta1/BUILD index 5f72b03c60a..87e1eb2cb02 100644 --- a/pkg/client/listers/authentication/v1beta1/BUILD +++ b/pkg/client/listers/authentication/v1beta1/BUILD @@ -17,6 +17,7 @@ go_library( deps = [ "//pkg/api/errors:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/authentication:go_default_library", "//pkg/apis/authentication/v1beta1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/labels:go_default_library", diff --git a/pkg/client/listers/authentication/v1beta1/zz_generated.tokenreview.go b/pkg/client/listers/authentication/v1beta1/zz_generated.tokenreview.go index c45146262c8..69d2929e05a 100644 --- a/pkg/client/listers/authentication/v1beta1/zz_generated.tokenreview.go +++ b/pkg/client/listers/authentication/v1beta1/zz_generated.tokenreview.go @@ -21,6 +21,7 @@ package v1beta1 import ( "k8s.io/kubernetes/pkg/api/errors" v1 "k8s.io/kubernetes/pkg/api/v1" + authentication "k8s.io/kubernetes/pkg/apis/authentication" v1beta1 "k8s.io/kubernetes/pkg/apis/authentication/v1beta1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/client/listers/authorization/v1beta1/BUILD b/pkg/client/listers/authorization/v1beta1/BUILD index 1aa9d302130..a1b6ad2f6fa 100644 --- a/pkg/client/listers/authorization/v1beta1/BUILD +++ b/pkg/client/listers/authorization/v1beta1/BUILD @@ -21,6 +21,7 @@ go_library( deps = [ "//pkg/api/errors:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/authorization:go_default_library", "//pkg/apis/authorization/v1beta1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/labels:go_default_library", diff --git a/pkg/client/listers/authorization/v1beta1/zz_generated.localsubjectaccessreview.go b/pkg/client/listers/authorization/v1beta1/zz_generated.localsubjectaccessreview.go index 300b737d989..a5897633158 100644 --- a/pkg/client/listers/authorization/v1beta1/zz_generated.localsubjectaccessreview.go +++ b/pkg/client/listers/authorization/v1beta1/zz_generated.localsubjectaccessreview.go @@ -20,6 +20,7 @@ package v1beta1 import ( "k8s.io/kubernetes/pkg/api/errors" + authorization "k8s.io/kubernetes/pkg/apis/authorization" v1beta1 "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/client/listers/authorization/v1beta1/zz_generated.selfsubjectaccessreview.go b/pkg/client/listers/authorization/v1beta1/zz_generated.selfsubjectaccessreview.go index 6176db4e485..356d5fb2d3d 100644 --- a/pkg/client/listers/authorization/v1beta1/zz_generated.selfsubjectaccessreview.go +++ b/pkg/client/listers/authorization/v1beta1/zz_generated.selfsubjectaccessreview.go @@ -21,6 +21,7 @@ package v1beta1 import ( "k8s.io/kubernetes/pkg/api/errors" v1 "k8s.io/kubernetes/pkg/api/v1" + authorization "k8s.io/kubernetes/pkg/apis/authorization" v1beta1 "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/client/listers/authorization/v1beta1/zz_generated.subjectaccessreview.go b/pkg/client/listers/authorization/v1beta1/zz_generated.subjectaccessreview.go index 7bfef7edf5b..2a086d446c7 100644 --- a/pkg/client/listers/authorization/v1beta1/zz_generated.subjectaccessreview.go +++ b/pkg/client/listers/authorization/v1beta1/zz_generated.subjectaccessreview.go @@ -21,6 +21,7 @@ package v1beta1 import ( "k8s.io/kubernetes/pkg/api/errors" v1 "k8s.io/kubernetes/pkg/api/v1" + authorization "k8s.io/kubernetes/pkg/apis/authorization" v1beta1 "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/client/listers/autoscaling/v1/BUILD b/pkg/client/listers/autoscaling/v1/BUILD index e7a4025d2d9..724aa4b760d 100644 --- a/pkg/client/listers/autoscaling/v1/BUILD +++ b/pkg/client/listers/autoscaling/v1/BUILD @@ -16,6 +16,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/errors:go_default_library", + "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/labels:go_default_library", diff --git a/pkg/client/listers/autoscaling/v1/zz_generated.horizontalpodautoscaler.go b/pkg/client/listers/autoscaling/v1/zz_generated.horizontalpodautoscaler.go index a8d1346637a..25fe02fec7d 100644 --- a/pkg/client/listers/autoscaling/v1/zz_generated.horizontalpodautoscaler.go +++ b/pkg/client/listers/autoscaling/v1/zz_generated.horizontalpodautoscaler.go @@ -20,6 +20,7 @@ package v1 import ( "k8s.io/kubernetes/pkg/api/errors" + autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling" v1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/client/listers/batch/v1/BUILD b/pkg/client/listers/batch/v1/BUILD index fc9764d755e..1a981ba9051 100644 --- a/pkg/client/listers/batch/v1/BUILD +++ b/pkg/client/listers/batch/v1/BUILD @@ -16,6 +16,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/errors:go_default_library", + "//pkg/apis/batch:go_default_library", "//pkg/apis/batch/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/labels:go_default_library", diff --git a/pkg/client/listers/batch/v1/zz_generated.job.go b/pkg/client/listers/batch/v1/zz_generated.job.go index b51b43b6eeb..5b770f957fd 100644 --- a/pkg/client/listers/batch/v1/zz_generated.job.go +++ b/pkg/client/listers/batch/v1/zz_generated.job.go @@ -20,6 +20,7 @@ package v1 import ( "k8s.io/kubernetes/pkg/api/errors" + batch "k8s.io/kubernetes/pkg/apis/batch" v1 "k8s.io/kubernetes/pkg/apis/batch/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/client/listers/batch/v2alpha1/BUILD b/pkg/client/listers/batch/v2alpha1/BUILD index 5e8b348dee2..fad4c9a7d20 100644 --- a/pkg/client/listers/batch/v2alpha1/BUILD +++ b/pkg/client/listers/batch/v2alpha1/BUILD @@ -19,6 +19,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/errors:go_default_library", + "//pkg/apis/batch:go_default_library", "//pkg/apis/batch/v2alpha1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/labels:go_default_library", diff --git a/pkg/client/listers/batch/v2alpha1/zz_generated.job.go b/pkg/client/listers/batch/v2alpha1/zz_generated.job.go index ad33044eaa1..36bb173b269 100644 --- a/pkg/client/listers/batch/v2alpha1/zz_generated.job.go +++ b/pkg/client/listers/batch/v2alpha1/zz_generated.job.go @@ -20,6 +20,7 @@ package v2alpha1 import ( "k8s.io/kubernetes/pkg/api/errors" + batch "k8s.io/kubernetes/pkg/apis/batch" v2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/client/listers/batch/v2alpha1/zz_generated.scheduledjob.go b/pkg/client/listers/batch/v2alpha1/zz_generated.scheduledjob.go index 4ebd20b7503..c9741edc08d 100644 --- a/pkg/client/listers/batch/v2alpha1/zz_generated.scheduledjob.go +++ b/pkg/client/listers/batch/v2alpha1/zz_generated.scheduledjob.go @@ -20,6 +20,7 @@ package v2alpha1 import ( "k8s.io/kubernetes/pkg/api/errors" + batch "k8s.io/kubernetes/pkg/apis/batch" v2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/client/listers/certificates/v1alpha1/BUILD b/pkg/client/listers/certificates/v1alpha1/BUILD index 9bd108c07f3..b254fe0f638 100644 --- a/pkg/client/listers/certificates/v1alpha1/BUILD +++ b/pkg/client/listers/certificates/v1alpha1/BUILD @@ -17,6 +17,7 @@ go_library( deps = [ "//pkg/api/errors:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/certificates:go_default_library", "//pkg/apis/certificates/v1alpha1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/labels:go_default_library", diff --git a/pkg/client/listers/certificates/v1alpha1/zz_generated.certificatesigningrequest.go b/pkg/client/listers/certificates/v1alpha1/zz_generated.certificatesigningrequest.go index 6f4d661f2c5..f6cf79f485b 100644 --- a/pkg/client/listers/certificates/v1alpha1/zz_generated.certificatesigningrequest.go +++ b/pkg/client/listers/certificates/v1alpha1/zz_generated.certificatesigningrequest.go @@ -21,6 +21,7 @@ package v1alpha1 import ( "k8s.io/kubernetes/pkg/api/errors" v1 "k8s.io/kubernetes/pkg/api/v1" + certificates "k8s.io/kubernetes/pkg/apis/certificates" v1alpha1 "k8s.io/kubernetes/pkg/apis/certificates/v1alpha1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/client/listers/core/v1/BUILD b/pkg/client/listers/core/v1/BUILD index d41227fd265..9fdb961b74d 100644 --- a/pkg/client/listers/core/v1/BUILD +++ b/pkg/client/listers/core/v1/BUILD @@ -32,6 +32,7 @@ go_library( ], tags = ["automanaged"], deps = [ + "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/client/cache:go_default_library", diff --git a/pkg/client/listers/core/v1/zz_generated.componentstatus.go b/pkg/client/listers/core/v1/zz_generated.componentstatus.go index f75f64911ed..2fb6938d0be 100644 --- a/pkg/client/listers/core/v1/zz_generated.componentstatus.go +++ b/pkg/client/listers/core/v1/zz_generated.componentstatus.go @@ -19,6 +19,7 @@ limitations under the License. package v1 import ( + api "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" diff --git a/pkg/client/listers/core/v1/zz_generated.configmap.go b/pkg/client/listers/core/v1/zz_generated.configmap.go index 7674c1b8b8b..a087aafe40f 100644 --- a/pkg/client/listers/core/v1/zz_generated.configmap.go +++ b/pkg/client/listers/core/v1/zz_generated.configmap.go @@ -19,6 +19,7 @@ limitations under the License. package v1 import ( + api "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" diff --git a/pkg/client/listers/core/v1/zz_generated.endpoints.go b/pkg/client/listers/core/v1/zz_generated.endpoints.go index f0b2e6644a2..bd511504cf2 100644 --- a/pkg/client/listers/core/v1/zz_generated.endpoints.go +++ b/pkg/client/listers/core/v1/zz_generated.endpoints.go @@ -19,6 +19,7 @@ limitations under the License. package v1 import ( + api "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" diff --git a/pkg/client/listers/core/v1/zz_generated.event.go b/pkg/client/listers/core/v1/zz_generated.event.go index 21d9eaf3a8d..2ede1c1c58b 100644 --- a/pkg/client/listers/core/v1/zz_generated.event.go +++ b/pkg/client/listers/core/v1/zz_generated.event.go @@ -19,6 +19,7 @@ limitations under the License. package v1 import ( + api "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" diff --git a/pkg/client/listers/core/v1/zz_generated.limitrange.go b/pkg/client/listers/core/v1/zz_generated.limitrange.go index 1416abd5698..124ebe75a79 100644 --- a/pkg/client/listers/core/v1/zz_generated.limitrange.go +++ b/pkg/client/listers/core/v1/zz_generated.limitrange.go @@ -19,6 +19,7 @@ limitations under the License. package v1 import ( + api "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" diff --git a/pkg/client/listers/core/v1/zz_generated.namespace.go b/pkg/client/listers/core/v1/zz_generated.namespace.go index 133e8431c0a..e5f4022b604 100644 --- a/pkg/client/listers/core/v1/zz_generated.namespace.go +++ b/pkg/client/listers/core/v1/zz_generated.namespace.go @@ -19,6 +19,7 @@ limitations under the License. package v1 import ( + api "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" diff --git a/pkg/client/listers/core/v1/zz_generated.node.go b/pkg/client/listers/core/v1/zz_generated.node.go index 759c7bfca85..72499086f87 100644 --- a/pkg/client/listers/core/v1/zz_generated.node.go +++ b/pkg/client/listers/core/v1/zz_generated.node.go @@ -19,6 +19,7 @@ limitations under the License. package v1 import ( + api "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" diff --git a/pkg/client/listers/core/v1/zz_generated.persistentvolume.go b/pkg/client/listers/core/v1/zz_generated.persistentvolume.go index 18ce0e9eb5d..f92ad8925d5 100644 --- a/pkg/client/listers/core/v1/zz_generated.persistentvolume.go +++ b/pkg/client/listers/core/v1/zz_generated.persistentvolume.go @@ -19,6 +19,7 @@ limitations under the License. package v1 import ( + api "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" diff --git a/pkg/client/listers/core/v1/zz_generated.persistentvolumeclaim.go b/pkg/client/listers/core/v1/zz_generated.persistentvolumeclaim.go index 7a1d7c4705f..dcf30d19f64 100644 --- a/pkg/client/listers/core/v1/zz_generated.persistentvolumeclaim.go +++ b/pkg/client/listers/core/v1/zz_generated.persistentvolumeclaim.go @@ -19,6 +19,7 @@ limitations under the License. package v1 import ( + api "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" diff --git a/pkg/client/listers/core/v1/zz_generated.pod.go b/pkg/client/listers/core/v1/zz_generated.pod.go index 594e53e4bd5..d69c904536f 100644 --- a/pkg/client/listers/core/v1/zz_generated.pod.go +++ b/pkg/client/listers/core/v1/zz_generated.pod.go @@ -19,6 +19,7 @@ limitations under the License. package v1 import ( + api "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" diff --git a/pkg/client/listers/core/v1/zz_generated.podtemplate.go b/pkg/client/listers/core/v1/zz_generated.podtemplate.go index 0df01dd43a7..b9229a7ee33 100644 --- a/pkg/client/listers/core/v1/zz_generated.podtemplate.go +++ b/pkg/client/listers/core/v1/zz_generated.podtemplate.go @@ -19,6 +19,7 @@ limitations under the License. package v1 import ( + api "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" diff --git a/pkg/client/listers/core/v1/zz_generated.replicationcontroller.go b/pkg/client/listers/core/v1/zz_generated.replicationcontroller.go index 940ea9b8d95..ba4e52cc596 100644 --- a/pkg/client/listers/core/v1/zz_generated.replicationcontroller.go +++ b/pkg/client/listers/core/v1/zz_generated.replicationcontroller.go @@ -19,6 +19,7 @@ limitations under the License. package v1 import ( + api "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" diff --git a/pkg/client/listers/core/v1/zz_generated.resourcequota.go b/pkg/client/listers/core/v1/zz_generated.resourcequota.go index 5dc000eb89d..ac3ee563499 100644 --- a/pkg/client/listers/core/v1/zz_generated.resourcequota.go +++ b/pkg/client/listers/core/v1/zz_generated.resourcequota.go @@ -19,6 +19,7 @@ limitations under the License. package v1 import ( + api "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" diff --git a/pkg/client/listers/core/v1/zz_generated.secret.go b/pkg/client/listers/core/v1/zz_generated.secret.go index 5c2c3bb5614..c8080462fe6 100644 --- a/pkg/client/listers/core/v1/zz_generated.secret.go +++ b/pkg/client/listers/core/v1/zz_generated.secret.go @@ -19,6 +19,7 @@ limitations under the License. package v1 import ( + api "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" diff --git a/pkg/client/listers/core/v1/zz_generated.service.go b/pkg/client/listers/core/v1/zz_generated.service.go index 330bb0eb8f4..6dd9fb8bd04 100644 --- a/pkg/client/listers/core/v1/zz_generated.service.go +++ b/pkg/client/listers/core/v1/zz_generated.service.go @@ -19,6 +19,7 @@ limitations under the License. package v1 import ( + api "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" diff --git a/pkg/client/listers/core/v1/zz_generated.serviceaccount.go b/pkg/client/listers/core/v1/zz_generated.serviceaccount.go index a19350e4718..4ceca0f4fda 100644 --- a/pkg/client/listers/core/v1/zz_generated.serviceaccount.go +++ b/pkg/client/listers/core/v1/zz_generated.serviceaccount.go @@ -19,6 +19,7 @@ limitations under the License. package v1 import ( + api "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" diff --git a/pkg/client/listers/extensions/v1beta1/BUILD b/pkg/client/listers/extensions/v1beta1/BUILD index 89bebd06bcf..8899e9e99d6 100644 --- a/pkg/client/listers/extensions/v1beta1/BUILD +++ b/pkg/client/listers/extensions/v1beta1/BUILD @@ -26,6 +26,7 @@ go_library( deps = [ "//pkg/api/errors:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/labels:go_default_library", diff --git a/pkg/client/listers/extensions/v1beta1/zz_generated.daemonset.go b/pkg/client/listers/extensions/v1beta1/zz_generated.daemonset.go index b810f1f2393..72254f5e8a2 100644 --- a/pkg/client/listers/extensions/v1beta1/zz_generated.daemonset.go +++ b/pkg/client/listers/extensions/v1beta1/zz_generated.daemonset.go @@ -20,6 +20,7 @@ package v1beta1 import ( "k8s.io/kubernetes/pkg/api/errors" + extensions "k8s.io/kubernetes/pkg/apis/extensions" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/client/listers/extensions/v1beta1/zz_generated.deployment.go b/pkg/client/listers/extensions/v1beta1/zz_generated.deployment.go index a66cb3ecdf8..0eda7bb0097 100644 --- a/pkg/client/listers/extensions/v1beta1/zz_generated.deployment.go +++ b/pkg/client/listers/extensions/v1beta1/zz_generated.deployment.go @@ -20,6 +20,7 @@ package v1beta1 import ( "k8s.io/kubernetes/pkg/api/errors" + extensions "k8s.io/kubernetes/pkg/apis/extensions" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/client/listers/extensions/v1beta1/zz_generated.ingress.go b/pkg/client/listers/extensions/v1beta1/zz_generated.ingress.go index 710b0ae06e0..cd0c23a820a 100644 --- a/pkg/client/listers/extensions/v1beta1/zz_generated.ingress.go +++ b/pkg/client/listers/extensions/v1beta1/zz_generated.ingress.go @@ -20,6 +20,7 @@ package v1beta1 import ( "k8s.io/kubernetes/pkg/api/errors" + extensions "k8s.io/kubernetes/pkg/apis/extensions" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/client/listers/extensions/v1beta1/zz_generated.job.go b/pkg/client/listers/extensions/v1beta1/zz_generated.job.go index 160a3c3ecbb..866f83a9909 100644 --- a/pkg/client/listers/extensions/v1beta1/zz_generated.job.go +++ b/pkg/client/listers/extensions/v1beta1/zz_generated.job.go @@ -20,6 +20,7 @@ package v1beta1 import ( "k8s.io/kubernetes/pkg/api/errors" + extensions "k8s.io/kubernetes/pkg/apis/extensions" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/client/listers/extensions/v1beta1/zz_generated.podsecuritypolicy.go b/pkg/client/listers/extensions/v1beta1/zz_generated.podsecuritypolicy.go index 7447298b7b7..d2e233c8b31 100644 --- a/pkg/client/listers/extensions/v1beta1/zz_generated.podsecuritypolicy.go +++ b/pkg/client/listers/extensions/v1beta1/zz_generated.podsecuritypolicy.go @@ -21,6 +21,7 @@ package v1beta1 import ( "k8s.io/kubernetes/pkg/api/errors" v1 "k8s.io/kubernetes/pkg/api/v1" + extensions "k8s.io/kubernetes/pkg/apis/extensions" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/client/listers/extensions/v1beta1/zz_generated.replicaset.go b/pkg/client/listers/extensions/v1beta1/zz_generated.replicaset.go index b9e42413e2b..0757408abe3 100644 --- a/pkg/client/listers/extensions/v1beta1/zz_generated.replicaset.go +++ b/pkg/client/listers/extensions/v1beta1/zz_generated.replicaset.go @@ -20,6 +20,7 @@ package v1beta1 import ( "k8s.io/kubernetes/pkg/api/errors" + extensions "k8s.io/kubernetes/pkg/apis/extensions" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/client/listers/extensions/v1beta1/zz_generated.scale.go b/pkg/client/listers/extensions/v1beta1/zz_generated.scale.go index 4bb29d35473..47dbbf72e56 100644 --- a/pkg/client/listers/extensions/v1beta1/zz_generated.scale.go +++ b/pkg/client/listers/extensions/v1beta1/zz_generated.scale.go @@ -20,6 +20,7 @@ package v1beta1 import ( "k8s.io/kubernetes/pkg/api/errors" + extensions "k8s.io/kubernetes/pkg/apis/extensions" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/client/listers/extensions/v1beta1/zz_generated.thirdpartyresource.go b/pkg/client/listers/extensions/v1beta1/zz_generated.thirdpartyresource.go index e2d100fda53..61109d69cb3 100644 --- a/pkg/client/listers/extensions/v1beta1/zz_generated.thirdpartyresource.go +++ b/pkg/client/listers/extensions/v1beta1/zz_generated.thirdpartyresource.go @@ -21,6 +21,7 @@ package v1beta1 import ( "k8s.io/kubernetes/pkg/api/errors" v1 "k8s.io/kubernetes/pkg/api/v1" + extensions "k8s.io/kubernetes/pkg/apis/extensions" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/client/listers/imagepolicy/v1alpha1/BUILD b/pkg/client/listers/imagepolicy/v1alpha1/BUILD index ebc35bb266f..59ffe0b7da7 100644 --- a/pkg/client/listers/imagepolicy/v1alpha1/BUILD +++ b/pkg/client/listers/imagepolicy/v1alpha1/BUILD @@ -17,6 +17,7 @@ go_library( deps = [ "//pkg/api/errors:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/imagepolicy:go_default_library", "//pkg/apis/imagepolicy/v1alpha1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/labels:go_default_library", diff --git a/pkg/client/listers/imagepolicy/v1alpha1/zz_generated.imagereview.go b/pkg/client/listers/imagepolicy/v1alpha1/zz_generated.imagereview.go index f16e9707458..e8b9232c17a 100644 --- a/pkg/client/listers/imagepolicy/v1alpha1/zz_generated.imagereview.go +++ b/pkg/client/listers/imagepolicy/v1alpha1/zz_generated.imagereview.go @@ -21,6 +21,7 @@ package v1alpha1 import ( "k8s.io/kubernetes/pkg/api/errors" v1 "k8s.io/kubernetes/pkg/api/v1" + imagepolicy "k8s.io/kubernetes/pkg/apis/imagepolicy" v1alpha1 "k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/client/listers/policy/v1alpha1/BUILD b/pkg/client/listers/policy/v1alpha1/BUILD index 13179329b52..26c6e7b1384 100644 --- a/pkg/client/listers/policy/v1alpha1/BUILD +++ b/pkg/client/listers/policy/v1alpha1/BUILD @@ -16,6 +16,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/errors:go_default_library", + "//pkg/apis/policy:go_default_library", "//pkg/apis/policy/v1alpha1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/labels:go_default_library", diff --git a/pkg/client/listers/policy/v1alpha1/zz_generated.poddisruptionbudget.go b/pkg/client/listers/policy/v1alpha1/zz_generated.poddisruptionbudget.go index c1ee9f7ea2d..00640ce6319 100644 --- a/pkg/client/listers/policy/v1alpha1/zz_generated.poddisruptionbudget.go +++ b/pkg/client/listers/policy/v1alpha1/zz_generated.poddisruptionbudget.go @@ -20,6 +20,7 @@ package v1alpha1 import ( "k8s.io/kubernetes/pkg/api/errors" + policy "k8s.io/kubernetes/pkg/apis/policy" v1alpha1 "k8s.io/kubernetes/pkg/apis/policy/v1alpha1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/client/listers/rbac/v1alpha1/BUILD b/pkg/client/listers/rbac/v1alpha1/BUILD index 1fe657fdb35..15c090f5653 100644 --- a/pkg/client/listers/rbac/v1alpha1/BUILD +++ b/pkg/client/listers/rbac/v1alpha1/BUILD @@ -22,6 +22,7 @@ go_library( deps = [ "//pkg/api/errors:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/v1alpha1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/labels:go_default_library", diff --git a/pkg/client/listers/rbac/v1alpha1/zz_generated.clusterrole.go b/pkg/client/listers/rbac/v1alpha1/zz_generated.clusterrole.go index 3bd72135814..7d674b30857 100644 --- a/pkg/client/listers/rbac/v1alpha1/zz_generated.clusterrole.go +++ b/pkg/client/listers/rbac/v1alpha1/zz_generated.clusterrole.go @@ -21,6 +21,7 @@ package v1alpha1 import ( "k8s.io/kubernetes/pkg/api/errors" v1 "k8s.io/kubernetes/pkg/api/v1" + rbac "k8s.io/kubernetes/pkg/apis/rbac" v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/client/listers/rbac/v1alpha1/zz_generated.clusterrolebinding.go b/pkg/client/listers/rbac/v1alpha1/zz_generated.clusterrolebinding.go index 69ac03c49fa..29ec5641c70 100644 --- a/pkg/client/listers/rbac/v1alpha1/zz_generated.clusterrolebinding.go +++ b/pkg/client/listers/rbac/v1alpha1/zz_generated.clusterrolebinding.go @@ -21,6 +21,7 @@ package v1alpha1 import ( "k8s.io/kubernetes/pkg/api/errors" v1 "k8s.io/kubernetes/pkg/api/v1" + rbac "k8s.io/kubernetes/pkg/apis/rbac" v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/client/listers/rbac/v1alpha1/zz_generated.role.go b/pkg/client/listers/rbac/v1alpha1/zz_generated.role.go index 4825addf6c9..5d5f0195ea5 100644 --- a/pkg/client/listers/rbac/v1alpha1/zz_generated.role.go +++ b/pkg/client/listers/rbac/v1alpha1/zz_generated.role.go @@ -20,6 +20,7 @@ package v1alpha1 import ( "k8s.io/kubernetes/pkg/api/errors" + rbac "k8s.io/kubernetes/pkg/apis/rbac" v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/client/listers/rbac/v1alpha1/zz_generated.rolebinding.go b/pkg/client/listers/rbac/v1alpha1/zz_generated.rolebinding.go index 5da3c7bbde0..df1714a250e 100644 --- a/pkg/client/listers/rbac/v1alpha1/zz_generated.rolebinding.go +++ b/pkg/client/listers/rbac/v1alpha1/zz_generated.rolebinding.go @@ -20,6 +20,7 @@ package v1alpha1 import ( "k8s.io/kubernetes/pkg/api/errors" + rbac "k8s.io/kubernetes/pkg/apis/rbac" v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/client/listers/storage/v1beta1/BUILD b/pkg/client/listers/storage/v1beta1/BUILD index 272a3567e7a..ffa210c7d03 100644 --- a/pkg/client/listers/storage/v1beta1/BUILD +++ b/pkg/client/listers/storage/v1beta1/BUILD @@ -17,6 +17,7 @@ go_library( deps = [ "//pkg/api/errors:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/storage:go_default_library", "//pkg/apis/storage/v1beta1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/labels:go_default_library", diff --git a/pkg/client/listers/storage/v1beta1/zz_generated.storageclass.go b/pkg/client/listers/storage/v1beta1/zz_generated.storageclass.go index 3b6f08302fd..534aac099b8 100644 --- a/pkg/client/listers/storage/v1beta1/zz_generated.storageclass.go +++ b/pkg/client/listers/storage/v1beta1/zz_generated.storageclass.go @@ -21,6 +21,7 @@ package v1beta1 import ( "k8s.io/kubernetes/pkg/api/errors" v1 "k8s.io/kubernetes/pkg/api/v1" + storage "k8s.io/kubernetes/pkg/apis/storage" v1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels"