Update generated code

pkg/client/informers/informers_generated/internalversion/generic.go

@@ -63,33 +63,33 @@ func (f *genericInformer) Lister() cache.GenericLister {
 // TODO extend this to unknown resources with a client pool
 func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) {
 	switch resource {
-	// Group=Admissionregistration, Version=InternalVersion
+	// Group=admissionregistration.k8s.io, Version=internalVersion
 	case admissionregistration.SchemeGroupVersion.WithResource("externaladmissionhookconfigurations"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Admissionregistration().InternalVersion().ExternalAdmissionHookConfigurations().Informer()}, nil
 	case admissionregistration.SchemeGroupVersion.WithResource("initializerconfigurations"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Admissionregistration().InternalVersion().InitializerConfigurations().Informer()}, nil
 
-		// Group=Apps, Version=InternalVersion
+		// Group=apps, Version=internalVersion
 	case apps.SchemeGroupVersion.WithResource("controllerrevisions"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Apps().InternalVersion().ControllerRevisions().Informer()}, nil
 	case apps.SchemeGroupVersion.WithResource("statefulsets"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Apps().InternalVersion().StatefulSets().Informer()}, nil
 
-		// Group=Autoscaling, Version=InternalVersion
+		// Group=autoscaling, Version=internalVersion
 	case autoscaling.SchemeGroupVersion.WithResource("horizontalpodautoscalers"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Autoscaling().InternalVersion().HorizontalPodAutoscalers().Informer()}, nil
 
-		// Group=Batch, Version=InternalVersion
+		// Group=batch, Version=internalVersion
 	case batch.SchemeGroupVersion.WithResource("cronjobs"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Batch().InternalVersion().CronJobs().Informer()}, nil
 	case batch.SchemeGroupVersion.WithResource("jobs"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Batch().InternalVersion().Jobs().Informer()}, nil
 
-		// Group=Certificates, Version=InternalVersion
+		// Group=certificates.k8s.io, Version=internalVersion
 	case certificates.SchemeGroupVersion.WithResource("certificatesigningrequests"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Certificates().InternalVersion().CertificateSigningRequests().Informer()}, nil
 
-		// Group=Core, Version=InternalVersion
+		// Group=core, Version=internalVersion
 	case api.SchemeGroupVersion.WithResource("componentstatuses"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().ComponentStatuses().Informer()}, nil
 	case api.SchemeGroupVersion.WithResource("configmaps"):
@@ -123,7 +123,7 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
 	case api.SchemeGroupVersion.WithResource("serviceaccounts"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().ServiceAccounts().Informer()}, nil
 
-		// Group=Extensions, Version=InternalVersion
+		// Group=extensions, Version=internalVersion
 	case extensions.SchemeGroupVersion.WithResource("daemonsets"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Extensions().InternalVersion().DaemonSets().Informer()}, nil
 	case extensions.SchemeGroupVersion.WithResource("deployments"):
@@ -135,15 +135,15 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
 	case extensions.SchemeGroupVersion.WithResource("replicasets"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Extensions().InternalVersion().ReplicaSets().Informer()}, nil
 
-		// Group=Networking, Version=InternalVersion
+		// Group=networking.k8s.io, Version=internalVersion
 	case networking.SchemeGroupVersion.WithResource("networkpolicies"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Networking().InternalVersion().NetworkPolicies().Informer()}, nil
 
-		// Group=Policy, Version=InternalVersion
+		// Group=policy, Version=internalVersion
 	case policy.SchemeGroupVersion.WithResource("poddisruptionbudgets"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Policy().InternalVersion().PodDisruptionBudgets().Informer()}, nil
 
-		// Group=Rbac, Version=InternalVersion
+		// Group=rbac.authorization.k8s.io, Version=internalVersion
 	case rbac.SchemeGroupVersion.WithResource("clusterroles"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Rbac().InternalVersion().ClusterRoles().Informer()}, nil
 	case rbac.SchemeGroupVersion.WithResource("clusterrolebindings"):
@@ -153,15 +153,15 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
 	case rbac.SchemeGroupVersion.WithResource("rolebindings"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Rbac().InternalVersion().RoleBindings().Informer()}, nil
 
-		// Group=Scheduling, Version=InternalVersion
+		// Group=scheduling.k8s.io, Version=internalVersion
 	case scheduling.SchemeGroupVersion.WithResource("priorityclasses"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Scheduling().InternalVersion().PriorityClasses().Informer()}, nil
 
-		// Group=Settings, Version=InternalVersion
+		// Group=settings.k8s.io, Version=internalVersion
 	case settings.SchemeGroupVersion.WithResource("podpresets"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Settings().InternalVersion().PodPresets().Informer()}, nil
 
-		// Group=Storage, Version=InternalVersion
+		// Group=storage.k8s.io, Version=internalVersion
 	case storage.SchemeGroupVersion.WithResource("storageclasses"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Storage().InternalVersion().StorageClasses().Informer()}, nil
 

staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/generic.go

@@ -51,7 +51,7 @@ func (f *genericInformer) Lister() cache.GenericLister {
 // TODO extend this to unknown resources with a client pool
 func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) {
 	switch resource {
-	// Group=Apiextensions, Version=V1beta1
+	// Group=apiextensions.k8s.io, Version=v1beta1
 	case v1beta1.SchemeGroupVersion.WithResource("customresourcedefinitions"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Apiextensions().V1beta1().CustomResourceDefinitions().Informer()}, nil
 

staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/generic.go

@@ -51,7 +51,7 @@ func (f *genericInformer) Lister() cache.GenericLister {
 // TODO extend this to unknown resources with a client pool
 func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) {
 	switch resource {
-	// Group=Apiextensions, Version=InternalVersion
+	// Group=apiextensions.k8s.io, Version=internalVersion
 	case apiextensions.SchemeGroupVersion.WithResource("customresourcedefinitions"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Apiextensions().InternalVersion().CustomResourceDefinitions().Informer()}, nil
 

staging/src/k8s.io/client-go/informers/generic.go

@@ -71,13 +71,13 @@ func (f *genericInformer) Lister() cache.GenericLister {
 // TODO extend this to unknown resources with a client pool
 func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) {
 	switch resource {
-	// Group=Admissionregistration, Version=V1alpha1
+	// Group=admissionregistration.k8s.io, Version=v1alpha1
 	case v1alpha1.SchemeGroupVersion.WithResource("externaladmissionhookconfigurations"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Admissionregistration().V1alpha1().ExternalAdmissionHookConfigurations().Informer()}, nil
 	case v1alpha1.SchemeGroupVersion.WithResource("initializerconfigurations"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Admissionregistration().V1alpha1().InitializerConfigurations().Informer()}, nil
 
-		// Group=Apps, Version=V1
+		// Group=apps, Version=v1
 	case v1.SchemeGroupVersion.WithResource("controllerrevisions"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Apps().V1().ControllerRevisions().Informer()}, nil
 	case v1.SchemeGroupVersion.WithResource("daemonsets"):
@@ -89,7 +89,7 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
 	case v1.SchemeGroupVersion.WithResource("statefulsets"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Apps().V1().StatefulSets().Informer()}, nil
 
-		// Group=Apps, Version=V1beta1
+		// Group=apps, Version=v1beta1
 	case v1beta1.SchemeGroupVersion.WithResource("controllerrevisions"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Apps().V1beta1().ControllerRevisions().Informer()}, nil
 	case v1beta1.SchemeGroupVersion.WithResource("deployments"):
@@ -97,7 +97,7 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
 	case v1beta1.SchemeGroupVersion.WithResource("statefulsets"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Apps().V1beta1().StatefulSets().Informer()}, nil
 
-		// Group=Apps, Version=V1beta2
+		// Group=apps, Version=v1beta2
 	case v1beta2.SchemeGroupVersion.WithResource("controllerrevisions"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Apps().V1beta2().ControllerRevisions().Informer()}, nil
 	case v1beta2.SchemeGroupVersion.WithResource("daemonsets"):
@@ -109,31 +109,31 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
 	case v1beta2.SchemeGroupVersion.WithResource("statefulsets"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Apps().V1beta2().StatefulSets().Informer()}, nil
 
-		// Group=Autoscaling, Version=V1
+		// Group=autoscaling, Version=v1
 	case autoscaling_v1.SchemeGroupVersion.WithResource("horizontalpodautoscalers"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Autoscaling().V1().HorizontalPodAutoscalers().Informer()}, nil
 
-		// Group=Autoscaling, Version=V2beta1
+		// Group=autoscaling, Version=v2beta1
 	case v2beta1.SchemeGroupVersion.WithResource("horizontalpodautoscalers"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Autoscaling().V2beta1().HorizontalPodAutoscalers().Informer()}, nil
 
-		// Group=Batch, Version=V1
+		// Group=batch, Version=v1
 	case batch_v1.SchemeGroupVersion.WithResource("jobs"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Batch().V1().Jobs().Informer()}, nil
 
-		// Group=Batch, Version=V1beta1
+		// Group=batch, Version=v1beta1
 	case batch_v1beta1.SchemeGroupVersion.WithResource("cronjobs"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Batch().V1beta1().CronJobs().Informer()}, nil
 
-		// Group=Batch, Version=V2alpha1
+		// Group=batch, Version=v2alpha1
 	case v2alpha1.SchemeGroupVersion.WithResource("cronjobs"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Batch().V2alpha1().CronJobs().Informer()}, nil
 
-		// Group=Certificates, Version=V1beta1
+		// Group=certificates.k8s.io, Version=v1beta1
 	case certificates_v1beta1.SchemeGroupVersion.WithResource("certificatesigningrequests"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Certificates().V1beta1().CertificateSigningRequests().Informer()}, nil
 
-		// Group=Core, Version=V1
+		// Group=core, Version=v1
 	case core_v1.SchemeGroupVersion.WithResource("componentstatuses"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().V1().ComponentStatuses().Informer()}, nil
 	case core_v1.SchemeGroupVersion.WithResource("configmaps"):
@@ -167,7 +167,7 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
 	case core_v1.SchemeGroupVersion.WithResource("serviceaccounts"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().V1().ServiceAccounts().Informer()}, nil
 
-		// Group=Extensions, Version=V1beta1
+		// Group=extensions, Version=v1beta1
 	case extensions_v1beta1.SchemeGroupVersion.WithResource("daemonsets"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Extensions().V1beta1().DaemonSets().Informer()}, nil
 	case extensions_v1beta1.SchemeGroupVersion.WithResource("deployments"):
@@ -179,15 +179,15 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
 	case extensions_v1beta1.SchemeGroupVersion.WithResource("replicasets"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Extensions().V1beta1().ReplicaSets().Informer()}, nil
 
-		// Group=Networking, Version=V1
+		// Group=networking.k8s.io, Version=v1
 	case networking_v1.SchemeGroupVersion.WithResource("networkpolicies"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Networking().V1().NetworkPolicies().Informer()}, nil
 
-		// Group=Policy, Version=V1beta1
+		// Group=policy, Version=v1beta1
 	case policy_v1beta1.SchemeGroupVersion.WithResource("poddisruptionbudgets"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Policy().V1beta1().PodDisruptionBudgets().Informer()}, nil
 
-		// Group=Rbac, Version=V1
+		// Group=rbac.authorization.k8s.io, Version=v1
 	case rbac_v1.SchemeGroupVersion.WithResource("clusterroles"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Rbac().V1().ClusterRoles().Informer()}, nil
 	case rbac_v1.SchemeGroupVersion.WithResource("clusterrolebindings"):
@@ -197,7 +197,7 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
 	case rbac_v1.SchemeGroupVersion.WithResource("rolebindings"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Rbac().V1().RoleBindings().Informer()}, nil
 
-		// Group=Rbac, Version=V1alpha1
+		// Group=rbac.authorization.k8s.io, Version=v1alpha1
 	case rbac_v1alpha1.SchemeGroupVersion.WithResource("clusterroles"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Rbac().V1alpha1().ClusterRoles().Informer()}, nil
 	case rbac_v1alpha1.SchemeGroupVersion.WithResource("clusterrolebindings"):
@@ -207,7 +207,7 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
 	case rbac_v1alpha1.SchemeGroupVersion.WithResource("rolebindings"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Rbac().V1alpha1().RoleBindings().Informer()}, nil
 
-		// Group=Rbac, Version=V1beta1
+		// Group=rbac.authorization.k8s.io, Version=v1beta1
 	case rbac_v1beta1.SchemeGroupVersion.WithResource("clusterroles"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Rbac().V1beta1().ClusterRoles().Informer()}, nil
 	case rbac_v1beta1.SchemeGroupVersion.WithResource("clusterrolebindings"):
@@ -217,19 +217,19 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
 	case rbac_v1beta1.SchemeGroupVersion.WithResource("rolebindings"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Rbac().V1beta1().RoleBindings().Informer()}, nil
 
-		// Group=Scheduling, Version=V1alpha1
+		// Group=scheduling.k8s.io, Version=v1alpha1
 	case scheduling_v1alpha1.SchemeGroupVersion.WithResource("priorityclasses"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Scheduling().V1alpha1().PriorityClasses().Informer()}, nil
 
-		// Group=Settings, Version=V1alpha1
+		// Group=settings.k8s.io, Version=v1alpha1
 	case settings_v1alpha1.SchemeGroupVersion.WithResource("podpresets"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Settings().V1alpha1().PodPresets().Informer()}, nil
 
-		// Group=Storage, Version=V1
+		// Group=storage.k8s.io, Version=v1
 	case storage_v1.SchemeGroupVersion.WithResource("storageclasses"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Storage().V1().StorageClasses().Informer()}, nil
 
-		// Group=Storage, Version=V1beta1
+		// Group=storage.k8s.io, Version=v1beta1
 	case storage_v1beta1.SchemeGroupVersion.WithResource("storageclasses"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Storage().V1beta1().StorageClasses().Informer()}, nil
 

staging/src/k8s.io/code-generator/_examples/apiserver/informers/externalversions/generic.go

@@ -51,7 +51,7 @@ func (f *genericInformer) Lister() cache.GenericLister {
 // TODO extend this to unknown resources with a client pool
 func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) {
 	switch resource {
-	// Group=Example, Version=V1
+	// Group=example.apiserver.code-generator.k8s.io, Version=v1
 	case v1.SchemeGroupVersion.WithResource("testtypes"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Example().V1().TestTypes().Informer()}, nil
 

staging/src/k8s.io/code-generator/_examples/apiserver/informers/internalversion/generic.go

@@ -51,7 +51,7 @@ func (f *genericInformer) Lister() cache.GenericLister {
 // TODO extend this to unknown resources with a client pool
 func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) {
 	switch resource {
-	// Group=Example, Version=InternalVersion
+	// Group=example.apiserver.code-generator.k8s.io, Version=internalVersion
 	case example.SchemeGroupVersion.WithResource("testtypes"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Example().InternalVersion().TestTypes().Informer()}, nil
 

staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/clientset.go

@@ -22,6 +22,7 @@ import (
 	rest "k8s.io/client-go/rest"
 	flowcontrol "k8s.io/client-go/util/flowcontrol"
 	examplev1 "k8s.io/code-generator/_examples/crd/clientset/versioned/typed/example/v1"
+	example2v1 "k8s.io/code-generator/_examples/crd/clientset/versioned/typed/example2/v1"
 )
 
 type Interface interface {
@@ -29,13 +30,17 @@ type Interface interface {
 	ExampleV1() examplev1.ExampleV1Interface
 	// Deprecated: please explicitly pick a version if possible.
 	Example() examplev1.ExampleV1Interface
+	SecondExampleV1() example2v1.SecondExampleV1Interface
+	// Deprecated: please explicitly pick a version if possible.
+	SecondExample() example2v1.SecondExampleV1Interface
 }
 
 // Clientset contains the clients for groups. Each group has exactly one
 // version included in a Clientset.
 type Clientset struct {
 	*discovery.DiscoveryClient
-	exampleV1 *examplev1.ExampleV1Client
+	exampleV1       *examplev1.ExampleV1Client
+	secondExampleV1 *example2v1.SecondExampleV1Client
 }
 
 // ExampleV1 retrieves the ExampleV1Client
@@ -49,6 +54,17 @@ func (c *Clientset) Example() examplev1.ExampleV1Interface {
 	return c.exampleV1
 }
 
+// SecondExampleV1 retrieves the SecondExampleV1Client
+func (c *Clientset) SecondExampleV1() example2v1.SecondExampleV1Interface {
+	return c.secondExampleV1
+}
+
+// Deprecated: SecondExample retrieves the default version of SecondExampleClient.
+// Please explicitly pick a version.
+func (c *Clientset) SecondExample() example2v1.SecondExampleV1Interface {
+	return c.secondExampleV1
+}
+
 // Discovery retrieves the DiscoveryClient
 func (c *Clientset) Discovery() discovery.DiscoveryInterface {
 	if c == nil {
@@ -69,6 +85,10 @@ func NewForConfig(c *rest.Config) (*Clientset, error) {
 	if err != nil {
 		return nil, err
 	}
+	cs.secondExampleV1, err = example2v1.NewForConfig(&configShallowCopy)
+	if err != nil {
+		return nil, err
+	}
 
 	cs.DiscoveryClient, err = discovery.NewDiscoveryClientForConfig(&configShallowCopy)
 	if err != nil {
@@ -83,6 +103,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) {
 func NewForConfigOrDie(c *rest.Config) *Clientset {
 	var cs Clientset
 	cs.exampleV1 = examplev1.NewForConfigOrDie(c)
+	cs.secondExampleV1 = example2v1.NewForConfigOrDie(c)
 
 	cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c)
 	return &cs
@@ -92,6 +113,7 @@ func NewForConfigOrDie(c *rest.Config) *Clientset {
 func New(c rest.Interface) *Clientset {
 	var cs Clientset
 	cs.exampleV1 = examplev1.New(c)
+	cs.secondExampleV1 = example2v1.New(c)
 
 	cs.DiscoveryClient = discovery.NewDiscoveryClient(c)
 	return &cs

staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/fake/clientset_generated.go

@@ -25,6 +25,8 @@ import (
 	clientset "k8s.io/code-generator/_examples/crd/clientset/versioned"
 	examplev1 "k8s.io/code-generator/_examples/crd/clientset/versioned/typed/example/v1"
 	fakeexamplev1 "k8s.io/code-generator/_examples/crd/clientset/versioned/typed/example/v1/fake"
+	example2v1 "k8s.io/code-generator/_examples/crd/clientset/versioned/typed/example2/v1"
+	fakeexample2v1 "k8s.io/code-generator/_examples/crd/clientset/versioned/typed/example2/v1/fake"
 )
 
 // NewSimpleClientset returns a clientset that will respond with the provided objects.
@@ -69,3 +71,13 @@ func (c *Clientset) ExampleV1() examplev1.ExampleV1Interface {
 func (c *Clientset) Example() examplev1.ExampleV1Interface {
 	return &fakeexamplev1.FakeExampleV1{Fake: &c.Fake}
 }
+
+// SecondExampleV1 retrieves the SecondExampleV1Client
+func (c *Clientset) SecondExampleV1() example2v1.SecondExampleV1Interface {
+	return &fakeexample2v1.FakeSecondExampleV1{Fake: &c.Fake}
+}
+
+// SecondExample retrieves the SecondExampleV1Client
+func (c *Clientset) SecondExample() example2v1.SecondExampleV1Interface {
+	return &fakeexample2v1.FakeSecondExampleV1{Fake: &c.Fake}
+}

staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/fake/register.go

@@ -22,6 +22,7 @@ import (
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	examplev1 "k8s.io/code-generator/_examples/crd/apis/example/v1"
+	example2v1 "k8s.io/code-generator/_examples/crd/apis/example2/v1"
 )
 
 var scheme = runtime.NewScheme()
@@ -49,5 +50,6 @@ func init() {
 // correctly.
 func AddToScheme(scheme *runtime.Scheme) {
 	examplev1.AddToScheme(scheme)
+	example2v1.AddToScheme(scheme)
 
 }

staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/scheme/register.go

@@ -22,6 +22,7 @@ import (
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	examplev1 "k8s.io/code-generator/_examples/crd/apis/example/v1"
+	example2v1 "k8s.io/code-generator/_examples/crd/apis/example2/v1"
 )
 
 var Scheme = runtime.NewScheme()
@@ -49,5 +50,6 @@ func init() {
 // correctly.
 func AddToScheme(scheme *runtime.Scheme) {
 	examplev1.AddToScheme(scheme)
+	example2v1.AddToScheme(scheme)
 
 }

staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/typed/example2/v1/doc.go

@@ -0,0 +1,18 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// This package has the automatically generated typed clients.
+package v1

staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/typed/example2/v1/example2_client.go

@@ -0,0 +1,88 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1
+
+import (
+	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
+	rest "k8s.io/client-go/rest"
+	v1 "k8s.io/code-generator/_examples/crd/apis/example2/v1"
+	"k8s.io/code-generator/_examples/crd/clientset/versioned/scheme"
+)
+
+type SecondExampleV1Interface interface {
+	RESTClient() rest.Interface
+	TestTypesGetter
+}
+
+// SecondExampleV1Client is used to interact with features provided by the example.test2.crd.code-generator.k8s.io group.
+type SecondExampleV1Client struct {
+	restClient rest.Interface
+}
+
+func (c *SecondExampleV1Client) TestTypes(namespace string) TestTypeInterface {
+	return newTestTypes(c, namespace)
+}
+
+// NewForConfig creates a new SecondExampleV1Client for the given config.
+func NewForConfig(c *rest.Config) (*SecondExampleV1Client, error) {
+	config := *c
+	if err := setConfigDefaults(&config); err != nil {
+		return nil, err
+	}
+	client, err := rest.RESTClientFor(&config)
+	if err != nil {
+		return nil, err
+	}
+	return &SecondExampleV1Client{client}, nil
+}
+
+// NewForConfigOrDie creates a new SecondExampleV1Client for the given config and
+// panics if there is an error in the config.
+func NewForConfigOrDie(c *rest.Config) *SecondExampleV1Client {
+	client, err := NewForConfig(c)
+	if err != nil {
+		panic(err)
+	}
+	return client
+}
+
+// New creates a new SecondExampleV1Client for the given RESTClient.
+func New(c rest.Interface) *SecondExampleV1Client {
+	return &SecondExampleV1Client{c}
+}
+
+func setConfigDefaults(config *rest.Config) error {
+	gv := v1.SchemeGroupVersion
+	config.GroupVersion = &gv
+	config.APIPath = "/apis"
+	config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs}
+
+	if config.UserAgent == "" {
+		config.UserAgent = rest.DefaultKubernetesUserAgent()
+	}
+
+	return nil
+}
+
+// RESTClient returns a RESTClient that is used to communicate
+// with API server by this client implementation.
+func (c *SecondExampleV1Client) RESTClient() rest.Interface {
+	if c == nil {
+		return nil
+	}
+	return c.restClient
+}

staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/typed/example2/v1/fake/doc.go

@@ -0,0 +1,18 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package fake has the automatically generated clients.
+package fake

staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/typed/example2/v1/fake/fake_example2_client.go

@@ -0,0 +1,38 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package fake
+
+import (
+	rest "k8s.io/client-go/rest"
+	testing "k8s.io/client-go/testing"
+	v1 "k8s.io/code-generator/_examples/crd/clientset/versioned/typed/example2/v1"
+)
+
+type FakeSecondExampleV1 struct {
+	*testing.Fake
+}
+
+func (c *FakeSecondExampleV1) TestTypes(namespace string) v1.TestTypeInterface {
+	return &FakeTestTypes{c, namespace}
+}
+
+// RESTClient returns a RESTClient that is used to communicate
+// with API server by this client implementation.
+func (c *FakeSecondExampleV1) RESTClient() rest.Interface {
+	var ret *rest.RESTClient
+	return ret
+}

staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/typed/example2/v1/fake/fake_testtype.go

@@ -0,0 +1,138 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package fake
+
+import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	labels "k8s.io/apimachinery/pkg/labels"
+	schema "k8s.io/apimachinery/pkg/runtime/schema"
+	types "k8s.io/apimachinery/pkg/types"
+	watch "k8s.io/apimachinery/pkg/watch"
+	testing "k8s.io/client-go/testing"
+	example2_v1 "k8s.io/code-generator/_examples/crd/apis/example2/v1"
+)
+
+// FakeTestTypes implements TestTypeInterface
+type FakeTestTypes struct {
+	Fake *FakeSecondExampleV1
+	ns   string
+}
+
+var testtypesResource = schema.GroupVersionResource{Group: "example.test2.crd.code-generator.k8s.io", Version: "v1", Resource: "testtypes"}
+
+var testtypesKind = schema.GroupVersionKind{Group: "example.test2.crd.code-generator.k8s.io", Version: "v1", Kind: "TestType"}
+
+// Get takes name of the testType, and returns the corresponding testType object, and an error if there is any.
+func (c *FakeTestTypes) Get(name string, options v1.GetOptions) (result *example2_v1.TestType, err error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewGetAction(testtypesResource, c.ns, name), &example2_v1.TestType{})
+
+	if obj == nil {
+		return nil, err
+	}
+	return obj.(*example2_v1.TestType), err
+}
+
+// List takes label and field selectors, and returns the list of TestTypes that match those selectors.
+func (c *FakeTestTypes) List(opts v1.ListOptions) (result *example2_v1.TestTypeList, err error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewListAction(testtypesResource, testtypesKind, c.ns, opts), &example2_v1.TestTypeList{})
+
+	if obj == nil {
+		return nil, err
+	}
+
+	label, _, _ := testing.ExtractFromListOptions(opts)
+	if label == nil {
+		label = labels.Everything()
+	}
+	list := &example2_v1.TestTypeList{}
+	for _, item := range obj.(*example2_v1.TestTypeList).Items {
+		if label.Matches(labels.Set(item.Labels)) {
+			list.Items = append(list.Items, item)
+		}
+	}
+	return list, err
+}
+
+// Watch returns a watch.Interface that watches the requested testTypes.
+func (c *FakeTestTypes) Watch(opts v1.ListOptions) (watch.Interface, error) {
+	return c.Fake.
+		InvokesWatch(testing.NewWatchAction(testtypesResource, c.ns, opts))
+
+}
+
+// Create takes the representation of a testType and creates it.  Returns the server's representation of the testType, and an error, if there is any.
+func (c *FakeTestTypes) Create(testType *example2_v1.TestType) (result *example2_v1.TestType, err error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewCreateAction(testtypesResource, c.ns, testType), &example2_v1.TestType{})
+
+	if obj == nil {
+		return nil, err
+	}
+	return obj.(*example2_v1.TestType), err
+}
+
+// Update takes the representation of a testType and updates it. Returns the server's representation of the testType, and an error, if there is any.
+func (c *FakeTestTypes) Update(testType *example2_v1.TestType) (result *example2_v1.TestType, err error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewUpdateAction(testtypesResource, c.ns, testType), &example2_v1.TestType{})
+
+	if obj == nil {
+		return nil, err
+	}
+	return obj.(*example2_v1.TestType), err
+}
+
+// UpdateStatus was generated because the type contains a Status member.
+// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
+func (c *FakeTestTypes) UpdateStatus(testType *example2_v1.TestType) (*example2_v1.TestType, error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewUpdateSubresourceAction(testtypesResource, "status", c.ns, testType), &example2_v1.TestType{})
+
+	if obj == nil {
+		return nil, err
+	}
+	return obj.(*example2_v1.TestType), err
+}
+
+// Delete takes name of the testType and deletes it. Returns an error if one occurs.
+func (c *FakeTestTypes) Delete(name string, options *v1.DeleteOptions) error {
+	_, err := c.Fake.
+		Invokes(testing.NewDeleteAction(testtypesResource, c.ns, name), &example2_v1.TestType{})
+
+	return err
+}
+
+// DeleteCollection deletes a collection of objects.
+func (c *FakeTestTypes) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+	action := testing.NewDeleteCollectionAction(testtypesResource, c.ns, listOptions)
+
+	_, err := c.Fake.Invokes(action, &example2_v1.TestTypeList{})
+	return err
+}
+
+// Patch applies the patch and returns the patched testType.
+func (c *FakeTestTypes) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *example2_v1.TestType, err error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewPatchSubresourceAction(testtypesResource, c.ns, name, data, subresources...), &example2_v1.TestType{})
+
+	if obj == nil {
+		return nil, err
+	}
+	return obj.(*example2_v1.TestType), err
+}

staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/typed/example2/v1/generated_expansion.go

@@ -0,0 +1,19 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1
+
+type TestTypeExpansion interface{}

staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/typed/example2/v1/testtype.go

@@ -0,0 +1,172 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1
+
+import (
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	types "k8s.io/apimachinery/pkg/types"
+	watch "k8s.io/apimachinery/pkg/watch"
+	rest "k8s.io/client-go/rest"
+	v1 "k8s.io/code-generator/_examples/crd/apis/example2/v1"
+	scheme "k8s.io/code-generator/_examples/crd/clientset/versioned/scheme"
+)
+
+// TestTypesGetter has a method to return a TestTypeInterface.
+// A group's client should implement this interface.
+type TestTypesGetter interface {
+	TestTypes(namespace string) TestTypeInterface
+}
+
+// TestTypeInterface has methods to work with TestType resources.
+type TestTypeInterface interface {
+	Create(*v1.TestType) (*v1.TestType, error)
+	Update(*v1.TestType) (*v1.TestType, error)
+	UpdateStatus(*v1.TestType) (*v1.TestType, error)
+	Delete(name string, options *meta_v1.DeleteOptions) error
+	DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error
+	Get(name string, options meta_v1.GetOptions) (*v1.TestType, error)
+	List(opts meta_v1.ListOptions) (*v1.TestTypeList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
+	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.TestType, err error)
+	TestTypeExpansion
+}
+
+// testTypes implements TestTypeInterface
+type testTypes struct {
+	client rest.Interface
+	ns     string
+}
+
+// newTestTypes returns a TestTypes
+func newTestTypes(c *SecondExampleV1Client, namespace string) *testTypes {
+	return &testTypes{
+		client: c.RESTClient(),
+		ns:     namespace,
+	}
+}
+
+// Get takes name of the testType, and returns the corresponding testType object, and an error if there is any.
+func (c *testTypes) Get(name string, options meta_v1.GetOptions) (result *v1.TestType, err error) {
+	result = &v1.TestType{}
+	err = c.client.Get().
+		Namespace(c.ns).
+		Resource("testtypes").
+		Name(name).
+		VersionedParams(&options, scheme.ParameterCodec).
+		Do().
+		Into(result)
+	return
+}
+
+// List takes label and field selectors, and returns the list of TestTypes that match those selectors.
+func (c *testTypes) List(opts meta_v1.ListOptions) (result *v1.TestTypeList, err error) {
+	result = &v1.TestTypeList{}
+	err = c.client.Get().
+		Namespace(c.ns).
+		Resource("testtypes").
+		VersionedParams(&opts, scheme.ParameterCodec).
+		Do().
+		Into(result)
+	return
+}
+
+// Watch returns a watch.Interface that watches the requested testTypes.
+func (c *testTypes) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
+	opts.Watch = true
+	return c.client.Get().
+		Namespace(c.ns).
+		Resource("testtypes").
+		VersionedParams(&opts, scheme.ParameterCodec).
+		Watch()
+}
+
+// Create takes the representation of a testType and creates it.  Returns the server's representation of the testType, and an error, if there is any.
+func (c *testTypes) Create(testType *v1.TestType) (result *v1.TestType, err error) {
+	result = &v1.TestType{}
+	err = c.client.Post().
+		Namespace(c.ns).
+		Resource("testtypes").
+		Body(testType).
+		Do().
+		Into(result)
+	return
+}
+
+// Update takes the representation of a testType and updates it. Returns the server's representation of the testType, and an error, if there is any.
+func (c *testTypes) Update(testType *v1.TestType) (result *v1.TestType, err error) {
+	result = &v1.TestType{}
+	err = c.client.Put().
+		Namespace(c.ns).
+		Resource("testtypes").
+		Name(testType.Name).
+		Body(testType).
+		Do().
+		Into(result)
+	return
+}
+
+// UpdateStatus was generated because the type contains a Status member.
+// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
+
+func (c *testTypes) UpdateStatus(testType *v1.TestType) (result *v1.TestType, err error) {
+	result = &v1.TestType{}
+	err = c.client.Put().
+		Namespace(c.ns).
+		Resource("testtypes").
+		Name(testType.Name).
+		SubResource("status").
+		Body(testType).
+		Do().
+		Into(result)
+	return
+}
+
+// Delete takes name of the testType and deletes it. Returns an error if one occurs.
+func (c *testTypes) Delete(name string, options *meta_v1.DeleteOptions) error {
+	return c.client.Delete().
+		Namespace(c.ns).
+		Resource("testtypes").
+		Name(name).
+		Body(options).
+		Do().
+		Error()
+}
+
+// DeleteCollection deletes a collection of objects.
+func (c *testTypes) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
+	return c.client.Delete().
+		Namespace(c.ns).
+		Resource("testtypes").
+		VersionedParams(&listOptions, scheme.ParameterCodec).
+		Body(options).
+		Do().
+		Error()
+}
+
+// Patch applies the patch and returns the patched testType.
+func (c *testTypes) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.TestType, err error) {
+	result = &v1.TestType{}
+	err = c.client.Patch(pt).
+		Namespace(c.ns).
+		Resource("testtypes").
+		SubResource(subresources...).
+		Name(name).
+		Body(data).
+		Do().
+		Into(result)
+	return
+}

staging/src/k8s.io/code-generator/_examples/crd/informers/externalversions/example2/interface.go

@@ -0,0 +1,44 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// This file was automatically generated by informer-gen
+
+package example2
+
+import (
+	v1 "k8s.io/code-generator/_examples/crd/informers/externalversions/example2/v1"
+	internalinterfaces "k8s.io/code-generator/_examples/crd/informers/externalversions/internalinterfaces"
+)
+
+// Interface provides access to each of this group's versions.
+type Interface interface {
+	// V1 provides access to shared informers for resources in V1.
+	V1() v1.Interface
+}
+
+type group struct {
+	internalinterfaces.SharedInformerFactory
+}
+
+// New returns a new Interface.
+func New(f internalinterfaces.SharedInformerFactory) Interface {
+	return &group{f}
+}
+
+// V1 returns a new v1.Interface.
+func (g *group) V1() v1.Interface {
+	return v1.New(g.SharedInformerFactory)
+}

staging/src/k8s.io/code-generator/_examples/crd/informers/externalversions/example2/v1/interface.go

@@ -0,0 +1,43 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// This file was automatically generated by informer-gen
+
+package v1
+
+import (
+	internalinterfaces "k8s.io/code-generator/_examples/crd/informers/externalversions/internalinterfaces"
+)
+
+// Interface provides access to all the informers in this group version.
+type Interface interface {
+	// TestTypes returns a TestTypeInformer.
+	TestTypes() TestTypeInformer
+}
+
+type version struct {
+	internalinterfaces.SharedInformerFactory
+}
+
+// New returns a new Interface.
+func New(f internalinterfaces.SharedInformerFactory) Interface {
+	return &version{f}
+}
+
+// TestTypes returns a TestTypeInformer.
+func (v *version) TestTypes() TestTypeInformer {
+	return &testTypeInformer{factory: v.SharedInformerFactory}
+}

staging/src/k8s.io/code-generator/_examples/crd/informers/externalversions/example2/v1/testtype.go

@@ -0,0 +1,73 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// This file was automatically generated by informer-gen
+
+package v1
+
+import (
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	runtime "k8s.io/apimachinery/pkg/runtime"
+	watch "k8s.io/apimachinery/pkg/watch"
+	cache "k8s.io/client-go/tools/cache"
+	example2_v1 "k8s.io/code-generator/_examples/crd/apis/example2/v1"
+	versioned "k8s.io/code-generator/_examples/crd/clientset/versioned"
+	internalinterfaces "k8s.io/code-generator/_examples/crd/informers/externalversions/internalinterfaces"
+	v1 "k8s.io/code-generator/_examples/crd/listers/example2/v1"
+	time "time"
+)
+
+// TestTypeInformer provides access to a shared informer and lister for
+// TestTypes.
+type TestTypeInformer interface {
+	Informer() cache.SharedIndexInformer
+	Lister() v1.TestTypeLister
+}
+
+type testTypeInformer struct {
+	factory internalinterfaces.SharedInformerFactory
+}
+
+// NewTestTypeInformer constructs a new informer for TestType type.
+// Always prefer using an informer factory to get a shared informer instead of getting an independent
+// one. This reduces memory footprint and number of connections to the server.
+func NewTestTypeInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer {
+	return cache.NewSharedIndexInformer(
+		&cache.ListWatch{
+			ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) {
+				return client.SecondExampleV1().TestTypes(namespace).List(options)
+			},
+			WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) {
+				return client.SecondExampleV1().TestTypes(namespace).Watch(options)
+			},
+		},
+		&example2_v1.TestType{},
+		resyncPeriod,
+		indexers,
+	)
+}
+
+func defaultTestTypeInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
+	return NewTestTypeInformer(client, meta_v1.NamespaceAll, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
+}
+
+func (f *testTypeInformer) Informer() cache.SharedIndexInformer {
+	return f.factory.InformerFor(&example2_v1.TestType{}, defaultTestTypeInformer)
+}
+
+func (f *testTypeInformer) Lister() v1.TestTypeLister {
+	return v1.NewTestTypeLister(f.Informer().GetIndexer())
+}

staging/src/k8s.io/code-generator/_examples/crd/informers/externalversions/factory.go

@@ -24,6 +24,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	versioned "k8s.io/code-generator/_examples/crd/clientset/versioned"
 	example "k8s.io/code-generator/_examples/crd/informers/externalversions/example"
+	example2 "k8s.io/code-generator/_examples/crd/informers/externalversions/example2"
 	internalinterfaces "k8s.io/code-generator/_examples/crd/informers/externalversions/internalinterfaces"
 	reflect "reflect"
 	sync "sync"
@@ -111,8 +112,13 @@ type SharedInformerFactory interface {
 	WaitForCacheSync(stopCh <-chan struct{}) map[reflect.Type]bool
 
 	Example() example.Interface
+	SecondExample() example2.Interface
 }
 
 func (f *sharedInformerFactory) Example() example.Interface {
 	return example.New(f)
 }
+
+func (f *sharedInformerFactory) SecondExample() example2.Interface {
+	return example2.New(f)
+}

staging/src/k8s.io/code-generator/_examples/crd/informers/externalversions/generic.go

@@ -23,6 +23,7 @@ import (
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	cache "k8s.io/client-go/tools/cache"
 	v1 "k8s.io/code-generator/_examples/crd/apis/example/v1"
+	example2_v1 "k8s.io/code-generator/_examples/crd/apis/example2/v1"
 )
 
 // GenericInformer is type of SharedIndexInformer which will locate and delegate to other
@@ -51,10 +52,14 @@ func (f *genericInformer) Lister() cache.GenericLister {
 // TODO extend this to unknown resources with a client pool
 func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) {
 	switch resource {
-	// Group=Example, Version=V1
+	// Group=example.crd.code-generator.k8s.io, Version=v1
 	case v1.SchemeGroupVersion.WithResource("testtypes"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Example().V1().TestTypes().Informer()}, nil
 
+		// Group=example.test2.crd.code-generator.k8s.io, Version=v1
+	case example2_v1.SchemeGroupVersion.WithResource("testtypes"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.SecondExample().V1().TestTypes().Informer()}, nil
+
 	}
 
 	return nil, fmt.Errorf("no informer found for %v", resource)

staging/src/k8s.io/code-generator/_examples/crd/listers/example2/v1/expansion_generated.go

@@ -0,0 +1,27 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// This file was automatically generated by lister-gen
+
+package v1
+
+// TestTypeListerExpansion allows custom methods to be added to
+// TestTypeLister.
+type TestTypeListerExpansion interface{}
+
+// TestTypeNamespaceListerExpansion allows custom methods to be added to
+// TestTypeNamespaceLister.
+type TestTypeNamespaceListerExpansion interface{}

staging/src/k8s.io/code-generator/_examples/crd/listers/example2/v1/testtype.go

@@ -0,0 +1,94 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// This file was automatically generated by lister-gen
+
+package v1
+
+import (
+	"k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/client-go/tools/cache"
+	v1 "k8s.io/code-generator/_examples/crd/apis/example2/v1"
+)
+
+// TestTypeLister helps list TestTypes.
+type TestTypeLister interface {
+	// List lists all TestTypes in the indexer.
+	List(selector labels.Selector) (ret []*v1.TestType, err error)
+	// TestTypes returns an object that can list and get TestTypes.
+	TestTypes(namespace string) TestTypeNamespaceLister
+	TestTypeListerExpansion
+}
+
+// testTypeLister implements the TestTypeLister interface.
+type testTypeLister struct {
+	indexer cache.Indexer
+}
+
+// NewTestTypeLister returns a new TestTypeLister.
+func NewTestTypeLister(indexer cache.Indexer) TestTypeLister {
+	return &testTypeLister{indexer: indexer}
+}
+
+// List lists all TestTypes in the indexer.
+func (s *testTypeLister) List(selector labels.Selector) (ret []*v1.TestType, err error) {
+	err = cache.ListAll(s.indexer, selector, func(m interface{}) {
+		ret = append(ret, m.(*v1.TestType))
+	})
+	return ret, err
+}
+
+// TestTypes returns an object that can list and get TestTypes.
+func (s *testTypeLister) TestTypes(namespace string) TestTypeNamespaceLister {
+	return testTypeNamespaceLister{indexer: s.indexer, namespace: namespace}
+}
+
+// TestTypeNamespaceLister helps list and get TestTypes.
+type TestTypeNamespaceLister interface {
+	// List lists all TestTypes in the indexer for a given namespace.
+	List(selector labels.Selector) (ret []*v1.TestType, err error)
+	// Get retrieves the TestType from the indexer for a given namespace and name.
+	Get(name string) (*v1.TestType, error)
+	TestTypeNamespaceListerExpansion
+}
+
+// testTypeNamespaceLister implements the TestTypeNamespaceLister
+// interface.
+type testTypeNamespaceLister struct {
+	indexer   cache.Indexer
+	namespace string
+}
+
+// List lists all TestTypes in the indexer for a given namespace.
+func (s testTypeNamespaceLister) List(selector labels.Selector) (ret []*v1.TestType, err error) {
+	err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) {
+		ret = append(ret, m.(*v1.TestType))
+	})
+	return ret, err
+}
+
+// Get retrieves the TestType from the indexer for a given namespace and name.
+func (s testTypeNamespaceLister) Get(name string) (*v1.TestType, error) {
+	obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name)
+	if err != nil {
+		return nil, err
+	}
+	if !exists {
+		return nil, errors.NewNotFound(v1.Resource("testtype"), name)
+	}
+	return obj.(*v1.TestType), nil
+}

staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/generic.go

@@ -51,7 +51,7 @@ func (f *genericInformer) Lister() cache.GenericLister {
 // TODO extend this to unknown resources with a client pool
 func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) {
 	switch resource {
-	// Group=Apiregistration, Version=V1beta1
+	// Group=apiregistration.k8s.io, Version=v1beta1
 	case v1beta1.SchemeGroupVersion.WithResource("apiservices"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Apiregistration().V1beta1().APIServices().Informer()}, nil
 

staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion/generic.go

@@ -51,7 +51,7 @@ func (f *genericInformer) Lister() cache.GenericLister {
 // TODO extend this to unknown resources with a client pool
 func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) {
 	switch resource {
-	// Group=Apiregistration, Version=InternalVersion
+	// Group=apiregistration.k8s.io, Version=internalVersion
 	case apiregistration.SchemeGroupVersion.WithResource("apiservices"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Apiregistration().InternalVersion().APIServices().Informer()}, nil
 

staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions/generic.go

@@ -51,7 +51,7 @@ func (f *genericInformer) Lister() cache.GenericLister {
 // TODO extend this to unknown resources with a client pool
 func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) {
 	switch resource {
-	// Group=Wardle, Version=V1alpha1
+	// Group=wardle.k8s.io, Version=v1alpha1
 	case v1alpha1.SchemeGroupVersion.WithResource("fischers"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Wardle().V1alpha1().Fischers().Informer()}, nil
 	case v1alpha1.SchemeGroupVersion.WithResource("flunders"):

staging/src/k8s.io/sample-apiserver/pkg/client/informers/internalversion/generic.go

@@ -51,7 +51,7 @@ func (f *genericInformer) Lister() cache.GenericLister {
 // TODO extend this to unknown resources with a client pool
 func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) {
 	switch resource {
-	// Group=Wardle, Version=InternalVersion
+	// Group=wardle.k8s.io, Version=internalVersion
 	case wardle.SchemeGroupVersion.WithResource("fischers"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Wardle().InternalVersion().Fischers().Informer()}, nil
 	case wardle.SchemeGroupVersion.WithResource("flunders"):

staging/src/k8s.io/sample-controller/pkg/client/informers/externalversions/generic.go

@@ -51,7 +51,7 @@ func (f *genericInformer) Lister() cache.GenericLister {
 // TODO extend this to unknown resources with a client pool
 func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) {
 	switch resource {
-	// Group=Samplecontroller, Version=V1alpha1
+	// Group=samplecontroller.k8s.io, Version=v1alpha1
 	case v1alpha1.SchemeGroupVersion.WithResource("foos"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Samplecontroller().V1alpha1().Foos().Informer()}, nil