regenerate informers

cmd/cloud-controller-manager/app/BUILD

@@ -15,7 +15,6 @@ go_library(
         "//cmd/cloud-controller-manager/app/options:go_default_library",
         "//pkg/api:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
-        "//pkg/client/informers/informers_generated:go_default_library",
         "//pkg/client/leaderelection:go_default_library",
         "//pkg/client/leaderelection/resourcelock:go_default_library",
         "//pkg/cloudprovider:go_default_library",

cmd/kube-aggregator/BUILD

@@ -16,8 +16,6 @@ go_library(
         "//cmd/kube-aggregator/pkg/apis/apiregistration/install:go_default_library",
         "//cmd/kube-aggregator/pkg/apis/apiregistration/validation:go_default_library",
         "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset:go_default_library",
-        "//cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion:go_default_library",
-        "//cmd/kube-aggregator/pkg/client/informers/apiregistration/v1alpha1:go_default_library",
         "//cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion:go_default_library",
         "//cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1:go_default_library",
         "//cmd/kube-aggregator/pkg/cmd/server:go_default_library",
@@ -41,7 +39,8 @@ filegroup(
         "//cmd/kube-aggregator/pkg/apiserver:all-srcs",
         "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset:all-srcs",
         "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset:all-srcs",
-        "//cmd/kube-aggregator/pkg/client/informers:all-srcs",
+        "//cmd/kube-aggregator/pkg/client/informers/externalversions:all-srcs",
+        "//cmd/kube-aggregator/pkg/client/informers/internalversion:all-srcs",
         "//cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion:all-srcs",
         "//cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1:all-srcs",
         "//cmd/kube-aggregator/pkg/cmd/server:all-srcs",

cmd/kube-aggregator/pkg/apiserver/BUILD

@@ -47,13 +47,10 @@ go_library(
         "//cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library",
         "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset:go_default_library",
         "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset:go_default_library",
-        "//cmd/kube-aggregator/pkg/client/informers:go_default_library",
-        "//cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion:go_default_library",
         "//cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion:go_default_library",
         "//cmd/kube-aggregator/pkg/registry/apiservice/etcd:go_default_library",
         "//pkg/api:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
-        "//pkg/client/informers/informers_generated:go_default_library",
         "//pkg/client/listers/core/v1:go_default_library",
         "//pkg/controller:go_default_library",
         "//pkg/version:go_default_library",

cmd/kube-aggregator/pkg/client/informers/BUILD → cmd/kube-aggregator/pkg/client/informers/externalversions/BUILD

@@ -15,12 +15,10 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library",
         "//cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library",
         "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset:go_default_library",
-        "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset:go_default_library",
-        "//cmd/kube-aggregator/pkg/client/informers/apiregistration:go_default_library",
-        "//cmd/kube-aggregator/pkg/client/informers/internalinterfaces:go_default_library",
+        "//cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration:go_default_library",
+        "//cmd/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/client-go/tools/cache",
@@ -38,8 +36,8 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//cmd/kube-aggregator/pkg/client/informers/apiregistration:all-srcs",
-        "//cmd/kube-aggregator/pkg/client/informers/internalinterfaces:all-srcs",
+        "//cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration:all-srcs",
+        "//cmd/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces:all-srcs",
     ],
     tags = ["automanaged"],
 )

cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/BUILD

+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = ["interface.go"],
+    tags = ["automanaged"],
+    deps = [
+        "//cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1:go_default_library",
+        "//cmd/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces:go_default_library",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [
+        ":package-srcs",
+        "//cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1:all-srcs",
+    ],
+    tags = ["automanaged"],
+)

cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/interface.go

+/*
+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 apiregistration
+
+import (
+	v1alpha1 "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1"
+	internalinterfaces "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces"
+)
+
+// Interface provides access to each of this group's versions.
+type Interface interface {
+	// V1alpha1 provides access to shared informers for resources in V1alpha1.
+	V1alpha1() v1alpha1.Interface
+}
+
+type group struct {
+	internalinterfaces.SharedInformerFactory
+}
+
+// New returns a new Interface.
+func New(f internalinterfaces.SharedInformerFactory) Interface {
+	return &group{f}
+}
+
+// V1alpha1 returns a new v1alpha1.Interface.
+func (g *group) V1alpha1() v1alpha1.Interface {
+	return v1alpha1.New(g.SharedInformerFactory)
+}

cmd/kube-aggregator/pkg/client/informers/apiregistration/v1alpha1/BUILD → cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1/BUILD

@@ -17,7 +17,7 @@ go_library(
     deps = [
         "//cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library",
         "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset:go_default_library",
-        "//cmd/kube-aggregator/pkg/client/informers/internalinterfaces:go_default_library",
+        "//cmd/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces:go_default_library",
         "//cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

cmd/kube-aggregator/pkg/client/informers/apiregistration/v1alpha1/apiservice.go → cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1/apiservice.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	apiregistration_v1alpha1 "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1"
 	clientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces"
 	v1alpha1 "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newAPIServiceInformer(client clientset.Interface, resyncPeriod time.Duratio
 }
 
 func (f *aPIServiceInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&apiregistration_v1alpha1.APIService{}, newAPIServiceInformer)
+	return f.factory.InformerFor(&apiregistration_v1alpha1.APIService{}, newAPIServiceInformer)
 }
 
 func (f *aPIServiceInformer) Lister() v1alpha1.APIServiceLister {

cmd/kube-aggregator/pkg/client/informers/apiregistration/v1alpha1/interface.go → cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1/interface.go

@@ -19,7 +19,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	internalinterfaces "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.

cmd/kube-aggregator/pkg/client/informers/externalversions/factory.go

+/*
+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 externalversions
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+	schema "k8s.io/apimachinery/pkg/runtime/schema"
+	cache "k8s.io/client-go/tools/cache"
+	clientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset"
+	apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration"
+	internalinterfaces "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces"
+	reflect "reflect"
+	sync "sync"
+	time "time"
+)
+
+type sharedInformerFactory struct {
+	client        clientset.Interface
+	lock          sync.Mutex
+	defaultResync time.Duration
+
+	informers map[reflect.Type]cache.SharedIndexInformer
+	// startedInformers is used for tracking which informers have been started.
+	// This allows Start() to be called multiple times safely.
+	startedInformers map[reflect.Type]bool
+}
+
+// NewSharedInformerFactory constructs a new instance of sharedInformerFactory
+func NewSharedInformerFactory(client clientset.Interface, defaultResync time.Duration) SharedInformerFactory {
+	return &sharedInformerFactory{
+		client:           client,
+		defaultResync:    defaultResync,
+		informers:        make(map[reflect.Type]cache.SharedIndexInformer),
+		startedInformers: make(map[reflect.Type]bool),
+	}
+}
+
+// Start initializes all requested informers.
+func (f *sharedInformerFactory) Start(stopCh <-chan struct{}) {
+	f.lock.Lock()
+	defer f.lock.Unlock()
+
+	for informerType, informer := range f.informers {
+		if !f.startedInformers[informerType] {
+			go informer.Run(stopCh)
+			f.startedInformers[informerType] = true
+		}
+	}
+}
+
+// InternalInformerFor returns the SharedIndexInformer for obj using an internal
+// client.
+func (f *sharedInformerFactory) InformerFor(obj runtime.Object, newFunc internalinterfaces.NewInformerFunc) cache.SharedIndexInformer {
+	f.lock.Lock()
+	defer f.lock.Unlock()
+
+	informerType := reflect.TypeOf(obj)
+	informer, exists := f.informers[informerType]
+	if exists {
+		return informer
+	}
+	informer = newFunc(f.client, f.defaultResync)
+	f.informers[informerType] = informer
+
+	return informer
+}
+
+// SharedInformerFactory provides shared informers for resources in all known
+// API group versions.
+type SharedInformerFactory interface {
+	internalinterfaces.SharedInformerFactory
+	ForResource(resource schema.GroupVersionResource) (GenericInformer, error)
+
+	Apiregistration() apiregistration.Interface
+}
+
+func (f *sharedInformerFactory) Apiregistration() apiregistration.Interface {
+	return apiregistration.New(f)
+}

cmd/kube-aggregator/pkg/client/informers/externalversions/generic.go

+/*
+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 externalversions
+
+import (
+	"fmt"
+	schema "k8s.io/apimachinery/pkg/runtime/schema"
+	cache "k8s.io/client-go/tools/cache"
+	v1alpha1 "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1"
+)
+
+// GenericInformer is type of SharedIndexInformer which will locate and delegate to other
+// sharedInformers based on type
+type GenericInformer interface {
+	Informer() cache.SharedIndexInformer
+	Lister() cache.GenericLister
+}
+
+type genericInformer struct {
+	informer cache.SharedIndexInformer
+	resource schema.GroupResource
+}
+
+// Informer returns the SharedIndexInformer.
+func (f *genericInformer) Informer() cache.SharedIndexInformer {
+	return f.informer
+}
+
+// Lister returns the GenericLister.
+func (f *genericInformer) Lister() cache.GenericLister {
+	return cache.NewGenericLister(f.Informer().GetIndexer(), f.resource)
+}
+
+// ForResource gives generic access to a shared informer of the matching type
+// TODO extend this to unknown resources with a client pool
+func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) {
+	switch resource {
+	// Group=Apiregistration, Version=V1alpha1
+	case v1alpha1.SchemeGroupVersion.WithResource("apiservices"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Apiregistration().V1alpha1().APIServices().Informer()}, nil
+
+	}
+
+	return nil, fmt.Errorf("no informer found for %v", resource)
+}

cmd/kube-aggregator/pkg/client/informers/internalinterfaces/BUILD → cmd/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces/BUILD

@@ -9,11 +9,10 @@ load(
 
 go_library(
     name = "go_default_library",
-    srcs = ["internal_interfaces.go"],
+    srcs = ["factory_interfaces.go"],
     tags = ["automanaged"],
     deps = [
         "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset:go_default_library",
-        "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/client-go/tools/cache",
     ],

cmd/kube-aggregator/pkg/client/informers/internalinterfaces/internal_interfaces.go → cmd/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go

@@ -22,16 +22,13 @@ import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	cache "k8s.io/client-go/tools/cache"
 	clientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset"
-	internalclientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset"
 	time "time"
 )
 
-type NewInternalInformerFunc func(internalclientset.Interface, time.Duration) cache.SharedIndexInformer
-type NewVersionedInformerFunc func(clientset.Interface, time.Duration) cache.SharedIndexInformer
+type NewInformerFunc func(clientset.Interface, time.Duration) cache.SharedIndexInformer
 
 // SharedInformerFactory a small interface to allow for adding an informer without an import cycle
 type SharedInformerFactory interface {
 	Start(stopCh <-chan struct{})
-	InternalInformerFor(obj runtime.Object, newFunc NewInternalInformerFunc) cache.SharedIndexInformer
-	VersionedInformerFor(obj runtime.Object, newFunc NewVersionedInformerFunc) cache.SharedIndexInformer
+	InformerFor(obj runtime.Object, newFunc NewInformerFunc) cache.SharedIndexInformer
 }

cmd/kube-aggregator/pkg/client/informers/internalversion/BUILD

+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "factory.go",
+        "generic.go",
+    ],
+    tags = ["automanaged"],
+    deps = [
+        "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library",
+        "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset:go_default_library",
+        "//cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration:go_default_library",
+        "//cmd/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/runtime",
+        "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
+        "//vendor:k8s.io/client-go/tools/cache",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [
+        ":package-srcs",
+        "//cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration:all-srcs",
+        "//cmd/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces:all-srcs",
+    ],
+    tags = ["automanaged"],
+)

pkg/client/informers/informers_generated/core/BUILD → cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/BUILD

@@ -12,9 +12,8 @@ go_library(
     srcs = ["interface.go"],
     tags = ["automanaged"],
     deps = [
-        "//pkg/client/informers/informers_generated/core/internalversion:go_default_library",
-        "//pkg/client/informers/informers_generated/core/v1:go_default_library",
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
+        "//cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion:go_default_library",
+        "//cmd/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces:go_default_library",
     ],
 )
 
@@ -29,8 +28,7 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//pkg/client/informers/informers_generated/core/internalversion:all-srcs",
-        "//pkg/client/informers/informers_generated/core/v1:all-srcs",
+        "//cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion:all-srcs",
     ],
     tags = ["automanaged"],
 )

cmd/kube-aggregator/pkg/client/informers/apiregistration/interface.go → cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/interface.go

@@ -19,17 +19,14 @@ limitations under the License.
 package apiregistration
 
 import (
-	internalversion "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion"
-	v1alpha1 "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/apiregistration/v1alpha1"
-	internalinterfaces "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalinterfaces"
+	internalversion "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion"
+	internalinterfaces "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces"
 )
 
 // Interface provides access to each of this group's versions.
 type Interface interface {
 	// InternalVersion provides access to shared informers for resources in InternalVersion.
 	InternalVersion() internalversion.Interface
-	// V1alpha1 provides access to shared informers for resources in V1alpha1.
-	V1alpha1() v1alpha1.Interface
 }
 
 type group struct {
@@ -45,8 +42,3 @@ func New(f internalinterfaces.SharedInformerFactory) Interface {
 func (g *group) InternalVersion() internalversion.Interface {
 	return internalversion.New(g.SharedInformerFactory)
 }
-
-// V1alpha1 returns a new v1alpha1.Interface.
-func (g *group) V1alpha1() v1alpha1.Interface {
-	return v1alpha1.New(g.SharedInformerFactory)
-}

cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion/BUILD → cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion/BUILD

@@ -17,7 +17,7 @@ go_library(
     deps = [
         "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library",
         "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset:go_default_library",
-        "//cmd/kube-aggregator/pkg/client/informers/internalinterfaces:go_default_library",
+        "//cmd/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces:go_default_library",
         "//cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion/apiservice.go → cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion/apiservice.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration"
 	internalclientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newAPIServiceInformer(client internalclientset.Interface, resyncPeriod time
 }
 
 func (f *aPIServiceInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&apiregistration.APIService{}, newAPIServiceInformer)
+	return f.factory.InformerFor(&apiregistration.APIService{}, newAPIServiceInformer)
 }
 
 func (f *aPIServiceInformer) Lister() internalversion.APIServiceLister {

cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion/interface.go → cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion/interface.go

@@ -19,7 +19,7 @@ limitations under the License.
 package internalversion
 
 import (
-	internalinterfaces "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.

cmd/kube-aggregator/pkg/client/informers/factory.go → cmd/kube-aggregator/pkg/client/informers/internalversion/factory.go

@@ -16,24 +16,22 @@ limitations under the License.
 
 // This file was automatically generated by informer-gen
 
-package informers
+package internalversion
 
 import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	cache "k8s.io/client-go/tools/cache"
-	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"
-	internalinterfaces "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalinterfaces"
+	apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration"
+	internalinterfaces "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces"
 	reflect "reflect"
 	sync "sync"
 	time "time"
 )
 
 type sharedInformerFactory struct {
-	internalClient  internalclientset.Interface
-	versionedClient clientset.Interface
+	client        internalclientset.Interface
 	lock          sync.Mutex
 	defaultResync time.Duration
 
@@ -44,10 +42,9 @@ type sharedInformerFactory struct {
 }
 
 // NewSharedInformerFactory constructs a new instance of sharedInformerFactory
-func NewSharedInformerFactory(internalClient internalclientset.Interface, versionedClient clientset.Interface, defaultResync time.Duration) SharedInformerFactory {
+func NewSharedInformerFactory(client internalclientset.Interface, defaultResync time.Duration) SharedInformerFactory {
 	return &sharedInformerFactory{
-		internalClient:   internalClient,
-		versionedClient:  versionedClient,
+		client:           client,
 		defaultResync:    defaultResync,
 		informers:        make(map[reflect.Type]cache.SharedIndexInformer),
 		startedInformers: make(map[reflect.Type]bool),
@@ -69,7 +66,7 @@ func (f *sharedInformerFactory) Start(stopCh <-chan struct{}) {
 
 // InternalInformerFor returns the SharedIndexInformer for obj using an internal
 // client.
-func (f *sharedInformerFactory) InternalInformerFor(obj runtime.Object, newFunc internalinterfaces.NewInternalInformerFunc) cache.SharedIndexInformer {
+func (f *sharedInformerFactory) InformerFor(obj runtime.Object, newFunc internalinterfaces.NewInformerFunc) cache.SharedIndexInformer {
 	f.lock.Lock()
 	defer f.lock.Unlock()
 
@@ -78,24 +75,7 @@ func (f *sharedInformerFactory) InternalInformerFor(obj runtime.Object, newFunc
 	if exists {
 		return informer
 	}
-	informer = newFunc(f.internalClient, f.defaultResync)
-	f.informers[informerType] = informer
-
-	return informer
-}
-
-// VersionedInformerFor returns the SharedIndexInformer for obj using a
-// versioned client.
-func (f *sharedInformerFactory) VersionedInformerFor(obj runtime.Object, newFunc internalinterfaces.NewVersionedInformerFunc) cache.SharedIndexInformer {
-	f.lock.Lock()
-	defer f.lock.Unlock()
-
-	informerType := reflect.TypeOf(obj)
-	informer, exists := f.informers[informerType]
-	if exists {
-		return informer
-	}
-	informer = newFunc(f.versionedClient, f.defaultResync)
+	informer = newFunc(f.client, f.defaultResync)
 	f.informers[informerType] = informer
 
 	return informer

cmd/kube-aggregator/pkg/client/informers/generic.go → cmd/kube-aggregator/pkg/client/informers/internalversion/generic.go

@@ -16,14 +16,13 @@ limitations under the License.
 
 // This file was automatically generated by informer-gen
 
-package informers
+package internalversion
 
 import (
 	"fmt"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	cache "k8s.io/client-go/tools/cache"
 	apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration"
-	v1alpha1 "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1"
 )
 
 // GenericInformer is type of SharedIndexInformer which will locate and delegate to other
@@ -56,10 +55,6 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
 	case apiregistration.SchemeGroupVersion.WithResource("apiservices"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Apiregistration().InternalVersion().APIServices().Informer()}, nil
 
-		// Group=Apiregistration, Version=V1alpha1
-	case v1alpha1.SchemeGroupVersion.WithResource("apiservices"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Apiregistration().V1alpha1().APIServices().Informer()}, nil
-
 	}
 
 	return nil, fmt.Errorf("no informer found for %v", resource)

cmd/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces/BUILD

+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = ["factory_interfaces.go"],
+    tags = ["automanaged"],
+    deps = [
+        "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/runtime",
+        "//vendor:k8s.io/client-go/tools/cache",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [":package-srcs"],
+    tags = ["automanaged"],
+)

cmd/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces/factory_interfaces.go

+/*
+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 internalinterfaces
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+	cache "k8s.io/client-go/tools/cache"
+	internalclientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset"
+	time "time"
+)
+
+type NewInformerFunc func(internalclientset.Interface, time.Duration) cache.SharedIndexInformer
+
+// SharedInformerFactory a small interface to allow for adding an informer without an import cycle
+type SharedInformerFactory interface {
+	Start(stopCh <-chan struct{})
+	InformerFor(obj runtime.Object, newFunc NewInformerFunc) cache.SharedIndexInformer
+}

cmd/kube-controller-manager/app/BUILD

@@ -31,7 +31,6 @@ go_library(
         "//pkg/apis/componentconfig:go_default_library",
         "//pkg/apis/extensions:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
-        "//pkg/client/informers/informers_generated:go_default_library",
         "//pkg/client/leaderelection:go_default_library",
         "//pkg/client/leaderelection/resourcelock:go_default_library",
         "//pkg/cloudprovider:go_default_library",

pkg/BUILD

@@ -37,7 +37,9 @@ filegroup(
         "//pkg/client/clientset_generated/clientset:all-srcs",
         "//pkg/client/clientset_generated/internalclientset:all-srcs",
         "//pkg/client/conditions:all-srcs",
-        "//pkg/client/informers/informers_generated:all-srcs",
+        "//pkg/client/informers/informers_generated/autoscaling/v2alpha1:all-srcs",
+        "//pkg/client/informers/informers_generated/externalversions:all-srcs",
+        "//pkg/client/informers/informers_generated/internalversion:all-srcs",
         "//pkg/client/leaderelection:all-srcs",
         "//pkg/client/legacylisters:all-srcs",
         "//pkg/client/listers/apps/internalversion:all-srcs",

pkg/client/informers/informers_generated/autoscaling/v2alpha1/BUILD

@@ -17,7 +17,6 @@ go_library(
     deps = [
         "//pkg/apis/autoscaling/v2alpha1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/autoscaling/v2alpha1:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/client/informers/informers_generated/BUILD → pkg/client/informers/informers_generated/externalversions/BUILD

@@ -15,39 +15,29 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api:go_default_library",
         "//pkg/api/v1:go_default_library",
-        "//pkg/apis/apps:go_default_library",
         "//pkg/apis/apps/v1beta1:go_default_library",
-        "//pkg/apis/autoscaling:go_default_library",
         "//pkg/apis/autoscaling/v1:go_default_library",
         "//pkg/apis/autoscaling/v2alpha1:go_default_library",
-        "//pkg/apis/batch:go_default_library",
         "//pkg/apis/batch/v1:go_default_library",
         "//pkg/apis/batch/v2alpha1:go_default_library",
-        "//pkg/apis/certificates:go_default_library",
         "//pkg/apis/certificates/v1beta1:go_default_library",
-        "//pkg/apis/extensions:go_default_library",
         "//pkg/apis/extensions/v1beta1:go_default_library",
-        "//pkg/apis/policy:go_default_library",
         "//pkg/apis/policy/v1beta1:go_default_library",
-        "//pkg/apis/rbac:go_default_library",
         "//pkg/apis/rbac/v1alpha1:go_default_library",
         "//pkg/apis/rbac/v1beta1:go_default_library",
-        "//pkg/apis/storage:go_default_library",
         "//pkg/apis/storage/v1beta1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
-        "//pkg/client/clientset_generated/internalclientset:go_default_library",
-        "//pkg/client/informers/informers_generated/apps:go_default_library",
-        "//pkg/client/informers/informers_generated/autoscaling:go_default_library",
-        "//pkg/client/informers/informers_generated/batch:go_default_library",
-        "//pkg/client/informers/informers_generated/certificates:go_default_library",
-        "//pkg/client/informers/informers_generated/core:go_default_library",
-        "//pkg/client/informers/informers_generated/extensions:go_default_library",
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
-        "//pkg/client/informers/informers_generated/policy:go_default_library",
-        "//pkg/client/informers/informers_generated/rbac:go_default_library",
-        "//pkg/client/informers/informers_generated/storage:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/apps:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/autoscaling:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/batch:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/certificates:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/core:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/extensions:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/policy:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/rbac:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/storage:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/client-go/tools/cache",
@@ -65,16 +55,16 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//pkg/client/informers/informers_generated/apps:all-srcs",
-        "//pkg/client/informers/informers_generated/autoscaling:all-srcs",
-        "//pkg/client/informers/informers_generated/batch:all-srcs",
-        "//pkg/client/informers/informers_generated/certificates:all-srcs",
-        "//pkg/client/informers/informers_generated/core:all-srcs",
-        "//pkg/client/informers/informers_generated/extensions:all-srcs",
-        "//pkg/client/informers/informers_generated/internalinterfaces:all-srcs",
-        "//pkg/client/informers/informers_generated/policy:all-srcs",
-        "//pkg/client/informers/informers_generated/rbac:all-srcs",
-        "//pkg/client/informers/informers_generated/storage:all-srcs",
+        "//pkg/client/informers/informers_generated/externalversions/apps:all-srcs",
+        "//pkg/client/informers/informers_generated/externalversions/autoscaling:all-srcs",
+        "//pkg/client/informers/informers_generated/externalversions/batch:all-srcs",
+        "//pkg/client/informers/informers_generated/externalversions/certificates:all-srcs",
+        "//pkg/client/informers/informers_generated/externalversions/core:all-srcs",
+        "//pkg/client/informers/informers_generated/externalversions/extensions:all-srcs",
+        "//pkg/client/informers/informers_generated/externalversions/internalinterfaces:all-srcs",
+        "//pkg/client/informers/informers_generated/externalversions/policy:all-srcs",
+        "//pkg/client/informers/informers_generated/externalversions/rbac:all-srcs",
+        "//pkg/client/informers/informers_generated/externalversions/storage:all-srcs",
     ],
     tags = ["automanaged"],
 )

pkg/client/informers/informers_generated/policy/BUILD → pkg/client/informers/informers_generated/externalversions/apps/BUILD

@@ -12,9 +12,8 @@ go_library(
     srcs = ["interface.go"],
     tags = ["automanaged"],
     deps = [
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
-        "//pkg/client/informers/informers_generated/policy/internalversion:go_default_library",
-        "//pkg/client/informers/informers_generated/policy/v1beta1:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/apps/v1beta1:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/internalinterfaces:go_default_library",
     ],
 )
 
@@ -29,8 +28,7 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//pkg/client/informers/informers_generated/policy/internalversion:all-srcs",
-        "//pkg/client/informers/informers_generated/policy/v1beta1:all-srcs",
+        "//pkg/client/informers/informers_generated/externalversions/apps/v1beta1:all-srcs",
     ],
     tags = ["automanaged"],
 )

pkg/client/informers/informers_generated/externalversions/apps/interface.go

+/*
+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 apps
+
+import (
+	v1beta1 "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/apps/v1beta1"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
+)
+
+// Interface provides access to each of this group's versions.
+type Interface interface {
+	// V1beta1 provides access to shared informers for resources in V1beta1.
+	V1beta1() v1beta1.Interface
+}
+
+type group struct {
+	internalinterfaces.SharedInformerFactory
+}
+
+// New returns a new Interface.
+func New(f internalinterfaces.SharedInformerFactory) Interface {
+	return &group{f}
+}
+
+// V1beta1 returns a new v1beta1.Interface.
+func (g *group) V1beta1() v1beta1.Interface {
+	return v1beta1.New(g.SharedInformerFactory)
+}

pkg/client/informers/informers_generated/apps/v1beta1/BUILD → pkg/client/informers/informers_generated/externalversions/apps/v1beta1/BUILD

@@ -17,7 +17,7 @@ go_library(
     deps = [
         "//pkg/apis/apps/v1beta1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/internalinterfaces:go_default_library",
         "//pkg/client/listers/apps/v1beta1:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/client/informers/informers_generated/apps/v1beta1/interface.go → pkg/client/informers/informers_generated/externalversions/apps/v1beta1/interface.go

@@ -19,7 +19,7 @@ limitations under the License.
 package v1beta1
 
 import (
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.

pkg/client/informers/informers_generated/apps/v1beta1/statefulset.go → pkg/client/informers/informers_generated/externalversions/apps/v1beta1/statefulset.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	apps_v1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1beta1 "k8s.io/kubernetes/pkg/client/listers/apps/v1beta1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newStatefulSetInformer(client clientset.Interface, resyncPeriod time.Durati
 }
 
 func (f *statefulSetInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&apps_v1beta1.StatefulSet{}, newStatefulSetInformer)
+	return f.factory.InformerFor(&apps_v1beta1.StatefulSet{}, newStatefulSetInformer)
 }
 
 func (f *statefulSetInformer) Lister() v1beta1.StatefulSetLister {

pkg/client/informers/informers_generated/externalversions/autoscaling/BUILD

+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = ["interface.go"],
+    tags = ["automanaged"],
+    deps = [
+        "//pkg/client/informers/informers_generated/externalversions/autoscaling/v1:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/autoscaling/v2alpha1:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/internalinterfaces:go_default_library",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [
+        ":package-srcs",
+        "//pkg/client/informers/informers_generated/externalversions/autoscaling/v1:all-srcs",
+        "//pkg/client/informers/informers_generated/externalversions/autoscaling/v2alpha1:all-srcs",
+    ],
+    tags = ["automanaged"],
+)

pkg/client/informers/informers_generated/autoscaling/interface.go → pkg/client/informers/informers_generated/externalversions/autoscaling/interface.go

@@ -19,16 +19,13 @@ limitations under the License.
 package autoscaling
 
 import (
-	internalversion "k8s.io/kubernetes/pkg/client/informers/informers_generated/autoscaling/internalversion"
-	v1 "k8s.io/kubernetes/pkg/client/informers/informers_generated/autoscaling/v1"
-	v2alpha1 "k8s.io/kubernetes/pkg/client/informers/informers_generated/autoscaling/v2alpha1"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	v1 "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/autoscaling/v1"
+	v2alpha1 "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/autoscaling/v2alpha1"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 )
 
 // Interface provides access to each of this group's versions.
 type Interface interface {
-	// InternalVersion provides access to shared informers for resources in InternalVersion.
-	InternalVersion() internalversion.Interface
 	// V1 provides access to shared informers for resources in V1.
 	V1() v1.Interface
 	// V2alpha1 provides access to shared informers for resources in V2alpha1.
@@ -44,11 +41,6 @@ func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &group{f}
 }
 
-// InternalVersion returns a new internalversion.Interface.
-func (g *group) InternalVersion() internalversion.Interface {
-	return internalversion.New(g.SharedInformerFactory)
-}
-
 // V1 returns a new v1.Interface.
 func (g *group) V1() v1.Interface {
 	return v1.New(g.SharedInformerFactory)

pkg/client/informers/informers_generated/autoscaling/v1/BUILD → pkg/client/informers/informers_generated/externalversions/autoscaling/v1/BUILD

@@ -17,7 +17,7 @@ go_library(
     deps = [
         "//pkg/apis/autoscaling/v1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/internalinterfaces:go_default_library",
         "//pkg/client/listers/autoscaling/v1:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/client/informers/informers_generated/autoscaling/v1/horizontalpodautoscaler.go → pkg/client/informers/informers_generated/externalversions/autoscaling/v1/horizontalpodautoscaler.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	autoscaling_v1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/autoscaling/v1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newHorizontalPodAutoscalerInformer(client clientset.Interface, resyncPeriod
 }
 
 func (f *horizontalPodAutoscalerInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&autoscaling_v1.HorizontalPodAutoscaler{}, newHorizontalPodAutoscalerInformer)
+	return f.factory.InformerFor(&autoscaling_v1.HorizontalPodAutoscaler{}, newHorizontalPodAutoscalerInformer)
 }
 
 func (f *horizontalPodAutoscalerInformer) Lister() v1.HorizontalPodAutoscalerLister {

pkg/client/informers/informers_generated/autoscaling/v1/interface.go → pkg/client/informers/informers_generated/externalversions/autoscaling/v1/interface.go

@@ -19,7 +19,7 @@ limitations under the License.
 package v1
 
 import (
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.

pkg/client/informers/informers_generated/externalversions/autoscaling/v2alpha1/BUILD

+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "horizontalpodautoscaler.go",
+        "interface.go",
+    ],
+    tags = ["automanaged"],
+    deps = [
+        "//pkg/apis/autoscaling/v2alpha1:go_default_library",
+        "//pkg/client/clientset_generated/clientset:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/internalinterfaces:go_default_library",
+        "//pkg/client/listers/autoscaling/v2alpha1:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
+        "//vendor:k8s.io/apimachinery/pkg/runtime",
+        "//vendor:k8s.io/apimachinery/pkg/watch",
+        "//vendor:k8s.io/client-go/tools/cache",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [":package-srcs"],
+    tags = ["automanaged"],
+)

pkg/client/informers/informers_generated/externalversions/autoscaling/v2alpha1/horizontalpodautoscaler.go

+/*
+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 v2alpha1
+
+import (
+	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"
+	autoscaling_v2alpha1 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1"
+	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
+	v2alpha1 "k8s.io/kubernetes/pkg/client/listers/autoscaling/v2alpha1"
+	time "time"
+)
+
+// HorizontalPodAutoscalerInformer provides access to a shared informer and lister for
+// HorizontalPodAutoscalers.
+type HorizontalPodAutoscalerInformer interface {
+	Informer() cache.SharedIndexInformer
+	Lister() v2alpha1.HorizontalPodAutoscalerLister
+}
+
+type horizontalPodAutoscalerInformer struct {
+	factory internalinterfaces.SharedInformerFactory
+}
+
+func newHorizontalPodAutoscalerInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
+	sharedIndexInformer := cache.NewSharedIndexInformer(
+		&cache.ListWatch{
+			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
+				return client.AutoscalingV2alpha1().HorizontalPodAutoscalers(v1.NamespaceAll).List(options)
+			},
+			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
+				return client.AutoscalingV2alpha1().HorizontalPodAutoscalers(v1.NamespaceAll).Watch(options)
+			},
+		},
+		&autoscaling_v2alpha1.HorizontalPodAutoscaler{},
+		resyncPeriod,
+		cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc},
+	)
+
+	return sharedIndexInformer
+}
+
+func (f *horizontalPodAutoscalerInformer) Informer() cache.SharedIndexInformer {
+	return f.factory.InformerFor(&autoscaling_v2alpha1.HorizontalPodAutoscaler{}, newHorizontalPodAutoscalerInformer)
+}
+
+func (f *horizontalPodAutoscalerInformer) Lister() v2alpha1.HorizontalPodAutoscalerLister {
+	return v2alpha1.NewHorizontalPodAutoscalerLister(f.Informer().GetIndexer())
+}

pkg/client/informers/informers_generated/externalversions/autoscaling/v2alpha1/interface.go

+/*
+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 v2alpha1
+
+import (
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
+)
+
+// Interface provides access to all the informers in this group version.
+type Interface interface {
+	// HorizontalPodAutoscalers returns a HorizontalPodAutoscalerInformer.
+	HorizontalPodAutoscalers() HorizontalPodAutoscalerInformer
+}
+
+type version struct {
+	internalinterfaces.SharedInformerFactory
+}
+
+// New returns a new Interface.
+func New(f internalinterfaces.SharedInformerFactory) Interface {
+	return &version{f}
+}
+
+// HorizontalPodAutoscalers returns a HorizontalPodAutoscalerInformer.
+func (v *version) HorizontalPodAutoscalers() HorizontalPodAutoscalerInformer {
+	return &horizontalPodAutoscalerInformer{factory: v.SharedInformerFactory}
+}

pkg/client/informers/informers_generated/externalversions/batch/BUILD

+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = ["interface.go"],
+    tags = ["automanaged"],
+    deps = [
+        "//pkg/client/informers/informers_generated/externalversions/batch/v1:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/batch/v2alpha1:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/internalinterfaces:go_default_library",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [
+        ":package-srcs",
+        "//pkg/client/informers/informers_generated/externalversions/batch/v1:all-srcs",
+        "//pkg/client/informers/informers_generated/externalversions/batch/v2alpha1:all-srcs",
+    ],
+    tags = ["automanaged"],
+)

pkg/client/informers/informers_generated/batch/interface.go → pkg/client/informers/informers_generated/externalversions/batch/interface.go

@@ -19,16 +19,13 @@ limitations under the License.
 package batch
 
 import (
-	internalversion "k8s.io/kubernetes/pkg/client/informers/informers_generated/batch/internalversion"
-	v1 "k8s.io/kubernetes/pkg/client/informers/informers_generated/batch/v1"
-	v2alpha1 "k8s.io/kubernetes/pkg/client/informers/informers_generated/batch/v2alpha1"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	v1 "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/batch/v1"
+	v2alpha1 "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/batch/v2alpha1"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 )
 
 // Interface provides access to each of this group's versions.
 type Interface interface {
-	// InternalVersion provides access to shared informers for resources in InternalVersion.
-	InternalVersion() internalversion.Interface
 	// V1 provides access to shared informers for resources in V1.
 	V1() v1.Interface
 	// V2alpha1 provides access to shared informers for resources in V2alpha1.
@@ -44,11 +41,6 @@ func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &group{f}
 }
 
-// InternalVersion returns a new internalversion.Interface.
-func (g *group) InternalVersion() internalversion.Interface {
-	return internalversion.New(g.SharedInformerFactory)
-}
-
 // V1 returns a new v1.Interface.
 func (g *group) V1() v1.Interface {
 	return v1.New(g.SharedInformerFactory)

pkg/client/informers/informers_generated/batch/v1/BUILD → pkg/client/informers/informers_generated/externalversions/batch/v1/BUILD

@@ -17,7 +17,7 @@ go_library(
     deps = [
         "//pkg/apis/batch/v1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/internalinterfaces:go_default_library",
         "//pkg/client/listers/batch/v1:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/client/informers/informers_generated/batch/v1/interface.go → pkg/client/informers/informers_generated/externalversions/batch/v1/interface.go

@@ -19,7 +19,7 @@ limitations under the License.
 package v1
 
 import (
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.

pkg/client/informers/informers_generated/batch/v1/job.go → pkg/client/informers/informers_generated/externalversions/batch/v1/job.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	batch_v1 "k8s.io/kubernetes/pkg/apis/batch/v1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/batch/v1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newJobInformer(client clientset.Interface, resyncPeriod time.Duration) cach
 }
 
 func (f *jobInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&batch_v1.Job{}, newJobInformer)
+	return f.factory.InformerFor(&batch_v1.Job{}, newJobInformer)
 }
 
 func (f *jobInformer) Lister() v1.JobLister {

pkg/client/informers/informers_generated/batch/v2alpha1/BUILD → pkg/client/informers/informers_generated/externalversions/batch/v2alpha1/BUILD

@@ -18,7 +18,7 @@ go_library(
     deps = [
         "//pkg/apis/batch/v2alpha1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/internalinterfaces:go_default_library",
         "//pkg/client/listers/batch/v2alpha1:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/client/informers/informers_generated/batch/v2alpha1/cronjob.go → pkg/client/informers/informers_generated/externalversions/batch/v2alpha1/cronjob.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	batch_v2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v2alpha1 "k8s.io/kubernetes/pkg/client/listers/batch/v2alpha1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newCronJobInformer(client clientset.Interface, resyncPeriod time.Duration)
 }
 
 func (f *cronJobInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&batch_v2alpha1.CronJob{}, newCronJobInformer)
+	return f.factory.InformerFor(&batch_v2alpha1.CronJob{}, newCronJobInformer)
 }
 
 func (f *cronJobInformer) Lister() v2alpha1.CronJobLister {

pkg/client/informers/informers_generated/batch/v2alpha1/interface.go → pkg/client/informers/informers_generated/externalversions/batch/v2alpha1/interface.go

@@ -19,7 +19,7 @@ limitations under the License.
 package v2alpha1
 
 import (
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.

pkg/client/informers/informers_generated/batch/v2alpha1/job.go → pkg/client/informers/informers_generated/externalversions/batch/v2alpha1/job.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	batch_v2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v2alpha1 "k8s.io/kubernetes/pkg/client/listers/batch/v2alpha1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newJobInformer(client clientset.Interface, resyncPeriod time.Duration) cach
 }
 
 func (f *jobInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&batch_v2alpha1.Job{}, newJobInformer)
+	return f.factory.InformerFor(&batch_v2alpha1.Job{}, newJobInformer)
 }
 
 func (f *jobInformer) Lister() v2alpha1.JobLister {

pkg/client/informers/informers_generated/batch/BUILD → pkg/client/informers/informers_generated/externalversions/certificates/BUILD

@@ -12,10 +12,8 @@ go_library(
     srcs = ["interface.go"],
     tags = ["automanaged"],
     deps = [
-        "//pkg/client/informers/informers_generated/batch/internalversion:go_default_library",
-        "//pkg/client/informers/informers_generated/batch/v1:go_default_library",
-        "//pkg/client/informers/informers_generated/batch/v2alpha1:go_default_library",
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/certificates/v1beta1:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/internalinterfaces:go_default_library",
     ],
 )
 
@@ -30,9 +28,7 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//pkg/client/informers/informers_generated/batch/internalversion:all-srcs",
-        "//pkg/client/informers/informers_generated/batch/v1:all-srcs",
-        "//pkg/client/informers/informers_generated/batch/v2alpha1:all-srcs",
+        "//pkg/client/informers/informers_generated/externalversions/certificates/v1beta1:all-srcs",
     ],
     tags = ["automanaged"],
 )

pkg/client/informers/informers_generated/externalversions/certificates/interface.go

+/*
+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 certificates
+
+import (
+	v1beta1 "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/certificates/v1beta1"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
+)
+
+// Interface provides access to each of this group's versions.
+type Interface interface {
+	// V1beta1 provides access to shared informers for resources in V1beta1.
+	V1beta1() v1beta1.Interface
+}
+
+type group struct {
+	internalinterfaces.SharedInformerFactory
+}
+
+// New returns a new Interface.
+func New(f internalinterfaces.SharedInformerFactory) Interface {
+	return &group{f}
+}
+
+// V1beta1 returns a new v1beta1.Interface.
+func (g *group) V1beta1() v1beta1.Interface {
+	return v1beta1.New(g.SharedInformerFactory)
+}

pkg/client/informers/informers_generated/certificates/v1beta1/BUILD → pkg/client/informers/informers_generated/externalversions/certificates/v1beta1/BUILD

@@ -17,7 +17,7 @@ go_library(
     deps = [
         "//pkg/apis/certificates/v1beta1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/internalinterfaces:go_default_library",
         "//pkg/client/listers/certificates/v1beta1:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/client/informers/informers_generated/certificates/v1beta1/certificatesigningrequest.go → pkg/client/informers/informers_generated/externalversions/certificates/v1beta1/certificatesigningrequest.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	certificates_v1beta1 "k8s.io/kubernetes/pkg/apis/certificates/v1beta1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1beta1 "k8s.io/kubernetes/pkg/client/listers/certificates/v1beta1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newCertificateSigningRequestInformer(client clientset.Interface, resyncPeri
 }
 
 func (f *certificateSigningRequestInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&certificates_v1beta1.CertificateSigningRequest{}, newCertificateSigningRequestInformer)
+	return f.factory.InformerFor(&certificates_v1beta1.CertificateSigningRequest{}, newCertificateSigningRequestInformer)
 }
 
 func (f *certificateSigningRequestInformer) Lister() v1beta1.CertificateSigningRequestLister {

pkg/client/informers/informers_generated/certificates/v1beta1/interface.go → pkg/client/informers/informers_generated/externalversions/certificates/v1beta1/interface.go

@@ -19,7 +19,7 @@ limitations under the License.
 package v1beta1
 
 import (
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.

pkg/client/informers/informers_generated/apps/BUILD → pkg/client/informers/informers_generated/externalversions/core/BUILD

@@ -12,9 +12,8 @@ go_library(
     srcs = ["interface.go"],
     tags = ["automanaged"],
     deps = [
-        "//pkg/client/informers/informers_generated/apps/internalversion:go_default_library",
-        "//pkg/client/informers/informers_generated/apps/v1beta1:go_default_library",
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/core/v1:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/internalinterfaces:go_default_library",
     ],
 )
 
@@ -29,8 +28,7 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//pkg/client/informers/informers_generated/apps/internalversion:all-srcs",
-        "//pkg/client/informers/informers_generated/apps/v1beta1:all-srcs",
+        "//pkg/client/informers/informers_generated/externalversions/core/v1:all-srcs",
     ],
     tags = ["automanaged"],
 )

pkg/client/informers/informers_generated/externalversions/core/interface.go

+/*
+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 core
+
+import (
+	v1 "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/core/v1"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/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)
+}

pkg/client/informers/informers_generated/core/v1/BUILD → pkg/client/informers/informers_generated/externalversions/core/v1/BUILD

@@ -32,7 +32,7 @@ go_library(
     deps = [
         "//pkg/api/v1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/internalinterfaces:go_default_library",
         "//pkg/client/listers/core/v1:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/client/informers/informers_generated/core/v1/componentstatus.go → pkg/client/informers/informers_generated/externalversions/core/v1/componentstatus.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newComponentStatusInformer(client clientset.Interface, resyncPeriod time.Du
 }
 
 func (f *componentStatusInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&api_v1.ComponentStatus{}, newComponentStatusInformer)
+	return f.factory.InformerFor(&api_v1.ComponentStatus{}, newComponentStatusInformer)
 }
 
 func (f *componentStatusInformer) Lister() v1.ComponentStatusLister {

pkg/client/informers/informers_generated/core/v1/configmap.go → pkg/client/informers/informers_generated/externalversions/core/v1/configmap.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newConfigMapInformer(client clientset.Interface, resyncPeriod time.Duration
 }
 
 func (f *configMapInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&api_v1.ConfigMap{}, newConfigMapInformer)
+	return f.factory.InformerFor(&api_v1.ConfigMap{}, newConfigMapInformer)
 }
 
 func (f *configMapInformer) Lister() v1.ConfigMapLister {

pkg/client/informers/informers_generated/core/v1/endpoints.go → pkg/client/informers/informers_generated/externalversions/core/v1/endpoints.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newEndpointsInformer(client clientset.Interface, resyncPeriod time.Duration
 }
 
 func (f *endpointsInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&api_v1.Endpoints{}, newEndpointsInformer)
+	return f.factory.InformerFor(&api_v1.Endpoints{}, newEndpointsInformer)
 }
 
 func (f *endpointsInformer) Lister() v1.EndpointsLister {

pkg/client/informers/informers_generated/core/v1/event.go → pkg/client/informers/informers_generated/externalversions/core/v1/event.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newEventInformer(client clientset.Interface, resyncPeriod time.Duration) ca
 }
 
 func (f *eventInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&api_v1.Event{}, newEventInformer)
+	return f.factory.InformerFor(&api_v1.Event{}, newEventInformer)
 }
 
 func (f *eventInformer) Lister() v1.EventLister {

pkg/client/informers/informers_generated/core/v1/interface.go → pkg/client/informers/informers_generated/externalversions/core/v1/interface.go

@@ -19,7 +19,7 @@ limitations under the License.
 package v1
 
 import (
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.

pkg/client/informers/informers_generated/core/v1/limitrange.go → pkg/client/informers/informers_generated/externalversions/core/v1/limitrange.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newLimitRangeInformer(client clientset.Interface, resyncPeriod time.Duratio
 }
 
 func (f *limitRangeInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&api_v1.LimitRange{}, newLimitRangeInformer)
+	return f.factory.InformerFor(&api_v1.LimitRange{}, newLimitRangeInformer)
 }
 
 func (f *limitRangeInformer) Lister() v1.LimitRangeLister {

pkg/client/informers/informers_generated/core/v1/namespace.go → pkg/client/informers/informers_generated/externalversions/core/v1/namespace.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newNamespaceInformer(client clientset.Interface, resyncPeriod time.Duration
 }
 
 func (f *namespaceInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&api_v1.Namespace{}, newNamespaceInformer)
+	return f.factory.InformerFor(&api_v1.Namespace{}, newNamespaceInformer)
 }
 
 func (f *namespaceInformer) Lister() v1.NamespaceLister {

pkg/client/informers/informers_generated/core/v1/node.go → pkg/client/informers/informers_generated/externalversions/core/v1/node.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newNodeInformer(client clientset.Interface, resyncPeriod time.Duration) cac
 }
 
 func (f *nodeInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&api_v1.Node{}, newNodeInformer)
+	return f.factory.InformerFor(&api_v1.Node{}, newNodeInformer)
 }
 
 func (f *nodeInformer) Lister() v1.NodeLister {

pkg/client/informers/informers_generated/core/v1/persistentvolume.go → pkg/client/informers/informers_generated/externalversions/core/v1/persistentvolume.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newPersistentVolumeInformer(client clientset.Interface, resyncPeriod time.D
 }
 
 func (f *persistentVolumeInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&api_v1.PersistentVolume{}, newPersistentVolumeInformer)
+	return f.factory.InformerFor(&api_v1.PersistentVolume{}, newPersistentVolumeInformer)
 }
 
 func (f *persistentVolumeInformer) Lister() v1.PersistentVolumeLister {

pkg/client/informers/informers_generated/core/v1/persistentvolumeclaim.go → pkg/client/informers/informers_generated/externalversions/core/v1/persistentvolumeclaim.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newPersistentVolumeClaimInformer(client clientset.Interface, resyncPeriod t
 }
 
 func (f *persistentVolumeClaimInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&api_v1.PersistentVolumeClaim{}, newPersistentVolumeClaimInformer)
+	return f.factory.InformerFor(&api_v1.PersistentVolumeClaim{}, newPersistentVolumeClaimInformer)
 }
 
 func (f *persistentVolumeClaimInformer) Lister() v1.PersistentVolumeClaimLister {

pkg/client/informers/informers_generated/core/v1/pod.go → pkg/client/informers/informers_generated/externalversions/core/v1/pod.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newPodInformer(client clientset.Interface, resyncPeriod time.Duration) cach
 }
 
 func (f *podInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&api_v1.Pod{}, newPodInformer)
+	return f.factory.InformerFor(&api_v1.Pod{}, newPodInformer)
 }
 
 func (f *podInformer) Lister() v1.PodLister {

pkg/client/informers/informers_generated/core/v1/podtemplate.go → pkg/client/informers/informers_generated/externalversions/core/v1/podtemplate.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newPodTemplateInformer(client clientset.Interface, resyncPeriod time.Durati
 }
 
 func (f *podTemplateInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&api_v1.PodTemplate{}, newPodTemplateInformer)
+	return f.factory.InformerFor(&api_v1.PodTemplate{}, newPodTemplateInformer)
 }
 
 func (f *podTemplateInformer) Lister() v1.PodTemplateLister {

pkg/client/informers/informers_generated/core/v1/replicationcontroller.go → pkg/client/informers/informers_generated/externalversions/core/v1/replicationcontroller.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newReplicationControllerInformer(client clientset.Interface, resyncPeriod t
 }
 
 func (f *replicationControllerInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&api_v1.ReplicationController{}, newReplicationControllerInformer)
+	return f.factory.InformerFor(&api_v1.ReplicationController{}, newReplicationControllerInformer)
 }
 
 func (f *replicationControllerInformer) Lister() v1.ReplicationControllerLister {

pkg/client/informers/informers_generated/core/v1/resourcequota.go → pkg/client/informers/informers_generated/externalversions/core/v1/resourcequota.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newResourceQuotaInformer(client clientset.Interface, resyncPeriod time.Dura
 }
 
 func (f *resourceQuotaInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&api_v1.ResourceQuota{}, newResourceQuotaInformer)
+	return f.factory.InformerFor(&api_v1.ResourceQuota{}, newResourceQuotaInformer)
 }
 
 func (f *resourceQuotaInformer) Lister() v1.ResourceQuotaLister {

pkg/client/informers/informers_generated/core/v1/secret.go → pkg/client/informers/informers_generated/externalversions/core/v1/secret.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newSecretInformer(client clientset.Interface, resyncPeriod time.Duration) c
 }
 
 func (f *secretInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&api_v1.Secret{}, newSecretInformer)
+	return f.factory.InformerFor(&api_v1.Secret{}, newSecretInformer)
 }
 
 func (f *secretInformer) Lister() v1.SecretLister {

pkg/client/informers/informers_generated/core/v1/service.go → pkg/client/informers/informers_generated/externalversions/core/v1/service.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newServiceInformer(client clientset.Interface, resyncPeriod time.Duration)
 }
 
 func (f *serviceInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&api_v1.Service{}, newServiceInformer)
+	return f.factory.InformerFor(&api_v1.Service{}, newServiceInformer)
 }
 
 func (f *serviceInformer) Lister() v1.ServiceLister {

pkg/client/informers/informers_generated/core/v1/serviceaccount.go → pkg/client/informers/informers_generated/externalversions/core/v1/serviceaccount.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newServiceAccountInformer(client clientset.Interface, resyncPeriod time.Dur
 }
 
 func (f *serviceAccountInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&api_v1.ServiceAccount{}, newServiceAccountInformer)
+	return f.factory.InformerFor(&api_v1.ServiceAccount{}, newServiceAccountInformer)
 }
 
 func (f *serviceAccountInformer) Lister() v1.ServiceAccountLister {

pkg/client/informers/informers_generated/certificates/BUILD → pkg/client/informers/informers_generated/externalversions/extensions/BUILD

@@ -12,9 +12,8 @@ go_library(
     srcs = ["interface.go"],
     tags = ["automanaged"],
     deps = [
-        "//pkg/client/informers/informers_generated/certificates/internalversion:go_default_library",
-        "//pkg/client/informers/informers_generated/certificates/v1beta1:go_default_library",
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/extensions/v1beta1:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/internalinterfaces:go_default_library",
     ],
 )
 
@@ -29,8 +28,7 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//pkg/client/informers/informers_generated/certificates/internalversion:all-srcs",
-        "//pkg/client/informers/informers_generated/certificates/v1beta1:all-srcs",
+        "//pkg/client/informers/informers_generated/externalversions/extensions/v1beta1:all-srcs",
     ],
     tags = ["automanaged"],
 )

pkg/client/informers/informers_generated/externalversions/extensions/interface.go

+/*
+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 extensions
+
+import (
+	v1beta1 "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
+)
+
+// Interface provides access to each of this group's versions.
+type Interface interface {
+	// V1beta1 provides access to shared informers for resources in V1beta1.
+	V1beta1() v1beta1.Interface
+}
+
+type group struct {
+	internalinterfaces.SharedInformerFactory
+}
+
+// New returns a new Interface.
+func New(f internalinterfaces.SharedInformerFactory) Interface {
+	return &group{f}
+}
+
+// V1beta1 returns a new v1beta1.Interface.
+func (g *group) V1beta1() v1beta1.Interface {
+	return v1beta1.New(g.SharedInformerFactory)
+}

pkg/client/informers/informers_generated/extensions/v1beta1/BUILD → pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/BUILD

@@ -22,7 +22,7 @@ go_library(
     deps = [
         "//pkg/apis/extensions/v1beta1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/internalinterfaces:go_default_library",
         "//pkg/client/listers/extensions/v1beta1:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/client/informers/informers_generated/extensions/v1beta1/daemonset.go → pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/daemonset.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1beta1 "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newDaemonSetInformer(client clientset.Interface, resyncPeriod time.Duration
 }
 
 func (f *daemonSetInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&extensions_v1beta1.DaemonSet{}, newDaemonSetInformer)
+	return f.factory.InformerFor(&extensions_v1beta1.DaemonSet{}, newDaemonSetInformer)
 }
 
 func (f *daemonSetInformer) Lister() v1beta1.DaemonSetLister {

pkg/client/informers/informers_generated/extensions/v1beta1/deployment.go → pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/deployment.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1beta1 "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newDeploymentInformer(client clientset.Interface, resyncPeriod time.Duratio
 }
 
 func (f *deploymentInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&extensions_v1beta1.Deployment{}, newDeploymentInformer)
+	return f.factory.InformerFor(&extensions_v1beta1.Deployment{}, newDeploymentInformer)
 }
 
 func (f *deploymentInformer) Lister() v1beta1.DeploymentLister {

pkg/client/informers/informers_generated/extensions/v1beta1/ingress.go → pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/ingress.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1beta1 "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newIngressInformer(client clientset.Interface, resyncPeriod time.Duration)
 }
 
 func (f *ingressInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&extensions_v1beta1.Ingress{}, newIngressInformer)
+	return f.factory.InformerFor(&extensions_v1beta1.Ingress{}, newIngressInformer)
 }
 
 func (f *ingressInformer) Lister() v1beta1.IngressLister {

pkg/client/informers/informers_generated/extensions/v1beta1/interface.go → pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/interface.go

@@ -19,7 +19,7 @@ limitations under the License.
 package v1beta1
 
 import (
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.

pkg/client/informers/informers_generated/extensions/v1beta1/podsecuritypolicy.go → pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/podsecuritypolicy.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1beta1 "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newPodSecurityPolicyInformer(client clientset.Interface, resyncPeriod time.
 }
 
 func (f *podSecurityPolicyInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&extensions_v1beta1.PodSecurityPolicy{}, newPodSecurityPolicyInformer)
+	return f.factory.InformerFor(&extensions_v1beta1.PodSecurityPolicy{}, newPodSecurityPolicyInformer)
 }
 
 func (f *podSecurityPolicyInformer) Lister() v1beta1.PodSecurityPolicyLister {

pkg/client/informers/informers_generated/extensions/v1beta1/replicaset.go → pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/replicaset.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1beta1 "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newReplicaSetInformer(client clientset.Interface, resyncPeriod time.Duratio
 }
 
 func (f *replicaSetInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&extensions_v1beta1.ReplicaSet{}, newReplicaSetInformer)
+	return f.factory.InformerFor(&extensions_v1beta1.ReplicaSet{}, newReplicaSetInformer)
 }
 
 func (f *replicaSetInformer) Lister() v1beta1.ReplicaSetLister {

pkg/client/informers/informers_generated/extensions/v1beta1/thirdpartyresource.go → pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/thirdpartyresource.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1beta1 "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newThirdPartyResourceInformer(client clientset.Interface, resyncPeriod time
 }
 
 func (f *thirdPartyResourceInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&extensions_v1beta1.ThirdPartyResource{}, newThirdPartyResourceInformer)
+	return f.factory.InformerFor(&extensions_v1beta1.ThirdPartyResource{}, newThirdPartyResourceInformer)
 }
 
 func (f *thirdPartyResourceInformer) Lister() v1beta1.ThirdPartyResourceLister {

pkg/client/informers/informers_generated/externalversions/factory.go

+/*
+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 externalversions
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+	schema "k8s.io/apimachinery/pkg/runtime/schema"
+	cache "k8s.io/client-go/tools/cache"
+	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
+	apps "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/apps"
+	autoscaling "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/autoscaling"
+	batch "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/batch"
+	certificates "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/certificates"
+	core "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/core"
+	extensions "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/extensions"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
+	policy "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/policy"
+	rbac "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/rbac"
+	storage "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/storage"
+	reflect "reflect"
+	sync "sync"
+	time "time"
+)
+
+type sharedInformerFactory struct {
+	client        clientset.Interface
+	lock          sync.Mutex
+	defaultResync time.Duration
+
+	informers map[reflect.Type]cache.SharedIndexInformer
+	// startedInformers is used for tracking which informers have been started.
+	// This allows Start() to be called multiple times safely.
+	startedInformers map[reflect.Type]bool
+}
+
+// NewSharedInformerFactory constructs a new instance of sharedInformerFactory
+func NewSharedInformerFactory(client clientset.Interface, defaultResync time.Duration) SharedInformerFactory {
+	return &sharedInformerFactory{
+		client:           client,
+		defaultResync:    defaultResync,
+		informers:        make(map[reflect.Type]cache.SharedIndexInformer),
+		startedInformers: make(map[reflect.Type]bool),
+	}
+}
+
+// Start initializes all requested informers.
+func (f *sharedInformerFactory) Start(stopCh <-chan struct{}) {
+	f.lock.Lock()
+	defer f.lock.Unlock()
+
+	for informerType, informer := range f.informers {
+		if !f.startedInformers[informerType] {
+			go informer.Run(stopCh)
+			f.startedInformers[informerType] = true
+		}
+	}
+}
+
+// InternalInformerFor returns the SharedIndexInformer for obj using an internal
+// client.
+func (f *sharedInformerFactory) InformerFor(obj runtime.Object, newFunc internalinterfaces.NewInformerFunc) cache.SharedIndexInformer {
+	f.lock.Lock()
+	defer f.lock.Unlock()
+
+	informerType := reflect.TypeOf(obj)
+	informer, exists := f.informers[informerType]
+	if exists {
+		return informer
+	}
+	informer = newFunc(f.client, f.defaultResync)
+	f.informers[informerType] = informer
+
+	return informer
+}
+
+// SharedInformerFactory provides shared informers for resources in all known
+// API group versions.
+type SharedInformerFactory interface {
+	internalinterfaces.SharedInformerFactory
+	ForResource(resource schema.GroupVersionResource) (GenericInformer, error)
+
+	Apps() apps.Interface
+	Autoscaling() autoscaling.Interface
+	Batch() batch.Interface
+	Certificates() certificates.Interface
+	Core() core.Interface
+	Extensions() extensions.Interface
+	Policy() policy.Interface
+	Rbac() rbac.Interface
+	Storage() storage.Interface
+}
+
+func (f *sharedInformerFactory) Apps() apps.Interface {
+	return apps.New(f)
+}
+
+func (f *sharedInformerFactory) Autoscaling() autoscaling.Interface {
+	return autoscaling.New(f)
+}
+
+func (f *sharedInformerFactory) Batch() batch.Interface {
+	return batch.New(f)
+}
+
+func (f *sharedInformerFactory) Certificates() certificates.Interface {
+	return certificates.New(f)
+}
+
+func (f *sharedInformerFactory) Core() core.Interface {
+	return core.New(f)
+}
+
+func (f *sharedInformerFactory) Extensions() extensions.Interface {
+	return extensions.New(f)
+}
+
+func (f *sharedInformerFactory) Policy() policy.Interface {
+	return policy.New(f)
+}
+
+func (f *sharedInformerFactory) Rbac() rbac.Interface {
+	return rbac.New(f)
+}
+
+func (f *sharedInformerFactory) Storage() storage.Interface {
+	return storage.New(f)
+}

pkg/client/informers/informers_generated/generic.go → pkg/client/informers/informers_generated/externalversions/generic.go

@@ -16,32 +16,23 @@ limitations under the License.
 
 // This file was automatically generated by informer-gen
 
-package informers_generated
+package externalversions
 
 import (
 	"fmt"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	cache "k8s.io/client-go/tools/cache"
-	api "k8s.io/kubernetes/pkg/api"
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
-	apps "k8s.io/kubernetes/pkg/apis/apps"
 	v1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1"
-	autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling"
 	v1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1"
 	v2alpha1 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1"
-	batch "k8s.io/kubernetes/pkg/apis/batch"
 	batch_v1 "k8s.io/kubernetes/pkg/apis/batch/v1"
 	batch_v2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1"
-	certificates "k8s.io/kubernetes/pkg/apis/certificates"
 	certificates_v1beta1 "k8s.io/kubernetes/pkg/apis/certificates/v1beta1"
-	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
-	policy "k8s.io/kubernetes/pkg/apis/policy"
 	policy_v1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1"
-	rbac "k8s.io/kubernetes/pkg/apis/rbac"
 	v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
 	rbac_v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1"
-	storage "k8s.io/kubernetes/pkg/apis/storage"
 	storage_v1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1"
 )
 
@@ -71,18 +62,10 @@ 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=Apps, Version=InternalVersion
-	case apps.SchemeGroupVersion.WithResource("statefulsets"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Apps().InternalVersion().StatefulSets().Informer()}, nil
-
 	// Group=Apps, Version=V1beta1
 	case v1beta1.SchemeGroupVersion.WithResource("statefulsets"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Apps().V1beta1().StatefulSets().Informer()}, nil
 
-		// Group=Autoscaling, Version=InternalVersion
-	case autoscaling.SchemeGroupVersion.WithResource("horizontalpodautoscalers"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Autoscaling().InternalVersion().HorizontalPodAutoscalers().Informer()}, nil
-
 		// Group=Autoscaling, Version=V1
 	case v1.SchemeGroupVersion.WithResource("horizontalpodautoscalers"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Autoscaling().V1().HorizontalPodAutoscalers().Informer()}, nil
@@ -91,12 +74,6 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
 	case v2alpha1.SchemeGroupVersion.WithResource("horizontalpodautoscalers"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Autoscaling().V2alpha1().HorizontalPodAutoscalers().Informer()}, nil
 
-		// 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=Batch, Version=V1
 	case batch_v1.SchemeGroupVersion.WithResource("jobs"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Batch().V1().Jobs().Informer()}, nil
@@ -107,48 +84,10 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
 	case batch_v2alpha1.SchemeGroupVersion.WithResource("jobs"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Batch().V2alpha1().Jobs().Informer()}, nil
 
-		// Group=Certificates, Version=InternalVersion
-	case certificates.SchemeGroupVersion.WithResource("certificatesigningrequests"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Certificates().InternalVersion().CertificateSigningRequests().Informer()}, nil
-
 		// Group=Certificates, Version=V1beta1
 	case certificates_v1beta1.SchemeGroupVersion.WithResource("certificatesigningrequests"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Certificates().V1beta1().CertificateSigningRequests().Informer()}, nil
 
-		// 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"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().ConfigMaps().Informer()}, nil
-	case api.SchemeGroupVersion.WithResource("endpoints"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().Endpoints().Informer()}, nil
-	case api.SchemeGroupVersion.WithResource("events"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().Events().Informer()}, nil
-	case api.SchemeGroupVersion.WithResource("limitranges"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().LimitRanges().Informer()}, nil
-	case api.SchemeGroupVersion.WithResource("namespaces"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().Namespaces().Informer()}, nil
-	case api.SchemeGroupVersion.WithResource("nodes"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().Nodes().Informer()}, nil
-	case api.SchemeGroupVersion.WithResource("persistentvolumes"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().PersistentVolumes().Informer()}, nil
-	case api.SchemeGroupVersion.WithResource("persistentvolumeclaims"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().PersistentVolumeClaims().Informer()}, nil
-	case api.SchemeGroupVersion.WithResource("pods"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().Pods().Informer()}, nil
-	case api.SchemeGroupVersion.WithResource("podtemplates"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().PodTemplates().Informer()}, nil
-	case api.SchemeGroupVersion.WithResource("replicationcontrollers"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().ReplicationControllers().Informer()}, nil
-	case api.SchemeGroupVersion.WithResource("resourcequotas"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().ResourceQuotas().Informer()}, nil
-	case api.SchemeGroupVersion.WithResource("secrets"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().Secrets().Informer()}, nil
-	case api.SchemeGroupVersion.WithResource("services"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().Services().Informer()}, nil
-	case api.SchemeGroupVersion.WithResource("serviceaccounts"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().ServiceAccounts().Informer()}, nil
-
 		// Group=Core, Version=V1
 	case api_v1.SchemeGroupVersion.WithResource("componentstatuses"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().V1().ComponentStatuses().Informer()}, nil
@@ -183,22 +122,6 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
 	case api_v1.SchemeGroupVersion.WithResource("serviceaccounts"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().V1().ServiceAccounts().Informer()}, nil
 
-		// 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"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Extensions().InternalVersion().Deployments().Informer()}, nil
-	case extensions.SchemeGroupVersion.WithResource("ingresses"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Extensions().InternalVersion().Ingresses().Informer()}, nil
-	case extensions.SchemeGroupVersion.WithResource("networkpolicies"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Extensions().InternalVersion().NetworkPolicies().Informer()}, nil
-	case extensions.SchemeGroupVersion.WithResource("podsecuritypolicies"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Extensions().InternalVersion().PodSecurityPolicies().Informer()}, nil
-	case extensions.SchemeGroupVersion.WithResource("replicasets"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Extensions().InternalVersion().ReplicaSets().Informer()}, nil
-	case extensions.SchemeGroupVersion.WithResource("thirdpartyresources"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Extensions().InternalVersion().ThirdPartyResources().Informer()}, nil
-
 		// Group=Extensions, Version=V1beta1
 	case extensions_v1beta1.SchemeGroupVersion.WithResource("daemonsets"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Extensions().V1beta1().DaemonSets().Informer()}, nil
@@ -213,24 +136,10 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
 	case extensions_v1beta1.SchemeGroupVersion.WithResource("thirdpartyresources"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Extensions().V1beta1().ThirdPartyResources().Informer()}, nil
 
-		// Group=Policy, Version=InternalVersion
-	case policy.SchemeGroupVersion.WithResource("poddisruptionbudgets"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Policy().InternalVersion().PodDisruptionBudgets().Informer()}, nil
-
 		// 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=InternalVersion
-	case rbac.SchemeGroupVersion.WithResource("clusterroles"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Rbac().InternalVersion().ClusterRoles().Informer()}, nil
-	case rbac.SchemeGroupVersion.WithResource("clusterrolebindings"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Rbac().InternalVersion().ClusterRoleBindings().Informer()}, nil
-	case rbac.SchemeGroupVersion.WithResource("roles"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Rbac().InternalVersion().Roles().Informer()}, nil
-	case rbac.SchemeGroupVersion.WithResource("rolebindings"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Rbac().InternalVersion().RoleBindings().Informer()}, nil
-
 		// Group=Rbac, Version=V1alpha1
 	case v1alpha1.SchemeGroupVersion.WithResource("clusterroles"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Rbac().V1alpha1().ClusterRoles().Informer()}, nil
@@ -251,10 +160,6 @@ 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=Storage, Version=InternalVersion
-	case storage.SchemeGroupVersion.WithResource("storageclasses"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Storage().InternalVersion().StorageClasses().Informer()}, nil
-
 		// Group=Storage, Version=V1beta1
 	case storage_v1beta1.SchemeGroupVersion.WithResource("storageclasses"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Storage().V1beta1().StorageClasses().Informer()}, nil

pkg/client/informers/informers_generated/internalinterfaces/BUILD → pkg/client/informers/informers_generated/externalversions/internalinterfaces/BUILD

@@ -9,11 +9,10 @@ load(
 
 go_library(
     name = "go_default_library",
-    srcs = ["internal_interfaces.go"],
+    srcs = ["factory_interfaces.go"],
     tags = ["automanaged"],
     deps = [
         "//pkg/client/clientset_generated/clientset:go_default_library",
-        "//pkg/client/clientset_generated/internalclientset:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/client-go/tools/cache",
     ],

pkg/client/informers/informers_generated/externalversions/internalinterfaces/factory_interfaces.go

+/*
+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 internalinterfaces
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+	cache "k8s.io/client-go/tools/cache"
+	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
+	time "time"
+)
+
+type NewInformerFunc func(clientset.Interface, time.Duration) cache.SharedIndexInformer
+
+// SharedInformerFactory a small interface to allow for adding an informer without an import cycle
+type SharedInformerFactory interface {
+	Start(stopCh <-chan struct{})
+	InformerFor(obj runtime.Object, newFunc NewInformerFunc) cache.SharedIndexInformer
+}

cmd/kube-aggregator/pkg/client/informers/apiregistration/BUILD → pkg/client/informers/informers_generated/externalversions/policy/BUILD

@@ -12,9 +12,8 @@ go_library(
     srcs = ["interface.go"],
     tags = ["automanaged"],
     deps = [
-        "//cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion:go_default_library",
-        "//cmd/kube-aggregator/pkg/client/informers/apiregistration/v1alpha1:go_default_library",
-        "//cmd/kube-aggregator/pkg/client/informers/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/policy/v1beta1:go_default_library",
     ],
 )
 
@@ -29,8 +28,7 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion:all-srcs",
-        "//cmd/kube-aggregator/pkg/client/informers/apiregistration/v1alpha1:all-srcs",
+        "//pkg/client/informers/informers_generated/externalversions/policy/v1beta1:all-srcs",
     ],
     tags = ["automanaged"],
 )

pkg/client/informers/informers_generated/externalversions/policy/interface.go

+/*
+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 policy
+
+import (
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
+	v1beta1 "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/policy/v1beta1"
+)
+
+// Interface provides access to each of this group's versions.
+type Interface interface {
+	// V1beta1 provides access to shared informers for resources in V1beta1.
+	V1beta1() v1beta1.Interface
+}
+
+type group struct {
+	internalinterfaces.SharedInformerFactory
+}
+
+// New returns a new Interface.
+func New(f internalinterfaces.SharedInformerFactory) Interface {
+	return &group{f}
+}
+
+// V1beta1 returns a new v1beta1.Interface.
+func (g *group) V1beta1() v1beta1.Interface {
+	return v1beta1.New(g.SharedInformerFactory)
+}

pkg/client/informers/informers_generated/policy/v1beta1/BUILD → pkg/client/informers/informers_generated/externalversions/policy/v1beta1/BUILD

@@ -17,7 +17,7 @@ go_library(
     deps = [
         "//pkg/apis/policy/v1beta1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/internalinterfaces:go_default_library",
         "//pkg/client/listers/policy/v1beta1:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/client/informers/informers_generated/policy/v1beta1/interface.go → pkg/client/informers/informers_generated/externalversions/policy/v1beta1/interface.go

@@ -19,7 +19,7 @@ limitations under the License.
 package v1beta1
 
 import (
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.

pkg/client/informers/informers_generated/policy/v1beta1/poddisruptionbudget.go → pkg/client/informers/informers_generated/externalversions/policy/v1beta1/poddisruptionbudget.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	policy_v1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1beta1 "k8s.io/kubernetes/pkg/client/listers/policy/v1beta1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newPodDisruptionBudgetInformer(client clientset.Interface, resyncPeriod tim
 }
 
 func (f *podDisruptionBudgetInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&policy_v1beta1.PodDisruptionBudget{}, newPodDisruptionBudgetInformer)
+	return f.factory.InformerFor(&policy_v1beta1.PodDisruptionBudget{}, newPodDisruptionBudgetInformer)
 }
 
 func (f *podDisruptionBudgetInformer) Lister() v1beta1.PodDisruptionBudgetLister {

pkg/client/informers/informers_generated/externalversions/rbac/BUILD

+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = ["interface.go"],
+    tags = ["automanaged"],
+    deps = [
+        "//pkg/client/informers/informers_generated/externalversions/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/rbac/v1alpha1:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/rbac/v1beta1:go_default_library",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [
+        ":package-srcs",
+        "//pkg/client/informers/informers_generated/externalversions/rbac/v1alpha1:all-srcs",
+        "//pkg/client/informers/informers_generated/externalversions/rbac/v1beta1:all-srcs",
+    ],
+    tags = ["automanaged"],
+)

pkg/client/informers/informers_generated/rbac/interface.go → pkg/client/informers/informers_generated/externalversions/rbac/interface.go

@@ -19,16 +19,13 @@ limitations under the License.
 package rbac
 
 import (
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
-	internalversion "k8s.io/kubernetes/pkg/client/informers/informers_generated/rbac/internalversion"
-	v1alpha1 "k8s.io/kubernetes/pkg/client/informers/informers_generated/rbac/v1alpha1"
-	v1beta1 "k8s.io/kubernetes/pkg/client/informers/informers_generated/rbac/v1beta1"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
+	v1alpha1 "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/rbac/v1alpha1"
+	v1beta1 "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/rbac/v1beta1"
 )
 
 // Interface provides access to each of this group's versions.
 type Interface interface {
-	// InternalVersion provides access to shared informers for resources in InternalVersion.
-	InternalVersion() internalversion.Interface
 	// V1alpha1 provides access to shared informers for resources in V1alpha1.
 	V1alpha1() v1alpha1.Interface
 	// V1beta1 provides access to shared informers for resources in V1beta1.
@@ -44,11 +41,6 @@ func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &group{f}
 }
 
-// InternalVersion returns a new internalversion.Interface.
-func (g *group) InternalVersion() internalversion.Interface {
-	return internalversion.New(g.SharedInformerFactory)
-}
-
 // V1alpha1 returns a new v1alpha1.Interface.
 func (g *group) V1alpha1() v1alpha1.Interface {
 	return v1alpha1.New(g.SharedInformerFactory)

pkg/client/informers/informers_generated/rbac/v1alpha1/BUILD → pkg/client/informers/informers_generated/externalversions/rbac/v1alpha1/BUILD

@@ -20,7 +20,7 @@ go_library(
     deps = [
         "//pkg/apis/rbac/v1alpha1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/internalinterfaces:go_default_library",
         "//pkg/client/listers/rbac/v1alpha1:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrole.go → pkg/client/informers/informers_generated/externalversions/rbac/v1alpha1/clusterrole.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	rbac_v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1alpha1 "k8s.io/kubernetes/pkg/client/listers/rbac/v1alpha1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newClusterRoleInformer(client clientset.Interface, resyncPeriod time.Durati
 }
 
 func (f *clusterRoleInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&rbac_v1alpha1.ClusterRole{}, newClusterRoleInformer)
+	return f.factory.InformerFor(&rbac_v1alpha1.ClusterRole{}, newClusterRoleInformer)
 }
 
 func (f *clusterRoleInformer) Lister() v1alpha1.ClusterRoleLister {

pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrolebinding.go → pkg/client/informers/informers_generated/externalversions/rbac/v1alpha1/clusterrolebinding.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	rbac_v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1alpha1 "k8s.io/kubernetes/pkg/client/listers/rbac/v1alpha1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newClusterRoleBindingInformer(client clientset.Interface, resyncPeriod time
 }
 
 func (f *clusterRoleBindingInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&rbac_v1alpha1.ClusterRoleBinding{}, newClusterRoleBindingInformer)
+	return f.factory.InformerFor(&rbac_v1alpha1.ClusterRoleBinding{}, newClusterRoleBindingInformer)
 }
 
 func (f *clusterRoleBindingInformer) Lister() v1alpha1.ClusterRoleBindingLister {

pkg/client/informers/informers_generated/rbac/v1alpha1/interface.go → pkg/client/informers/informers_generated/externalversions/rbac/v1alpha1/interface.go

@@ -19,7 +19,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.

pkg/client/informers/informers_generated/rbac/v1alpha1/role.go → pkg/client/informers/informers_generated/externalversions/rbac/v1alpha1/role.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	rbac_v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1alpha1 "k8s.io/kubernetes/pkg/client/listers/rbac/v1alpha1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newRoleInformer(client clientset.Interface, resyncPeriod time.Duration) cac
 }
 
 func (f *roleInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&rbac_v1alpha1.Role{}, newRoleInformer)
+	return f.factory.InformerFor(&rbac_v1alpha1.Role{}, newRoleInformer)
 }
 
 func (f *roleInformer) Lister() v1alpha1.RoleLister {

pkg/client/informers/informers_generated/rbac/v1alpha1/rolebinding.go → pkg/client/informers/informers_generated/externalversions/rbac/v1alpha1/rolebinding.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	rbac_v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1alpha1 "k8s.io/kubernetes/pkg/client/listers/rbac/v1alpha1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newRoleBindingInformer(client clientset.Interface, resyncPeriod time.Durati
 }
 
 func (f *roleBindingInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&rbac_v1alpha1.RoleBinding{}, newRoleBindingInformer)
+	return f.factory.InformerFor(&rbac_v1alpha1.RoleBinding{}, newRoleBindingInformer)
 }
 
 func (f *roleBindingInformer) Lister() v1alpha1.RoleBindingLister {

pkg/client/informers/informers_generated/rbac/v1beta1/BUILD → pkg/client/informers/informers_generated/externalversions/rbac/v1beta1/BUILD

@@ -20,7 +20,7 @@ go_library(
     deps = [
         "//pkg/apis/rbac/v1beta1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/internalinterfaces:go_default_library",
         "//pkg/client/listers/rbac/v1beta1:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/client/informers/informers_generated/rbac/v1beta1/clusterrole.go → pkg/client/informers/informers_generated/externalversions/rbac/v1beta1/clusterrole.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	rbac_v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1beta1 "k8s.io/kubernetes/pkg/client/listers/rbac/v1beta1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newClusterRoleInformer(client clientset.Interface, resyncPeriod time.Durati
 }
 
 func (f *clusterRoleInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&rbac_v1beta1.ClusterRole{}, newClusterRoleInformer)
+	return f.factory.InformerFor(&rbac_v1beta1.ClusterRole{}, newClusterRoleInformer)
 }
 
 func (f *clusterRoleInformer) Lister() v1beta1.ClusterRoleLister {

pkg/client/informers/informers_generated/rbac/v1beta1/clusterrolebinding.go → pkg/client/informers/informers_generated/externalversions/rbac/v1beta1/clusterrolebinding.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	rbac_v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1beta1 "k8s.io/kubernetes/pkg/client/listers/rbac/v1beta1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newClusterRoleBindingInformer(client clientset.Interface, resyncPeriod time
 }
 
 func (f *clusterRoleBindingInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&rbac_v1beta1.ClusterRoleBinding{}, newClusterRoleBindingInformer)
+	return f.factory.InformerFor(&rbac_v1beta1.ClusterRoleBinding{}, newClusterRoleBindingInformer)
 }
 
 func (f *clusterRoleBindingInformer) Lister() v1beta1.ClusterRoleBindingLister {

pkg/client/informers/informers_generated/rbac/v1beta1/interface.go → pkg/client/informers/informers_generated/externalversions/rbac/v1beta1/interface.go

@@ -19,7 +19,7 @@ limitations under the License.
 package v1beta1
 
 import (
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.

pkg/client/informers/informers_generated/rbac/v1beta1/role.go → pkg/client/informers/informers_generated/externalversions/rbac/v1beta1/role.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	rbac_v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1beta1 "k8s.io/kubernetes/pkg/client/listers/rbac/v1beta1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newRoleInformer(client clientset.Interface, resyncPeriod time.Duration) cac
 }
 
 func (f *roleInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&rbac_v1beta1.Role{}, newRoleInformer)
+	return f.factory.InformerFor(&rbac_v1beta1.Role{}, newRoleInformer)
 }
 
 func (f *roleInformer) Lister() v1beta1.RoleLister {

pkg/client/informers/informers_generated/rbac/v1beta1/rolebinding.go → pkg/client/informers/informers_generated/externalversions/rbac/v1beta1/rolebinding.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	rbac_v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1beta1 "k8s.io/kubernetes/pkg/client/listers/rbac/v1beta1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newRoleBindingInformer(client clientset.Interface, resyncPeriod time.Durati
 }
 
 func (f *roleBindingInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&rbac_v1beta1.RoleBinding{}, newRoleBindingInformer)
+	return f.factory.InformerFor(&rbac_v1beta1.RoleBinding{}, newRoleBindingInformer)
 }
 
 func (f *roleBindingInformer) Lister() v1beta1.RoleBindingLister {

pkg/client/informers/informers_generated/extensions/BUILD → pkg/client/informers/informers_generated/externalversions/storage/BUILD

@@ -12,9 +12,8 @@ go_library(
     srcs = ["interface.go"],
     tags = ["automanaged"],
     deps = [
-        "//pkg/client/informers/informers_generated/extensions/internalversion:go_default_library",
-        "//pkg/client/informers/informers_generated/extensions/v1beta1:go_default_library",
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/storage/v1beta1:go_default_library",
     ],
 )
 
@@ -29,8 +28,7 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//pkg/client/informers/informers_generated/extensions/internalversion:all-srcs",
-        "//pkg/client/informers/informers_generated/extensions/v1beta1:all-srcs",
+        "//pkg/client/informers/informers_generated/externalversions/storage/v1beta1:all-srcs",
     ],
     tags = ["automanaged"],
 )

pkg/client/informers/informers_generated/externalversions/storage/interface.go

+/*
+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 storage
+
+import (
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
+	v1beta1 "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/storage/v1beta1"
+)
+
+// Interface provides access to each of this group's versions.
+type Interface interface {
+	// V1beta1 provides access to shared informers for resources in V1beta1.
+	V1beta1() v1beta1.Interface
+}
+
+type group struct {
+	internalinterfaces.SharedInformerFactory
+}
+
+// New returns a new Interface.
+func New(f internalinterfaces.SharedInformerFactory) Interface {
+	return &group{f}
+}
+
+// V1beta1 returns a new v1beta1.Interface.
+func (g *group) V1beta1() v1beta1.Interface {
+	return v1beta1.New(g.SharedInformerFactory)
+}

pkg/client/informers/informers_generated/storage/v1beta1/BUILD → pkg/client/informers/informers_generated/externalversions/storage/v1beta1/BUILD

@@ -17,7 +17,7 @@ go_library(
     deps = [
         "//pkg/apis/storage/v1beta1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/externalversions/internalinterfaces:go_default_library",
         "//pkg/client/listers/storage/v1beta1:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/client/informers/informers_generated/storage/v1beta1/interface.go → pkg/client/informers/informers_generated/externalversions/storage/v1beta1/interface.go

@@ -19,7 +19,7 @@ limitations under the License.
 package v1beta1
 
 import (
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.

pkg/client/informers/informers_generated/storage/v1beta1/storageclass.go → pkg/client/informers/informers_generated/externalversions/storage/v1beta1/storageclass.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	storage_v1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
 	v1beta1 "k8s.io/kubernetes/pkg/client/listers/storage/v1beta1"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newStorageClassInformer(client clientset.Interface, resyncPeriod time.Durat
 }
 
 func (f *storageClassInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.VersionedInformerFor(&storage_v1beta1.StorageClass{}, newStorageClassInformer)
+	return f.factory.InformerFor(&storage_v1beta1.StorageClass{}, newStorageClassInformer)
 }
 
 func (f *storageClassInformer) Lister() v1beta1.StorageClassLister {

pkg/client/informers/informers_generated/internalversion/BUILD

+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "factory.go",
+        "generic.go",
+    ],
+    tags = ["automanaged"],
+    deps = [
+        "//pkg/api:go_default_library",
+        "//pkg/apis/apps: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/policy:go_default_library",
+        "//pkg/apis/rbac:go_default_library",
+        "//pkg/apis/storage:go_default_library",
+        "//pkg/client/clientset_generated/internalclientset:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/apps:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/autoscaling:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/batch:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/certificates:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/core:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/extensions:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/policy:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/rbac:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/storage:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/runtime",
+        "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
+        "//vendor:k8s.io/client-go/tools/cache",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [
+        ":package-srcs",
+        "//pkg/client/informers/informers_generated/internalversion/apps:all-srcs",
+        "//pkg/client/informers/informers_generated/internalversion/autoscaling:all-srcs",
+        "//pkg/client/informers/informers_generated/internalversion/batch:all-srcs",
+        "//pkg/client/informers/informers_generated/internalversion/certificates:all-srcs",
+        "//pkg/client/informers/informers_generated/internalversion/core:all-srcs",
+        "//pkg/client/informers/informers_generated/internalversion/extensions:all-srcs",
+        "//pkg/client/informers/informers_generated/internalversion/internalinterfaces:all-srcs",
+        "//pkg/client/informers/informers_generated/internalversion/policy:all-srcs",
+        "//pkg/client/informers/informers_generated/internalversion/rbac:all-srcs",
+        "//pkg/client/informers/informers_generated/internalversion/storage:all-srcs",
+    ],
+    tags = ["automanaged"],
+)

pkg/client/informers/informers_generated/rbac/BUILD → pkg/client/informers/informers_generated/internalversion/apps/BUILD

@@ -12,10 +12,8 @@ go_library(
     srcs = ["interface.go"],
     tags = ["automanaged"],
     deps = [
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
-        "//pkg/client/informers/informers_generated/rbac/internalversion:go_default_library",
-        "//pkg/client/informers/informers_generated/rbac/v1alpha1:go_default_library",
-        "//pkg/client/informers/informers_generated/rbac/v1beta1:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/apps/internalversion:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/internalinterfaces:go_default_library",
     ],
 )
 
@@ -30,9 +28,7 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//pkg/client/informers/informers_generated/rbac/internalversion:all-srcs",
-        "//pkg/client/informers/informers_generated/rbac/v1alpha1:all-srcs",
-        "//pkg/client/informers/informers_generated/rbac/v1beta1:all-srcs",
+        "//pkg/client/informers/informers_generated/internalversion/apps/internalversion:all-srcs",
     ],
     tags = ["automanaged"],
 )

pkg/client/informers/informers_generated/apps/interface.go → pkg/client/informers/informers_generated/internalversion/apps/interface.go

@@ -19,17 +19,14 @@ limitations under the License.
 package apps
 
 import (
-	internalversion "k8s.io/kubernetes/pkg/client/informers/informers_generated/apps/internalversion"
-	v1beta1 "k8s.io/kubernetes/pkg/client/informers/informers_generated/apps/v1beta1"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalversion "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/apps/internalversion"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 )
 
 // Interface provides access to each of this group's versions.
 type Interface interface {
 	// InternalVersion provides access to shared informers for resources in InternalVersion.
 	InternalVersion() internalversion.Interface
-	// V1beta1 provides access to shared informers for resources in V1beta1.
-	V1beta1() v1beta1.Interface
 }
 
 type group struct {
@@ -45,8 +42,3 @@ func New(f internalinterfaces.SharedInformerFactory) Interface {
 func (g *group) InternalVersion() internalversion.Interface {
 	return internalversion.New(g.SharedInformerFactory)
 }
-
-// V1beta1 returns a new v1beta1.Interface.
-func (g *group) V1beta1() v1beta1.Interface {
-	return v1beta1.New(g.SharedInformerFactory)
-}

pkg/client/informers/informers_generated/apps/internalversion/BUILD → pkg/client/informers/informers_generated/internalversion/apps/internalversion/BUILD

@@ -17,7 +17,7 @@ go_library(
     deps = [
         "//pkg/apis/apps:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/internalinterfaces:go_default_library",
         "//pkg/client/listers/apps/internalversion:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/client/informers/informers_generated/apps/internalversion/interface.go → pkg/client/informers/informers_generated/internalversion/apps/internalversion/interface.go

@@ -19,7 +19,7 @@ limitations under the License.
 package internalversion
 
 import (
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.

pkg/client/informers/informers_generated/apps/internalversion/statefulset.go → pkg/client/informers/informers_generated/internalversion/apps/internalversion/statefulset.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	apps "k8s.io/kubernetes/pkg/apis/apps"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/apps/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newStatefulSetInformer(client internalclientset.Interface, resyncPeriod tim
 }
 
 func (f *statefulSetInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&apps.StatefulSet{}, newStatefulSetInformer)
+	return f.factory.InformerFor(&apps.StatefulSet{}, newStatefulSetInformer)
 }
 
 func (f *statefulSetInformer) Lister() internalversion.StatefulSetLister {

pkg/client/informers/informers_generated/storage/BUILD → pkg/client/informers/informers_generated/internalversion/autoscaling/BUILD

@@ -12,9 +12,8 @@ go_library(
     srcs = ["interface.go"],
     tags = ["automanaged"],
     deps = [
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
-        "//pkg/client/informers/informers_generated/storage/internalversion:go_default_library",
-        "//pkg/client/informers/informers_generated/storage/v1beta1:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/autoscaling/internalversion:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/internalinterfaces:go_default_library",
     ],
 )
 
@@ -29,8 +28,7 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//pkg/client/informers/informers_generated/storage/internalversion:all-srcs",
-        "//pkg/client/informers/informers_generated/storage/v1beta1:all-srcs",
+        "//pkg/client/informers/informers_generated/internalversion/autoscaling/internalversion:all-srcs",
     ],
     tags = ["automanaged"],
 )

pkg/client/informers/informers_generated/internalversion/autoscaling/interface.go

+/*
+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 autoscaling
+
+import (
+	internalversion "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/autoscaling/internalversion"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
+)
+
+// Interface provides access to each of this group's versions.
+type Interface interface {
+	// InternalVersion provides access to shared informers for resources in InternalVersion.
+	InternalVersion() internalversion.Interface
+}
+
+type group struct {
+	internalinterfaces.SharedInformerFactory
+}
+
+// New returns a new Interface.
+func New(f internalinterfaces.SharedInformerFactory) Interface {
+	return &group{f}
+}
+
+// InternalVersion returns a new internalversion.Interface.
+func (g *group) InternalVersion() internalversion.Interface {
+	return internalversion.New(g.SharedInformerFactory)
+}

pkg/client/informers/informers_generated/autoscaling/internalversion/BUILD → pkg/client/informers/informers_generated/internalversion/autoscaling/internalversion/BUILD

@@ -17,7 +17,7 @@ go_library(
     deps = [
         "//pkg/apis/autoscaling:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/internalinterfaces:go_default_library",
         "//pkg/client/listers/autoscaling/internalversion:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/client/informers/informers_generated/autoscaling/internalversion/horizontalpodautoscaler.go → pkg/client/informers/informers_generated/internalversion/autoscaling/internalversion/horizontalpodautoscaler.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/autoscaling/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newHorizontalPodAutoscalerInformer(client internalclientset.Interface, resy
 }
 
 func (f *horizontalPodAutoscalerInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&autoscaling.HorizontalPodAutoscaler{}, newHorizontalPodAutoscalerInformer)
+	return f.factory.InformerFor(&autoscaling.HorizontalPodAutoscaler{}, newHorizontalPodAutoscalerInformer)
 }
 
 func (f *horizontalPodAutoscalerInformer) Lister() internalversion.HorizontalPodAutoscalerLister {

pkg/client/informers/informers_generated/autoscaling/internalversion/interface.go → pkg/client/informers/informers_generated/internalversion/autoscaling/internalversion/interface.go

@@ -19,7 +19,7 @@ limitations under the License.
 package internalversion
 
 import (
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.

pkg/client/informers/informers_generated/autoscaling/BUILD → pkg/client/informers/informers_generated/internalversion/batch/BUILD

@@ -12,10 +12,8 @@ go_library(
     srcs = ["interface.go"],
     tags = ["automanaged"],
     deps = [
-        "//pkg/client/informers/informers_generated/autoscaling/internalversion:go_default_library",
-        "//pkg/client/informers/informers_generated/autoscaling/v1:go_default_library",
-        "//pkg/client/informers/informers_generated/autoscaling/v2alpha1:go_default_library",
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/batch/internalversion:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/internalinterfaces:go_default_library",
     ],
 )
 
@@ -30,9 +28,7 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//pkg/client/informers/informers_generated/autoscaling/internalversion:all-srcs",
-        "//pkg/client/informers/informers_generated/autoscaling/v1:all-srcs",
-        "//pkg/client/informers/informers_generated/autoscaling/v2alpha1:all-srcs",
+        "//pkg/client/informers/informers_generated/internalversion/batch/internalversion:all-srcs",
     ],
     tags = ["automanaged"],
 )

pkg/client/informers/informers_generated/internalversion/batch/interface.go

+/*
+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 batch
+
+import (
+	internalversion "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/batch/internalversion"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
+)
+
+// Interface provides access to each of this group's versions.
+type Interface interface {
+	// InternalVersion provides access to shared informers for resources in InternalVersion.
+	InternalVersion() internalversion.Interface
+}
+
+type group struct {
+	internalinterfaces.SharedInformerFactory
+}
+
+// New returns a new Interface.
+func New(f internalinterfaces.SharedInformerFactory) Interface {
+	return &group{f}
+}
+
+// InternalVersion returns a new internalversion.Interface.
+func (g *group) InternalVersion() internalversion.Interface {
+	return internalversion.New(g.SharedInformerFactory)
+}

pkg/client/informers/informers_generated/batch/internalversion/BUILD → pkg/client/informers/informers_generated/internalversion/batch/internalversion/BUILD

@@ -18,7 +18,7 @@ go_library(
     deps = [
         "//pkg/apis/batch:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/internalinterfaces:go_default_library",
         "//pkg/client/listers/batch/internalversion:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/client/informers/informers_generated/batch/internalversion/cronjob.go → pkg/client/informers/informers_generated/internalversion/batch/internalversion/cronjob.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	batch "k8s.io/kubernetes/pkg/apis/batch"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/batch/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newCronJobInformer(client internalclientset.Interface, resyncPeriod time.Du
 }
 
 func (f *cronJobInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&batch.CronJob{}, newCronJobInformer)
+	return f.factory.InformerFor(&batch.CronJob{}, newCronJobInformer)
 }
 
 func (f *cronJobInformer) Lister() internalversion.CronJobLister {

pkg/client/informers/informers_generated/batch/internalversion/interface.go → pkg/client/informers/informers_generated/internalversion/batch/internalversion/interface.go

@@ -19,7 +19,7 @@ limitations under the License.
 package internalversion
 
 import (
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.

pkg/client/informers/informers_generated/batch/internalversion/job.go → pkg/client/informers/informers_generated/internalversion/batch/internalversion/job.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	batch "k8s.io/kubernetes/pkg/apis/batch"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/batch/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newJobInformer(client internalclientset.Interface, resyncPeriod time.Durati
 }
 
 func (f *jobInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&batch.Job{}, newJobInformer)
+	return f.factory.InformerFor(&batch.Job{}, newJobInformer)
 }
 
 func (f *jobInformer) Lister() internalversion.JobLister {

pkg/client/informers/informers_generated/internalversion/certificates/BUILD

+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = ["interface.go"],
+    tags = ["automanaged"],
+    deps = [
+        "//pkg/client/informers/informers_generated/internalversion/certificates/internalversion:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/internalinterfaces:go_default_library",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [
+        ":package-srcs",
+        "//pkg/client/informers/informers_generated/internalversion/certificates/internalversion:all-srcs",
+    ],
+    tags = ["automanaged"],
+)

pkg/client/informers/informers_generated/certificates/interface.go → pkg/client/informers/informers_generated/internalversion/certificates/interface.go

@@ -19,17 +19,14 @@ limitations under the License.
 package certificates
 
 import (
-	internalversion "k8s.io/kubernetes/pkg/client/informers/informers_generated/certificates/internalversion"
-	v1beta1 "k8s.io/kubernetes/pkg/client/informers/informers_generated/certificates/v1beta1"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalversion "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/certificates/internalversion"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 )
 
 // Interface provides access to each of this group's versions.
 type Interface interface {
 	// InternalVersion provides access to shared informers for resources in InternalVersion.
 	InternalVersion() internalversion.Interface
-	// V1beta1 provides access to shared informers for resources in V1beta1.
-	V1beta1() v1beta1.Interface
 }
 
 type group struct {
@@ -45,8 +42,3 @@ func New(f internalinterfaces.SharedInformerFactory) Interface {
 func (g *group) InternalVersion() internalversion.Interface {
 	return internalversion.New(g.SharedInformerFactory)
 }
-
-// V1beta1 returns a new v1beta1.Interface.
-func (g *group) V1beta1() v1beta1.Interface {
-	return v1beta1.New(g.SharedInformerFactory)
-}

pkg/client/informers/informers_generated/certificates/internalversion/BUILD → pkg/client/informers/informers_generated/internalversion/certificates/internalversion/BUILD

@@ -17,7 +17,7 @@ go_library(
     deps = [
         "//pkg/apis/certificates:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/internalinterfaces:go_default_library",
         "//pkg/client/listers/certificates/internalversion:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/client/informers/informers_generated/certificates/internalversion/certificatesigningrequest.go → pkg/client/informers/informers_generated/internalversion/certificates/internalversion/certificatesigningrequest.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	certificates "k8s.io/kubernetes/pkg/apis/certificates"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/certificates/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newCertificateSigningRequestInformer(client internalclientset.Interface, re
 }
 
 func (f *certificateSigningRequestInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&certificates.CertificateSigningRequest{}, newCertificateSigningRequestInformer)
+	return f.factory.InformerFor(&certificates.CertificateSigningRequest{}, newCertificateSigningRequestInformer)
 }
 
 func (f *certificateSigningRequestInformer) Lister() internalversion.CertificateSigningRequestLister {

pkg/client/informers/informers_generated/certificates/internalversion/interface.go → pkg/client/informers/informers_generated/internalversion/certificates/internalversion/interface.go

@@ -19,7 +19,7 @@ limitations under the License.
 package internalversion
 
 import (
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.

pkg/client/informers/informers_generated/internalversion/core/BUILD

+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = ["interface.go"],
+    tags = ["automanaged"],
+    deps = [
+        "//pkg/client/informers/informers_generated/internalversion/core/internalversion:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/internalinterfaces:go_default_library",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [
+        ":package-srcs",
+        "//pkg/client/informers/informers_generated/internalversion/core/internalversion:all-srcs",
+    ],
+    tags = ["automanaged"],
+)

pkg/client/informers/informers_generated/core/interface.go → pkg/client/informers/informers_generated/internalversion/core/interface.go

@@ -19,17 +19,14 @@ limitations under the License.
 package core
 
 import (
-	internalversion "k8s.io/kubernetes/pkg/client/informers/informers_generated/core/internalversion"
-	v1 "k8s.io/kubernetes/pkg/client/informers/informers_generated/core/v1"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalversion "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/core/internalversion"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 )
 
 // Interface provides access to each of this group's versions.
 type Interface interface {
 	// InternalVersion provides access to shared informers for resources in InternalVersion.
 	InternalVersion() internalversion.Interface
-	// V1 provides access to shared informers for resources in V1.
-	V1() v1.Interface
 }
 
 type group struct {
@@ -45,8 +42,3 @@ func New(f internalinterfaces.SharedInformerFactory) Interface {
 func (g *group) InternalVersion() internalversion.Interface {
 	return internalversion.New(g.SharedInformerFactory)
 }
-
-// V1 returns a new v1.Interface.
-func (g *group) V1() v1.Interface {
-	return v1.New(g.SharedInformerFactory)
-}

pkg/client/informers/informers_generated/core/internalversion/BUILD → pkg/client/informers/informers_generated/internalversion/core/internalversion/BUILD

@@ -32,7 +32,7 @@ go_library(
     deps = [
         "//pkg/api:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/internalinterfaces:go_default_library",
         "//pkg/client/listers/core/internalversion:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/client/informers/informers_generated/core/internalversion/componentstatus.go → pkg/client/informers/informers_generated/internalversion/core/internalversion/componentstatus.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api "k8s.io/kubernetes/pkg/api"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newComponentStatusInformer(client internalclientset.Interface, resyncPeriod
 }
 
 func (f *componentStatusInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&api.ComponentStatus{}, newComponentStatusInformer)
+	return f.factory.InformerFor(&api.ComponentStatus{}, newComponentStatusInformer)
 }
 
 func (f *componentStatusInformer) Lister() internalversion.ComponentStatusLister {

pkg/client/informers/informers_generated/core/internalversion/configmap.go → pkg/client/informers/informers_generated/internalversion/core/internalversion/configmap.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api "k8s.io/kubernetes/pkg/api"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newConfigMapInformer(client internalclientset.Interface, resyncPeriod time.
 }
 
 func (f *configMapInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&api.ConfigMap{}, newConfigMapInformer)
+	return f.factory.InformerFor(&api.ConfigMap{}, newConfigMapInformer)
 }
 
 func (f *configMapInformer) Lister() internalversion.ConfigMapLister {

pkg/client/informers/informers_generated/core/internalversion/endpoints.go → pkg/client/informers/informers_generated/internalversion/core/internalversion/endpoints.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api "k8s.io/kubernetes/pkg/api"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newEndpointsInformer(client internalclientset.Interface, resyncPeriod time.
 }
 
 func (f *endpointsInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&api.Endpoints{}, newEndpointsInformer)
+	return f.factory.InformerFor(&api.Endpoints{}, newEndpointsInformer)
 }
 
 func (f *endpointsInformer) Lister() internalversion.EndpointsLister {

pkg/client/informers/informers_generated/core/internalversion/event.go → pkg/client/informers/informers_generated/internalversion/core/internalversion/event.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api "k8s.io/kubernetes/pkg/api"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newEventInformer(client internalclientset.Interface, resyncPeriod time.Dura
 }
 
 func (f *eventInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&api.Event{}, newEventInformer)
+	return f.factory.InformerFor(&api.Event{}, newEventInformer)
 }
 
 func (f *eventInformer) Lister() internalversion.EventLister {

pkg/client/informers/informers_generated/core/internalversion/interface.go → pkg/client/informers/informers_generated/internalversion/core/internalversion/interface.go

@@ -19,7 +19,7 @@ limitations under the License.
 package internalversion
 
 import (
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.

pkg/client/informers/informers_generated/core/internalversion/limitrange.go → pkg/client/informers/informers_generated/internalversion/core/internalversion/limitrange.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api "k8s.io/kubernetes/pkg/api"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newLimitRangeInformer(client internalclientset.Interface, resyncPeriod time
 }
 
 func (f *limitRangeInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&api.LimitRange{}, newLimitRangeInformer)
+	return f.factory.InformerFor(&api.LimitRange{}, newLimitRangeInformer)
 }
 
 func (f *limitRangeInformer) Lister() internalversion.LimitRangeLister {

pkg/client/informers/informers_generated/core/internalversion/namespace.go → pkg/client/informers/informers_generated/internalversion/core/internalversion/namespace.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api "k8s.io/kubernetes/pkg/api"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newNamespaceInformer(client internalclientset.Interface, resyncPeriod time.
 }
 
 func (f *namespaceInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&api.Namespace{}, newNamespaceInformer)
+	return f.factory.InformerFor(&api.Namespace{}, newNamespaceInformer)
 }
 
 func (f *namespaceInformer) Lister() internalversion.NamespaceLister {

pkg/client/informers/informers_generated/core/internalversion/node.go → pkg/client/informers/informers_generated/internalversion/core/internalversion/node.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api "k8s.io/kubernetes/pkg/api"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newNodeInformer(client internalclientset.Interface, resyncPeriod time.Durat
 }
 
 func (f *nodeInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&api.Node{}, newNodeInformer)
+	return f.factory.InformerFor(&api.Node{}, newNodeInformer)
 }
 
 func (f *nodeInformer) Lister() internalversion.NodeLister {

pkg/client/informers/informers_generated/core/internalversion/persistentvolume.go → pkg/client/informers/informers_generated/internalversion/core/internalversion/persistentvolume.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api "k8s.io/kubernetes/pkg/api"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newPersistentVolumeInformer(client internalclientset.Interface, resyncPerio
 }
 
 func (f *persistentVolumeInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&api.PersistentVolume{}, newPersistentVolumeInformer)
+	return f.factory.InformerFor(&api.PersistentVolume{}, newPersistentVolumeInformer)
 }
 
 func (f *persistentVolumeInformer) Lister() internalversion.PersistentVolumeLister {

pkg/client/informers/informers_generated/core/internalversion/persistentvolumeclaim.go → pkg/client/informers/informers_generated/internalversion/core/internalversion/persistentvolumeclaim.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api "k8s.io/kubernetes/pkg/api"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newPersistentVolumeClaimInformer(client internalclientset.Interface, resync
 }
 
 func (f *persistentVolumeClaimInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&api.PersistentVolumeClaim{}, newPersistentVolumeClaimInformer)
+	return f.factory.InformerFor(&api.PersistentVolumeClaim{}, newPersistentVolumeClaimInformer)
 }
 
 func (f *persistentVolumeClaimInformer) Lister() internalversion.PersistentVolumeClaimLister {

pkg/client/informers/informers_generated/core/internalversion/pod.go → pkg/client/informers/informers_generated/internalversion/core/internalversion/pod.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api "k8s.io/kubernetes/pkg/api"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newPodInformer(client internalclientset.Interface, resyncPeriod time.Durati
 }
 
 func (f *podInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&api.Pod{}, newPodInformer)
+	return f.factory.InformerFor(&api.Pod{}, newPodInformer)
 }
 
 func (f *podInformer) Lister() internalversion.PodLister {

pkg/client/informers/informers_generated/core/internalversion/podtemplate.go → pkg/client/informers/informers_generated/internalversion/core/internalversion/podtemplate.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api "k8s.io/kubernetes/pkg/api"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newPodTemplateInformer(client internalclientset.Interface, resyncPeriod tim
 }
 
 func (f *podTemplateInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&api.PodTemplate{}, newPodTemplateInformer)
+	return f.factory.InformerFor(&api.PodTemplate{}, newPodTemplateInformer)
 }
 
 func (f *podTemplateInformer) Lister() internalversion.PodTemplateLister {

pkg/client/informers/informers_generated/core/internalversion/replicationcontroller.go → pkg/client/informers/informers_generated/internalversion/core/internalversion/replicationcontroller.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api "k8s.io/kubernetes/pkg/api"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newReplicationControllerInformer(client internalclientset.Interface, resync
 }
 
 func (f *replicationControllerInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&api.ReplicationController{}, newReplicationControllerInformer)
+	return f.factory.InformerFor(&api.ReplicationController{}, newReplicationControllerInformer)
 }
 
 func (f *replicationControllerInformer) Lister() internalversion.ReplicationControllerLister {

pkg/client/informers/informers_generated/core/internalversion/resourcequota.go → pkg/client/informers/informers_generated/internalversion/core/internalversion/resourcequota.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api "k8s.io/kubernetes/pkg/api"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newResourceQuotaInformer(client internalclientset.Interface, resyncPeriod t
 }
 
 func (f *resourceQuotaInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&api.ResourceQuota{}, newResourceQuotaInformer)
+	return f.factory.InformerFor(&api.ResourceQuota{}, newResourceQuotaInformer)
 }
 
 func (f *resourceQuotaInformer) Lister() internalversion.ResourceQuotaLister {

pkg/client/informers/informers_generated/core/internalversion/secret.go → pkg/client/informers/informers_generated/internalversion/core/internalversion/secret.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api "k8s.io/kubernetes/pkg/api"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newSecretInformer(client internalclientset.Interface, resyncPeriod time.Dur
 }
 
 func (f *secretInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&api.Secret{}, newSecretInformer)
+	return f.factory.InformerFor(&api.Secret{}, newSecretInformer)
 }
 
 func (f *secretInformer) Lister() internalversion.SecretLister {

pkg/client/informers/informers_generated/core/internalversion/service.go → pkg/client/informers/informers_generated/internalversion/core/internalversion/service.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api "k8s.io/kubernetes/pkg/api"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newServiceInformer(client internalclientset.Interface, resyncPeriod time.Du
 }
 
 func (f *serviceInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&api.Service{}, newServiceInformer)
+	return f.factory.InformerFor(&api.Service{}, newServiceInformer)
 }
 
 func (f *serviceInformer) Lister() internalversion.ServiceLister {

pkg/client/informers/informers_generated/core/internalversion/serviceaccount.go → pkg/client/informers/informers_generated/internalversion/core/internalversion/serviceaccount.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	api "k8s.io/kubernetes/pkg/api"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newServiceAccountInformer(client internalclientset.Interface, resyncPeriod
 }
 
 func (f *serviceAccountInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&api.ServiceAccount{}, newServiceAccountInformer)
+	return f.factory.InformerFor(&api.ServiceAccount{}, newServiceAccountInformer)
 }
 
 func (f *serviceAccountInformer) Lister() internalversion.ServiceAccountLister {

pkg/client/informers/informers_generated/internalversion/extensions/BUILD

+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = ["interface.go"],
+    tags = ["automanaged"],
+    deps = [
+        "//pkg/client/informers/informers_generated/internalversion/extensions/internalversion:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/internalinterfaces:go_default_library",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [
+        ":package-srcs",
+        "//pkg/client/informers/informers_generated/internalversion/extensions/internalversion:all-srcs",
+    ],
+    tags = ["automanaged"],
+)

pkg/client/informers/informers_generated/extensions/interface.go → pkg/client/informers/informers_generated/internalversion/extensions/interface.go

@@ -19,17 +19,14 @@ limitations under the License.
 package extensions
 
 import (
-	internalversion "k8s.io/kubernetes/pkg/client/informers/informers_generated/extensions/internalversion"
-	v1beta1 "k8s.io/kubernetes/pkg/client/informers/informers_generated/extensions/v1beta1"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalversion "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/extensions/internalversion"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 )
 
 // Interface provides access to each of this group's versions.
 type Interface interface {
 	// InternalVersion provides access to shared informers for resources in InternalVersion.
 	InternalVersion() internalversion.Interface
-	// V1beta1 provides access to shared informers for resources in V1beta1.
-	V1beta1() v1beta1.Interface
 }
 
 type group struct {
@@ -45,8 +42,3 @@ func New(f internalinterfaces.SharedInformerFactory) Interface {
 func (g *group) InternalVersion() internalversion.Interface {
 	return internalversion.New(g.SharedInformerFactory)
 }
-
-// V1beta1 returns a new v1beta1.Interface.
-func (g *group) V1beta1() v1beta1.Interface {
-	return v1beta1.New(g.SharedInformerFactory)
-}

pkg/client/informers/informers_generated/extensions/internalversion/BUILD → pkg/client/informers/informers_generated/internalversion/extensions/internalversion/BUILD

@@ -23,7 +23,7 @@ go_library(
     deps = [
         "//pkg/apis/extensions:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/internalinterfaces:go_default_library",
         "//pkg/client/listers/extensions/internalversion:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/client/informers/informers_generated/extensions/internalversion/daemonset.go → pkg/client/informers/informers_generated/internalversion/extensions/internalversion/daemonset.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/extensions/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newDaemonSetInformer(client internalclientset.Interface, resyncPeriod time.
 }
 
 func (f *daemonSetInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&extensions.DaemonSet{}, newDaemonSetInformer)
+	return f.factory.InformerFor(&extensions.DaemonSet{}, newDaemonSetInformer)
 }
 
 func (f *daemonSetInformer) Lister() internalversion.DaemonSetLister {

pkg/client/informers/informers_generated/extensions/internalversion/deployment.go → pkg/client/informers/informers_generated/internalversion/extensions/internalversion/deployment.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/extensions/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newDeploymentInformer(client internalclientset.Interface, resyncPeriod time
 }
 
 func (f *deploymentInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&extensions.Deployment{}, newDeploymentInformer)
+	return f.factory.InformerFor(&extensions.Deployment{}, newDeploymentInformer)
 }
 
 func (f *deploymentInformer) Lister() internalversion.DeploymentLister {

pkg/client/informers/informers_generated/extensions/internalversion/ingress.go → pkg/client/informers/informers_generated/internalversion/extensions/internalversion/ingress.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/extensions/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newIngressInformer(client internalclientset.Interface, resyncPeriod time.Du
 }
 
 func (f *ingressInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&extensions.Ingress{}, newIngressInformer)
+	return f.factory.InformerFor(&extensions.Ingress{}, newIngressInformer)
 }
 
 func (f *ingressInformer) Lister() internalversion.IngressLister {

pkg/client/informers/informers_generated/extensions/internalversion/interface.go → pkg/client/informers/informers_generated/internalversion/extensions/internalversion/interface.go

@@ -19,7 +19,7 @@ limitations under the License.
 package internalversion
 
 import (
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.

pkg/client/informers/informers_generated/extensions/internalversion/networkpolicy.go → pkg/client/informers/informers_generated/internalversion/extensions/internalversion/networkpolicy.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/extensions/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newNetworkPolicyInformer(client internalclientset.Interface, resyncPeriod t
 }
 
 func (f *networkPolicyInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&extensions.NetworkPolicy{}, newNetworkPolicyInformer)
+	return f.factory.InformerFor(&extensions.NetworkPolicy{}, newNetworkPolicyInformer)
 }
 
 func (f *networkPolicyInformer) Lister() internalversion.NetworkPolicyLister {

pkg/client/informers/informers_generated/extensions/internalversion/podsecuritypolicy.go → pkg/client/informers/informers_generated/internalversion/extensions/internalversion/podsecuritypolicy.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/extensions/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newPodSecurityPolicyInformer(client internalclientset.Interface, resyncPeri
 }
 
 func (f *podSecurityPolicyInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&extensions.PodSecurityPolicy{}, newPodSecurityPolicyInformer)
+	return f.factory.InformerFor(&extensions.PodSecurityPolicy{}, newPodSecurityPolicyInformer)
 }
 
 func (f *podSecurityPolicyInformer) Lister() internalversion.PodSecurityPolicyLister {

pkg/client/informers/informers_generated/extensions/internalversion/replicaset.go → pkg/client/informers/informers_generated/internalversion/extensions/internalversion/replicaset.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/extensions/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newReplicaSetInformer(client internalclientset.Interface, resyncPeriod time
 }
 
 func (f *replicaSetInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&extensions.ReplicaSet{}, newReplicaSetInformer)
+	return f.factory.InformerFor(&extensions.ReplicaSet{}, newReplicaSetInformer)
 }
 
 func (f *replicaSetInformer) Lister() internalversion.ReplicaSetLister {

pkg/client/informers/informers_generated/extensions/internalversion/thirdpartyresource.go → pkg/client/informers/informers_generated/internalversion/extensions/internalversion/thirdpartyresource.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/extensions/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newThirdPartyResourceInformer(client internalclientset.Interface, resyncPer
 }
 
 func (f *thirdPartyResourceInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&extensions.ThirdPartyResource{}, newThirdPartyResourceInformer)
+	return f.factory.InformerFor(&extensions.ThirdPartyResource{}, newThirdPartyResourceInformer)
 }
 
 func (f *thirdPartyResourceInformer) Lister() internalversion.ThirdPartyResourceLister {

pkg/client/informers/informers_generated/factory.go → pkg/client/informers/informers_generated/internalversion/factory.go

@@ -16,32 +16,30 @@ limitations under the License.
 
 // This file was automatically generated by informer-gen
 
-package informers_generated
+package internalversion
 
 import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	cache "k8s.io/client-go/tools/cache"
-	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	apps "k8s.io/kubernetes/pkg/client/informers/informers_generated/apps"
-	autoscaling "k8s.io/kubernetes/pkg/client/informers/informers_generated/autoscaling"
-	batch "k8s.io/kubernetes/pkg/client/informers/informers_generated/batch"
-	certificates "k8s.io/kubernetes/pkg/client/informers/informers_generated/certificates"
-	core "k8s.io/kubernetes/pkg/client/informers/informers_generated/core"
-	extensions "k8s.io/kubernetes/pkg/client/informers/informers_generated/extensions"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
-	policy "k8s.io/kubernetes/pkg/client/informers/informers_generated/policy"
-	rbac "k8s.io/kubernetes/pkg/client/informers/informers_generated/rbac"
-	storage "k8s.io/kubernetes/pkg/client/informers/informers_generated/storage"
+	apps "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/apps"
+	autoscaling "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/autoscaling"
+	batch "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/batch"
+	certificates "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/certificates"
+	core "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/core"
+	extensions "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/extensions"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
+	policy "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/policy"
+	rbac "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/rbac"
+	storage "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/storage"
 	reflect "reflect"
 	sync "sync"
 	time "time"
 )
 
 type sharedInformerFactory struct {
-	internalClient  internalclientset.Interface
-	versionedClient clientset.Interface
+	client        internalclientset.Interface
 	lock          sync.Mutex
 	defaultResync time.Duration
 
@@ -52,10 +50,9 @@ type sharedInformerFactory struct {
 }
 
 // NewSharedInformerFactory constructs a new instance of sharedInformerFactory
-func NewSharedInformerFactory(internalClient internalclientset.Interface, versionedClient clientset.Interface, defaultResync time.Duration) SharedInformerFactory {
+func NewSharedInformerFactory(client internalclientset.Interface, defaultResync time.Duration) SharedInformerFactory {
 	return &sharedInformerFactory{
-		internalClient:   internalClient,
-		versionedClient:  versionedClient,
+		client:           client,
 		defaultResync:    defaultResync,
 		informers:        make(map[reflect.Type]cache.SharedIndexInformer),
 		startedInformers: make(map[reflect.Type]bool),
@@ -77,7 +74,7 @@ func (f *sharedInformerFactory) Start(stopCh <-chan struct{}) {
 
 // InternalInformerFor returns the SharedIndexInformer for obj using an internal
 // client.
-func (f *sharedInformerFactory) InternalInformerFor(obj runtime.Object, newFunc internalinterfaces.NewInternalInformerFunc) cache.SharedIndexInformer {
+func (f *sharedInformerFactory) InformerFor(obj runtime.Object, newFunc internalinterfaces.NewInformerFunc) cache.SharedIndexInformer {
 	f.lock.Lock()
 	defer f.lock.Unlock()
 
@@ -86,24 +83,7 @@ func (f *sharedInformerFactory) InternalInformerFor(obj runtime.Object, newFunc
 	if exists {
 		return informer
 	}
-	informer = newFunc(f.internalClient, f.defaultResync)
-	f.informers[informerType] = informer
-
-	return informer
-}
-
-// VersionedInformerFor returns the SharedIndexInformer for obj using a
-// versioned client.
-func (f *sharedInformerFactory) VersionedInformerFor(obj runtime.Object, newFunc internalinterfaces.NewVersionedInformerFunc) cache.SharedIndexInformer {
-	f.lock.Lock()
-	defer f.lock.Unlock()
-
-	informerType := reflect.TypeOf(obj)
-	informer, exists := f.informers[informerType]
-	if exists {
-		return informer
-	}
-	informer = newFunc(f.versionedClient, f.defaultResync)
+	informer = newFunc(f.client, f.defaultResync)
 	f.informers[informerType] = informer
 
 	return informer

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

+/*
+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 internalversion
+
+import (
+	"fmt"
+	schema "k8s.io/apimachinery/pkg/runtime/schema"
+	cache "k8s.io/client-go/tools/cache"
+	api "k8s.io/kubernetes/pkg/api"
+	apps "k8s.io/kubernetes/pkg/apis/apps"
+	autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling"
+	batch "k8s.io/kubernetes/pkg/apis/batch"
+	certificates "k8s.io/kubernetes/pkg/apis/certificates"
+	extensions "k8s.io/kubernetes/pkg/apis/extensions"
+	policy "k8s.io/kubernetes/pkg/apis/policy"
+	rbac "k8s.io/kubernetes/pkg/apis/rbac"
+	storage "k8s.io/kubernetes/pkg/apis/storage"
+)
+
+// GenericInformer is type of SharedIndexInformer which will locate and delegate to other
+// sharedInformers based on type
+type GenericInformer interface {
+	Informer() cache.SharedIndexInformer
+	Lister() cache.GenericLister
+}
+
+type genericInformer struct {
+	informer cache.SharedIndexInformer
+	resource schema.GroupResource
+}
+
+// Informer returns the SharedIndexInformer.
+func (f *genericInformer) Informer() cache.SharedIndexInformer {
+	return f.informer
+}
+
+// Lister returns the GenericLister.
+func (f *genericInformer) Lister() cache.GenericLister {
+	return cache.NewGenericLister(f.Informer().GetIndexer(), f.resource)
+}
+
+// ForResource gives generic access to a shared informer of the matching type
+// TODO extend this to unknown resources with a client pool
+func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) {
+	switch resource {
+	// Group=Apps, Version=InternalVersion
+	case apps.SchemeGroupVersion.WithResource("statefulsets"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Apps().InternalVersion().StatefulSets().Informer()}, nil
+
+		// 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
+	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
+	case certificates.SchemeGroupVersion.WithResource("certificatesigningrequests"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Certificates().InternalVersion().CertificateSigningRequests().Informer()}, nil
+
+		// 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"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().ConfigMaps().Informer()}, nil
+	case api.SchemeGroupVersion.WithResource("endpoints"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().Endpoints().Informer()}, nil
+	case api.SchemeGroupVersion.WithResource("events"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().Events().Informer()}, nil
+	case api.SchemeGroupVersion.WithResource("limitranges"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().LimitRanges().Informer()}, nil
+	case api.SchemeGroupVersion.WithResource("namespaces"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().Namespaces().Informer()}, nil
+	case api.SchemeGroupVersion.WithResource("nodes"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().Nodes().Informer()}, nil
+	case api.SchemeGroupVersion.WithResource("persistentvolumes"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().PersistentVolumes().Informer()}, nil
+	case api.SchemeGroupVersion.WithResource("persistentvolumeclaims"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().PersistentVolumeClaims().Informer()}, nil
+	case api.SchemeGroupVersion.WithResource("pods"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().Pods().Informer()}, nil
+	case api.SchemeGroupVersion.WithResource("podtemplates"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().PodTemplates().Informer()}, nil
+	case api.SchemeGroupVersion.WithResource("replicationcontrollers"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().ReplicationControllers().Informer()}, nil
+	case api.SchemeGroupVersion.WithResource("resourcequotas"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().ResourceQuotas().Informer()}, nil
+	case api.SchemeGroupVersion.WithResource("secrets"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().Secrets().Informer()}, nil
+	case api.SchemeGroupVersion.WithResource("services"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().Services().Informer()}, nil
+	case api.SchemeGroupVersion.WithResource("serviceaccounts"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Core().InternalVersion().ServiceAccounts().Informer()}, nil
+
+		// 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"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Extensions().InternalVersion().Deployments().Informer()}, nil
+	case extensions.SchemeGroupVersion.WithResource("ingresses"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Extensions().InternalVersion().Ingresses().Informer()}, nil
+	case extensions.SchemeGroupVersion.WithResource("networkpolicies"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Extensions().InternalVersion().NetworkPolicies().Informer()}, nil
+	case extensions.SchemeGroupVersion.WithResource("podsecuritypolicies"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Extensions().InternalVersion().PodSecurityPolicies().Informer()}, nil
+	case extensions.SchemeGroupVersion.WithResource("replicasets"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Extensions().InternalVersion().ReplicaSets().Informer()}, nil
+	case extensions.SchemeGroupVersion.WithResource("thirdpartyresources"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Extensions().InternalVersion().ThirdPartyResources().Informer()}, nil
+
+		// 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
+	case rbac.SchemeGroupVersion.WithResource("clusterroles"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Rbac().InternalVersion().ClusterRoles().Informer()}, nil
+	case rbac.SchemeGroupVersion.WithResource("clusterrolebindings"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Rbac().InternalVersion().ClusterRoleBindings().Informer()}, nil
+	case rbac.SchemeGroupVersion.WithResource("roles"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Rbac().InternalVersion().Roles().Informer()}, nil
+	case rbac.SchemeGroupVersion.WithResource("rolebindings"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Rbac().InternalVersion().RoleBindings().Informer()}, nil
+
+		// Group=Storage, Version=InternalVersion
+	case storage.SchemeGroupVersion.WithResource("storageclasses"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Storage().InternalVersion().StorageClasses().Informer()}, nil
+
+	}
+
+	return nil, fmt.Errorf("no informer found for %v", resource)
+}

pkg/client/informers/informers_generated/internalversion/internalinterfaces/BUILD

+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = ["factory_interfaces.go"],
+    tags = ["automanaged"],
+    deps = [
+        "//pkg/client/clientset_generated/internalclientset:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/runtime",
+        "//vendor:k8s.io/client-go/tools/cache",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [":package-srcs"],
+    tags = ["automanaged"],
+)

pkg/client/informers/informers_generated/internalinterfaces/internal_interfaces.go → pkg/client/informers/informers_generated/internalversion/internalinterfaces/factory_interfaces.go

@@ -21,17 +21,14 @@ package internalinterfaces
 import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	cache "k8s.io/client-go/tools/cache"
-	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	time "time"
 )
 
-type NewInternalInformerFunc func(internalclientset.Interface, time.Duration) cache.SharedIndexInformer
-type NewVersionedInformerFunc func(clientset.Interface, time.Duration) cache.SharedIndexInformer
+type NewInformerFunc func(internalclientset.Interface, time.Duration) cache.SharedIndexInformer
 
 // SharedInformerFactory a small interface to allow for adding an informer without an import cycle
 type SharedInformerFactory interface {
 	Start(stopCh <-chan struct{})
-	InternalInformerFor(obj runtime.Object, newFunc NewInternalInformerFunc) cache.SharedIndexInformer
-	VersionedInformerFor(obj runtime.Object, newFunc NewVersionedInformerFunc) cache.SharedIndexInformer
+	InformerFor(obj runtime.Object, newFunc NewInformerFunc) cache.SharedIndexInformer
 }

pkg/client/informers/informers_generated/internalversion/policy/BUILD

+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = ["interface.go"],
+    tags = ["automanaged"],
+    deps = [
+        "//pkg/client/informers/informers_generated/internalversion/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/policy/internalversion:go_default_library",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [
+        ":package-srcs",
+        "//pkg/client/informers/informers_generated/internalversion/policy/internalversion:all-srcs",
+    ],
+    tags = ["automanaged"],
+)

pkg/client/informers/informers_generated/policy/interface.go → pkg/client/informers/informers_generated/internalversion/policy/interface.go

@@ -19,17 +19,14 @@ limitations under the License.
 package policy
 
 import (
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
-	internalversion "k8s.io/kubernetes/pkg/client/informers/informers_generated/policy/internalversion"
-	v1beta1 "k8s.io/kubernetes/pkg/client/informers/informers_generated/policy/v1beta1"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
+	internalversion "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/policy/internalversion"
 )
 
 // Interface provides access to each of this group's versions.
 type Interface interface {
 	// InternalVersion provides access to shared informers for resources in InternalVersion.
 	InternalVersion() internalversion.Interface
-	// V1beta1 provides access to shared informers for resources in V1beta1.
-	V1beta1() v1beta1.Interface
 }
 
 type group struct {
@@ -45,8 +42,3 @@ func New(f internalinterfaces.SharedInformerFactory) Interface {
 func (g *group) InternalVersion() internalversion.Interface {
 	return internalversion.New(g.SharedInformerFactory)
 }
-
-// V1beta1 returns a new v1beta1.Interface.
-func (g *group) V1beta1() v1beta1.Interface {
-	return v1beta1.New(g.SharedInformerFactory)
-}

pkg/client/informers/informers_generated/policy/internalversion/BUILD → pkg/client/informers/informers_generated/internalversion/policy/internalversion/BUILD

@@ -17,7 +17,7 @@ go_library(
     deps = [
         "//pkg/apis/policy:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/internalinterfaces:go_default_library",
         "//pkg/client/listers/policy/internalversion:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/client/informers/informers_generated/policy/internalversion/interface.go → pkg/client/informers/informers_generated/internalversion/policy/internalversion/interface.go

@@ -19,7 +19,7 @@ limitations under the License.
 package internalversion
 
 import (
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.

pkg/client/informers/informers_generated/policy/internalversion/poddisruptionbudget.go → pkg/client/informers/informers_generated/internalversion/policy/internalversion/poddisruptionbudget.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	policy "k8s.io/kubernetes/pkg/apis/policy"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/policy/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newPodDisruptionBudgetInformer(client internalclientset.Interface, resyncPe
 }
 
 func (f *podDisruptionBudgetInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&policy.PodDisruptionBudget{}, newPodDisruptionBudgetInformer)
+	return f.factory.InformerFor(&policy.PodDisruptionBudget{}, newPodDisruptionBudgetInformer)
 }
 
 func (f *podDisruptionBudgetInformer) Lister() internalversion.PodDisruptionBudgetLister {

pkg/client/informers/informers_generated/internalversion/rbac/BUILD

+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = ["interface.go"],
+    tags = ["automanaged"],
+    deps = [
+        "//pkg/client/informers/informers_generated/internalversion/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/rbac/internalversion:go_default_library",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [
+        ":package-srcs",
+        "//pkg/client/informers/informers_generated/internalversion/rbac/internalversion:all-srcs",
+    ],
+    tags = ["automanaged"],
+)

pkg/client/informers/informers_generated/internalversion/rbac/interface.go

+/*
+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 rbac
+
+import (
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
+	internalversion "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/rbac/internalversion"
+)
+
+// Interface provides access to each of this group's versions.
+type Interface interface {
+	// InternalVersion provides access to shared informers for resources in InternalVersion.
+	InternalVersion() internalversion.Interface
+}
+
+type group struct {
+	internalinterfaces.SharedInformerFactory
+}
+
+// New returns a new Interface.
+func New(f internalinterfaces.SharedInformerFactory) Interface {
+	return &group{f}
+}
+
+// InternalVersion returns a new internalversion.Interface.
+func (g *group) InternalVersion() internalversion.Interface {
+	return internalversion.New(g.SharedInformerFactory)
+}

pkg/client/informers/informers_generated/rbac/internalversion/BUILD → pkg/client/informers/informers_generated/internalversion/rbac/internalversion/BUILD

@@ -20,7 +20,7 @@ go_library(
     deps = [
         "//pkg/apis/rbac:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/internalinterfaces:go_default_library",
         "//pkg/client/listers/rbac/internalversion:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/client/informers/informers_generated/rbac/internalversion/clusterrole.go → pkg/client/informers/informers_generated/internalversion/rbac/internalversion/clusterrole.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	rbac "k8s.io/kubernetes/pkg/apis/rbac"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/rbac/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newClusterRoleInformer(client internalclientset.Interface, resyncPeriod tim
 }
 
 func (f *clusterRoleInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&rbac.ClusterRole{}, newClusterRoleInformer)
+	return f.factory.InformerFor(&rbac.ClusterRole{}, newClusterRoleInformer)
 }
 
 func (f *clusterRoleInformer) Lister() internalversion.ClusterRoleLister {

pkg/client/informers/informers_generated/rbac/internalversion/clusterrolebinding.go → pkg/client/informers/informers_generated/internalversion/rbac/internalversion/clusterrolebinding.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	rbac "k8s.io/kubernetes/pkg/apis/rbac"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/rbac/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newClusterRoleBindingInformer(client internalclientset.Interface, resyncPer
 }
 
 func (f *clusterRoleBindingInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&rbac.ClusterRoleBinding{}, newClusterRoleBindingInformer)
+	return f.factory.InformerFor(&rbac.ClusterRoleBinding{}, newClusterRoleBindingInformer)
 }
 
 func (f *clusterRoleBindingInformer) Lister() internalversion.ClusterRoleBindingLister {

pkg/client/informers/informers_generated/rbac/internalversion/interface.go → pkg/client/informers/informers_generated/internalversion/rbac/internalversion/interface.go

@@ -19,7 +19,7 @@ limitations under the License.
 package internalversion
 
 import (
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.

pkg/client/informers/informers_generated/rbac/internalversion/role.go → pkg/client/informers/informers_generated/internalversion/rbac/internalversion/role.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	rbac "k8s.io/kubernetes/pkg/apis/rbac"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/rbac/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newRoleInformer(client internalclientset.Interface, resyncPeriod time.Durat
 }
 
 func (f *roleInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&rbac.Role{}, newRoleInformer)
+	return f.factory.InformerFor(&rbac.Role{}, newRoleInformer)
 }
 
 func (f *roleInformer) Lister() internalversion.RoleLister {

pkg/client/informers/informers_generated/rbac/internalversion/rolebinding.go → pkg/client/informers/informers_generated/internalversion/rbac/internalversion/rolebinding.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	rbac "k8s.io/kubernetes/pkg/apis/rbac"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/rbac/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newRoleBindingInformer(client internalclientset.Interface, resyncPeriod tim
 }
 
 func (f *roleBindingInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&rbac.RoleBinding{}, newRoleBindingInformer)
+	return f.factory.InformerFor(&rbac.RoleBinding{}, newRoleBindingInformer)
 }
 
 func (f *roleBindingInformer) Lister() internalversion.RoleBindingLister {

pkg/client/informers/informers_generated/internalversion/storage/BUILD

+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = ["interface.go"],
+    tags = ["automanaged"],
+    deps = [
+        "//pkg/client/informers/informers_generated/internalversion/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/storage/internalversion:go_default_library",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [
+        ":package-srcs",
+        "//pkg/client/informers/informers_generated/internalversion/storage/internalversion:all-srcs",
+    ],
+    tags = ["automanaged"],
+)

pkg/client/informers/informers_generated/storage/interface.go → pkg/client/informers/informers_generated/internalversion/storage/interface.go

@@ -19,17 +19,14 @@ limitations under the License.
 package storage
 
 import (
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
-	internalversion "k8s.io/kubernetes/pkg/client/informers/informers_generated/storage/internalversion"
-	v1beta1 "k8s.io/kubernetes/pkg/client/informers/informers_generated/storage/v1beta1"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
+	internalversion "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/storage/internalversion"
 )
 
 // Interface provides access to each of this group's versions.
 type Interface interface {
 	// InternalVersion provides access to shared informers for resources in InternalVersion.
 	InternalVersion() internalversion.Interface
-	// V1beta1 provides access to shared informers for resources in V1beta1.
-	V1beta1() v1beta1.Interface
 }
 
 type group struct {
@@ -45,8 +42,3 @@ func New(f internalinterfaces.SharedInformerFactory) Interface {
 func (g *group) InternalVersion() internalversion.Interface {
 	return internalversion.New(g.SharedInformerFactory)
 }
-
-// V1beta1 returns a new v1beta1.Interface.
-func (g *group) V1beta1() v1beta1.Interface {
-	return v1beta1.New(g.SharedInformerFactory)
-}

pkg/client/informers/informers_generated/storage/internalversion/BUILD → pkg/client/informers/informers_generated/internalversion/storage/internalversion/BUILD

@@ -17,7 +17,7 @@ go_library(
     deps = [
         "//pkg/apis/storage:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
-        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalversion/internalinterfaces:go_default_library",
         "//pkg/client/listers/storage/internalversion:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/client/informers/informers_generated/storage/internalversion/interface.go → pkg/client/informers/informers_generated/internalversion/storage/internalversion/interface.go

@@ -19,7 +19,7 @@ limitations under the License.
 package internalversion
 
 import (
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.

pkg/client/informers/informers_generated/storage/internalversion/storageclass.go → pkg/client/informers/informers_generated/internalversion/storage/internalversion/storageclass.go

@@ -25,7 +25,7 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 	storage "k8s.io/kubernetes/pkg/apis/storage"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/storage/internalversion"
 	time "time"
 )
@@ -60,7 +60,7 @@ func newStorageClassInformer(client internalclientset.Interface, resyncPeriod ti
 }
 
 func (f *storageClassInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InternalInformerFor(&storage.StorageClass{}, newStorageClassInformer)
+	return f.factory.InformerFor(&storage.StorageClass{}, newStorageClassInformer)
 }
 
 func (f *storageClassInformer) Lister() internalversion.StorageClassLister {

pkg/controller/certificates/BUILD

@@ -21,7 +21,6 @@ go_library(
     deps = [
         "//pkg/apis/certificates/v1beta1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
-        "//pkg/client/informers/informers_generated/certificates/v1beta1:go_default_library",
         "//pkg/client/listers/certificates/v1beta1:go_default_library",
         "//pkg/controller:go_default_library",
         "//vendor:github.com/cloudflare/cfssl/config",
@@ -70,7 +69,6 @@ go_test(
     deps = [
         "//pkg/apis/certificates/v1beta1:go_default_library",
         "//pkg/client/clientset_generated/clientset/fake:go_default_library",
-        "//pkg/client/informers/informers_generated:go_default_library",
         "//pkg/controller:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/controller/cloud/BUILD

@@ -16,7 +16,6 @@ go_library(
         "//pkg/api:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
-        "//pkg/client/informers/informers_generated/core/v1:go_default_library",
         "//pkg/cloudprovider:go_default_library",
         "//vendor:github.com/golang/glog",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
@@ -38,7 +37,6 @@ go_test(
         "//pkg/api:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/client/clientset_generated/clientset/fake:go_default_library",
-        "//pkg/client/informers/informers_generated:go_default_library",
         "//pkg/cloudprovider:go_default_library",
         "//pkg/cloudprovider/providers/fake:go_default_library",
         "//pkg/controller:go_default_library",

pkg/controller/daemon/BUILD

@@ -21,8 +21,6 @@ go_library(
         "//pkg/apis/extensions/v1beta1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/client/clientset_generated/clientset/typed/extensions/v1beta1:go_default_library",
-        "//pkg/client/informers/informers_generated/core/v1:go_default_library",
-        "//pkg/client/informers/informers_generated/extensions/v1beta1:go_default_library",
         "//pkg/client/listers/core/v1:go_default_library",
         "//pkg/client/listers/extensions/v1beta1:go_default_library",
         "//pkg/controller:go_default_library",
@@ -55,7 +53,6 @@ go_test(
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/extensions/v1beta1:go_default_library",
         "//pkg/client/clientset_generated/clientset/fake:go_default_library",
-        "//pkg/client/informers/informers_generated:go_default_library",
         "//pkg/controller:go_default_library",
         "//pkg/securitycontext:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/api/resource",

pkg/controller/deployment/BUILD

@@ -24,8 +24,6 @@ go_library(
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/extensions/v1beta1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
-        "//pkg/client/informers/informers_generated/core/v1:go_default_library",
-        "//pkg/client/informers/informers_generated/extensions/v1beta1:go_default_library",
         "//pkg/client/listers/core/v1:go_default_library",
         "//pkg/client/listers/extensions/v1beta1:go_default_library",
         "//pkg/controller:go_default_library",
@@ -65,7 +63,6 @@ go_test(
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/extensions/v1beta1:go_default_library",
         "//pkg/client/clientset_generated/clientset/fake:go_default_library",
-        "//pkg/client/informers/informers_generated:go_default_library",
         "//pkg/controller:go_default_library",
         "//pkg/controller/deployment/util:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",

pkg/controller/disruption/BUILD

@@ -18,10 +18,6 @@ go_library(
         "//pkg/apis/policy/v1beta1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/client/clientset_generated/clientset/typed/policy/v1beta1:go_default_library",
-        "//pkg/client/informers/informers_generated/apps/v1beta1:go_default_library",
-        "//pkg/client/informers/informers_generated/core/v1:go_default_library",
-        "//pkg/client/informers/informers_generated/extensions/v1beta1:go_default_library",
-        "//pkg/client/informers/informers_generated/policy/v1beta1:go_default_library",
         "//pkg/client/listers/apps/v1beta1:go_default_library",
         "//pkg/client/listers/core/v1:go_default_library",
         "//pkg/client/listers/extensions/v1beta1:go_default_library",
@@ -53,7 +49,6 @@ go_test(
         "//pkg/apis/apps/v1beta1:go_default_library",
         "//pkg/apis/extensions/v1beta1:go_default_library",
         "//pkg/apis/policy/v1beta1:go_default_library",
-        "//pkg/client/informers/informers_generated:go_default_library",
         "//pkg/controller:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/util/intstr",

pkg/controller/endpoint/BUILD

@@ -20,7 +20,6 @@ go_library(
         "//pkg/api/v1/endpoints:go_default_library",
         "//pkg/api/v1/pod:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
-        "//pkg/client/informers/informers_generated/core/v1:go_default_library",
         "//pkg/client/listers/core/v1:go_default_library",
         "//pkg/util/metrics:go_default_library",
         "//vendor:github.com/golang/glog",
@@ -46,7 +45,6 @@ go_test(
         "//pkg/api/v1:go_default_library",
         "//pkg/api/v1/endpoints:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
-        "//pkg/client/informers/informers_generated:go_default_library",
         "//pkg/controller:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/controller/job/BUILD

@@ -21,8 +21,6 @@ go_library(
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/batch/v1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
-        "//pkg/client/informers/informers_generated/batch/v1:go_default_library",
-        "//pkg/client/informers/informers_generated/core/v1:go_default_library",
         "//pkg/client/listers/batch/v1:go_default_library",
         "//pkg/client/listers/core/v1:go_default_library",
         "//pkg/controller:go_default_library",
@@ -54,7 +52,6 @@ go_test(
         "//pkg/apis/batch/v1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/client/clientset_generated/clientset/fake:go_default_library",
-        "//pkg/client/informers/informers_generated:go_default_library",
         "//pkg/controller:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",

pkg/controller/node/BUILD

@@ -26,8 +26,6 @@ go_library(
         "//pkg/api:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
-        "//pkg/client/informers/informers_generated/core/v1:go_default_library",
-        "//pkg/client/informers/informers_generated/extensions/v1beta1:go_default_library",
         "//pkg/client/listers/core/v1:go_default_library",
         "//pkg/client/listers/extensions/v1beta1:go_default_library",
         "//pkg/cloudprovider:go_default_library",
@@ -75,9 +73,6 @@ go_test(
         "//pkg/apis/extensions/v1beta1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/client/clientset_generated/clientset/fake:go_default_library",
-        "//pkg/client/informers/informers_generated:go_default_library",
-        "//pkg/client/informers/informers_generated/core/v1:go_default_library",
-        "//pkg/client/informers/informers_generated/extensions/v1beta1:go_default_library",
         "//pkg/cloudprovider:go_default_library",
         "//pkg/cloudprovider/providers/fake:go_default_library",
         "//pkg/controller:go_default_library",

pkg/controller/podautoscaler/BUILD

@@ -24,7 +24,6 @@ go_library(
         "//pkg/client/clientset_generated/clientset/typed/autoscaling/v1:go_default_library",
         "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library",
         "//pkg/client/clientset_generated/clientset/typed/extensions/v1beta1:go_default_library",
-        "//pkg/client/informers/informers_generated/autoscaling/v1:go_default_library",
         "//pkg/client/listers/autoscaling/v1:go_default_library",
         "//pkg/controller/podautoscaler/metrics:go_default_library",
         "//vendor:github.com/golang/glog",
@@ -56,7 +55,6 @@ go_test(
         "//pkg/apis/extensions/install:go_default_library",
         "//pkg/apis/extensions/v1beta1:go_default_library",
         "//pkg/client/clientset_generated/clientset/fake:go_default_library",
-        "//pkg/client/informers/informers_generated:go_default_library",
         "//pkg/controller:go_default_library",
         "//pkg/controller/podautoscaler/metrics:go_default_library",
         "//vendor:github.com/stretchr/testify/assert",

pkg/controller/podgc/BUILD

@@ -18,7 +18,6 @@ go_library(
     deps = [
         "//pkg/api/v1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
-        "//pkg/client/informers/informers_generated/core/v1:go_default_library",
         "//pkg/client/listers/core/v1:go_default_library",
         "//pkg/util/metrics:go_default_library",
         "//vendor:github.com/golang/glog",
@@ -40,8 +39,6 @@ go_test(
         "//pkg/api/v1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/client/clientset_generated/clientset/fake:go_default_library",
-        "//pkg/client/informers/informers_generated:go_default_library",
-        "//pkg/client/informers/informers_generated/core/v1:go_default_library",
         "//pkg/controller:go_default_library",
         "//pkg/controller/node/testutil:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",

pkg/controller/replicaset/BUILD

@@ -22,8 +22,6 @@ go_library(
         "//pkg/apis/extensions/v1beta1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/client/clientset_generated/clientset/typed/extensions/v1beta1:go_default_library",
-        "//pkg/client/informers/informers_generated/core/v1:go_default_library",
-        "//pkg/client/informers/informers_generated/extensions/v1beta1:go_default_library",
         "//pkg/client/listers/core/v1:go_default_library",
         "//pkg/client/listers/extensions/v1beta1:go_default_library",
         "//pkg/controller:go_default_library",
@@ -56,7 +54,6 @@ go_test(
         "//pkg/apis/extensions/v1beta1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/client/clientset_generated/clientset/fake:go_default_library",
-        "//pkg/client/informers/informers_generated:go_default_library",
         "//pkg/controller:go_default_library",
         "//pkg/securitycontext:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/api/equality",

pkg/controller/replication/BUILD

@@ -21,7 +21,6 @@ go_library(
         "//pkg/api/v1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library",
-        "//pkg/client/informers/informers_generated/core/v1:go_default_library",
         "//pkg/client/listers/core/v1:go_default_library",
         "//pkg/controller:go_default_library",
         "//pkg/util/metrics:go_default_library",
@@ -53,8 +52,6 @@ go_test(
         "//pkg/api/v1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/client/clientset_generated/clientset/fake:go_default_library",
-        "//pkg/client/informers/informers_generated:go_default_library",
-        "//pkg/client/informers/informers_generated/core/v1:go_default_library",
         "//pkg/controller:go_default_library",
         "//pkg/securitycontext:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/api/equality",

pkg/controller/ttl/BUILD

@@ -16,7 +16,6 @@ go_library(
         "//pkg/api:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
-        "//pkg/client/informers/informers_generated/core/v1:go_default_library",
         "//pkg/client/listers/core/v1:go_default_library",
         "//pkg/controller:go_default_library",
         "//vendor:github.com/golang/glog",

pkg/controller/volume/attachdetach/BUILD

@@ -16,7 +16,6 @@ go_library(
         "//pkg/api:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
-        "//pkg/client/informers/informers_generated/core/v1:go_default_library",
         "//pkg/client/listers/core/v1:go_default_library",
         "//pkg/cloudprovider:go_default_library",
         "//pkg/controller/volume/attachdetach/cache:go_default_library",
@@ -44,7 +43,6 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
-        "//pkg/client/informers/informers_generated:go_default_library",
         "//pkg/controller:go_default_library",
         "//pkg/controller/volume/attachdetach/testing:go_default_library",
     ],

pkg/controller/volume/attachdetach/reconciler/BUILD

@@ -30,7 +30,6 @@ go_test(
     tags = ["automanaged"],
     deps = [
         "//pkg/api/v1:go_default_library",
-        "//pkg/client/informers/informers_generated:go_default_library",
         "//pkg/controller:go_default_library",
         "//pkg/controller/volume/attachdetach/cache:go_default_library",
         "//pkg/controller/volume/attachdetach/statusupdater:go_default_library",

test/integration/framework/BUILD

@@ -30,7 +30,6 @@ go_library(
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
-        "//pkg/client/informers/informers_generated:go_default_library",
         "//pkg/controller:go_default_library",
         "//pkg/controller/replication:go_default_library",
         "//pkg/generated/openapi:go_default_library",