Merge pull request kubernetes#36014 from mikedanese/fix-compile

Automatic merge from submit-queue

make ./pkg/client/listers compile

currently compilation is broken

```
$ go install ./pkg/client/listers/...
# k8s.io/kubernetes/pkg/client/listers/apps/v1alpha1
pkg/client/listers/apps/v1alpha1/zz_generated.statefulset.go:89: undefined: apps in apps.Resource
# k8s.io/kubernetes/pkg/client/listers/autoscaling/v1
pkg/client/listers/autoscaling/v1/zz_generated.horizontalpodautoscaler.go:89: undefined: autoscaling in autoscaling.Resource
# k8s.io/kubernetes/pkg/client/listers/batch/v2alpha1
pkg/client/listers/batch/v2alpha1/zz_generated.job.go:89: undefined: batch in batch.Resource
pkg/client/listers/batch/v2alpha1/zz_generated.scheduledjob.go:89: undefined: batch in batch.Resource
# k8s.io/kubernetes/pkg/client/listers/authentication/v1beta1
pkg/client/listers/authentication/v1beta1/zz_generated.tokenreview.go:63: undefined: authentication in authentication.Resource
# k8s.io/kubernetes/pkg/client/listers/batch/v1
pkg/client/listers/batch/v1/zz_generated.job.go:89: undefined: batch in batch.Resource
# k8s.io/kubernetes/pkg/client/listers/authorization/v1beta1
pkg/client/listers/authorization/v1beta1/zz_generated.localsubjectaccessreview.go:89: undefined: authorization in authorization.Resource
pkg/client/listers/authorization/v1beta1/zz_generated.selfsubjectaccessreview.go:63: undefined: authorization in authorization.Resource
pkg/client/listers/authorization/v1beta1/zz_generated.subjectaccessreview.go:63: undefined: authorization in authorization.Resource
# k8s.io/kubernetes/pkg/client/listers/certificates/v1alpha1
pkg/client/listers/certificates/v1alpha1/zz_generated.certificatesigningrequest.go:63: undefined: certificates in certificates.Resource
# k8s.io/kubernetes/pkg/client/listers/policy/v1alpha1
pkg/client/listers/policy/v1alpha1/zz_generated.poddisruptionbudget.go:89: undefined: policy in policy.Resource
# k8s.io/kubernetes/pkg/client/listers/core/v1
pkg/client/listers/core/v1/zz_generated.componentstatus.go:62: undefined: api in api.Resource
pkg/client/listers/core/v1/zz_generated.configmap.go:89: undefined: api in api.Resource
pkg/client/listers/core/v1/zz_generated.endpoints.go:89: undefined: api in api.Resource
pkg/client/listers/core/v1/zz_generated.event.go:89: undefined: api in api.Resource
pkg/client/listers/core/v1/zz_generated.limitrange.go:89: undefined: api in api.Resource
pkg/client/listers/core/v1/zz_generated.namespace.go:62: undefined: api in api.Resource
pkg/client/listers/core/v1/zz_generated.node.go:62: undefined: api in api.Resource
pkg/client/listers/core/v1/zz_generated.persistentvolume.go:62: undefined: api in api.Resource
pkg/client/listers/core/v1/zz_generated.persistentvolumeclaim.go:89: undefined: api in api.Resource
pkg/client/listers/core/v1/zz_generated.pod.go:89: undefined: api
pkg/client/listers/core/v1/zz_generated.pod.go:89: too many errors
# k8s.io/kubernetes/pkg/client/listers/imagepolicy/v1alpha1
pkg/client/listers/imagepolicy/v1alpha1/zz_generated.imagereview.go:63: undefined: imagepolicy in imagepolicy.Resource
# k8s.io/kubernetes/pkg/client/listers/rbac/v1alpha1
pkg/client/listers/rbac/v1alpha1/zz_generated.clusterrole.go:63: undefined: rbac in rbac.Resource
pkg/client/listers/rbac/v1alpha1/zz_generated.clusterrolebinding.go:63: undefined: rbac in rbac.Resource
pkg/client/listers/rbac/v1alpha1/zz_generated.role.go:89: undefined: rbac in rbac.Resource
pkg/client/listers/rbac/v1alpha1/zz_generated.rolebinding.go:89: undefined: rbac in rbac.Resource
# k8s.io/kubernetes/pkg/client/listers/storage/v1beta1
pkg/client/listers/storage/v1beta1/zz_generated.storageclass.go:63: undefined: storage in storage.Resource
# k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1
pkg/client/listers/extensions/v1beta1/zz_generated.daemonset.go:89: undefined: extensions in extensions.Resource
pkg/client/listers/extensions/v1beta1/zz_generated.deployment.go:89: undefined: extensions in extensions.Resource
pkg/client/listers/extensions/v1beta1/zz_generated.ingress.go:89: undefined: extensions in extensions.Resource
pkg/client/listers/extensions/v1beta1/zz_generated.job.go:89: undefined: extensions in extensions.Resource
pkg/client/listers/extensions/v1beta1/zz_generated.podsecuritypolicy.go:63: undefined: extensions in extensions.Resource
pkg/client/listers/extensions/v1beta1/zz_generated.replicaset.go:89: undefined: extensions in extensions.Resource
pkg/client/listers/extensions/v1beta1/zz_generated.scale.go:89: undefined: extensions in extensions.Resource
pkg/client/listers/extensions/v1beta1/zz_generated.thirdpartyresource.go:63: undefined: extensions in extensions.Resource
```
cc @ncdc @caesarxuchao

Author: Kubernetes Submit Queue

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

@@ -97,17 +97,21 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
 		}
 
 		var gv clientgentypes.GroupVersion
+		var internalGVPkg string
 
 		if isInternal(objectMeta) {
 			lastSlash := strings.LastIndex(p.Path, "/")
 			if lastSlash == -1 {
 				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
 }

pkg/client/lister/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",

pkg/client/listers/apps/v1alpha1/BUILD

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

pkg/client/listers/apps/v1alpha1/zz_generated.statefulset.go

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

pkg/client/listers/authentication/v1beta1/BUILD

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

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

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

pkg/client/listers/authorization/v1beta1/BUILD

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

pkg/client/listers/authorization/v1beta1/zz_generated.localsubjectaccessreview.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"

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"

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

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

pkg/client/listers/autoscaling/v1/BUILD

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

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

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

pkg/client/listers/batch/v1/BUILD

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

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

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

pkg/client/listers/batch/v2alpha1/BUILD

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

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"

pkg/client/listers/batch/v2alpha1/zz_generated.scheduledjob.go

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

pkg/client/listers/certificates/v1alpha1/BUILD

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

pkg/client/listers/certificates/v1alpha1/zz_generated.certificatesigningrequest.go

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

pkg/client/listers/core/v1/BUILD

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

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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

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