From 307acab3f3549d8cf47dada9203b54d8aeab2c66 Mon Sep 17 00:00:00 2001 From: Andy Goldstein Date: Wed, 18 Jan 2017 14:15:49 -0500 Subject: [PATCH] Expose ForResource in generated informer factory --- cmd/kube-aggregator/pkg/client/informers/factory.go | 2 ++ cmd/libs/go2idl/informer-gen/generators/factory.go | 2 ++ pkg/client/informers/informers_generated/factory.go | 2 ++ 3 files changed, 6 insertions(+) diff --git a/cmd/kube-aggregator/pkg/client/informers/factory.go b/cmd/kube-aggregator/pkg/client/informers/factory.go index a75006aeeda..14618dd4b5c 100644 --- a/cmd/kube-aggregator/pkg/client/informers/factory.go +++ b/cmd/kube-aggregator/pkg/client/informers/factory.go @@ -20,6 +20,7 @@ package informers import ( runtime "k8s.io/apimachinery/pkg/runtime" + schema "k8s.io/apimachinery/pkg/runtime/schema" clientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset" internalclientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset" apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/apiregistration" @@ -104,6 +105,7 @@ func (f *sharedInformerFactory) VersionedInformerFor(obj runtime.Object, newFunc // API group versions. type SharedInformerFactory interface { internalinterfaces.SharedInformerFactory + ForResource(resource schema.GroupVersionResource) (GenericInformer, error) Apiregistration() apiregistration.Interface } diff --git a/cmd/libs/go2idl/informer-gen/generators/factory.go b/cmd/libs/go2idl/informer-gen/generators/factory.go index d1f723e357b..883f052a938 100644 --- a/cmd/libs/go2idl/informer-gen/generators/factory.go +++ b/cmd/libs/go2idl/informer-gen/generators/factory.go @@ -83,6 +83,7 @@ func (g *factoryGenerator) GenerateType(c *generator.Context, t *types.Type, w i "internalClientSetInterface": c.Universe.Type(types.Name{Package: g.internalClientSetPackage, Name: "Interface"}), "reflectType": c.Universe.Type(reflectType), "runtimeObject": c.Universe.Type(runtimeObject), + "schemaGroupVersionResource": c.Universe.Type(schemaGroupVersionResource), "syncMutex": c.Universe.Type(syncMutex), "timeDuration": c.Universe.Type(timeDuration), "versionedClientSetInterface": c.Universe.Type(types.Name{Package: g.versionedClientSetPackage, Name: "Interface"}), @@ -171,6 +172,7 @@ var sharedInformerFactoryInterface = ` // API group versions. type SharedInformerFactory interface { {{.informerFactoryInterface|raw}} + ForResource(resource {{.schemaGroupVersionResource|raw}}) (GenericInformer, error) {{$gvInterfaces := .gvInterfaces}} {{range $groupName, $group := .groupVersions}}{{$groupName}}() {{index $gvInterfaces $groupName|raw}} diff --git a/pkg/client/informers/informers_generated/factory.go b/pkg/client/informers/informers_generated/factory.go index 6fd0f1ac3a8..ff5e651e414 100644 --- a/pkg/client/informers/informers_generated/factory.go +++ b/pkg/client/informers/informers_generated/factory.go @@ -20,6 +20,7 @@ package informers_generated import ( runtime "k8s.io/apimachinery/pkg/runtime" + schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" @@ -112,6 +113,7 @@ func (f *sharedInformerFactory) VersionedInformerFor(obj runtime.Object, newFunc // API group versions. type SharedInformerFactory interface { internalinterfaces.SharedInformerFactory + ForResource(resource schema.GroupVersionResource) (GenericInformer, error) Apps() apps.Interface Autoscaling() autoscaling.Interface