regenerate informers

cmd/kubernetes-discovery/BUILD

@@ -18,6 +18,8 @@ go_binary(
         "//cmd/kubernetes-discovery/pkg/apis/apiregistration/install:go_default_library",
         "//cmd/kubernetes-discovery/pkg/apis/apiregistration/validation:go_default_library",
         "//cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset:go_default_library",
+        "//cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion:go_default_library",
+        "//cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1:go_default_library",
         "//cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion:go_default_library",
         "//cmd/kubernetes-discovery/pkg/client/listers/apiregistration/v1alpha1:go_default_library",
         "//cmd/kubernetes-discovery/pkg/cmd/server:go_default_library",

cmd/kubernetes-discovery/hack/update-codegen.sh

@@ -26,6 +26,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
 function cleanup {
   rm -f "${CLIENTGEN:-}"
   rm -f "${listergen:-}"
+  rm -f "${informergen:-}"
 }
 trap cleanup EXIT
 
@@ -55,15 +56,14 @@ LISTER_PATH="--output-package k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/cli
 ${listergen} ${LISTER_INPUT} ${LISTER_PATH}
 
 
-# TODO generated code has the wrong internal package name
-# echo "Building informer-gen"
-# informergen="${PWD}/informer-gen"
-# go build -o "${informergen}" ./cmd/libs/go2idl/informer-gen
+echo "Building informer-gen"
+informergen="${PWD}/informer-gen"
+go build -o "${informergen}" ./cmd/libs/go2idl/informer-gen
 
-# ${informergen} \
-#   --input-dirs k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration --input-dirs k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1 \
-#   --versioned-clientset-package k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5 \
-#   --internal-clientset-package k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset \
-#   --listers-package k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers \
-#   --output-package k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers
-#   "$@"
+${informergen} \
+  --input-dirs k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration --input-dirs k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1 \
+  --versioned-clientset-package k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5 \
+  --internal-clientset-package k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset \
+  --listers-package k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers \
+  --output-package k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers
+  "$@"

cmd/kubernetes-discovery/main.go

@@ -28,6 +28,8 @@ import (
 	_ "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/install"
 	_ "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/validation"
 	_ "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset"
+	_ "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion"
+	_ "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1"
 	_ "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion"
 	_ "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers/apiregistration/v1alpha1"
 )

cmd/kubernetes-discovery/pkg/apiserver/BUILD

@@ -15,6 +15,10 @@ go_library(
     srcs = ["apiserver.go"],
     tags = ["automanaged"],
     deps = [
+        "//cmd/kubernetes-discovery/pkg/apis/apiregistration:go_default_library",
+        "//cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1:go_default_library",
+        "//cmd/kubernetes-discovery/pkg/registry/apiservice:go_default_library",
+        "//pkg/api/rest:go_default_library",
         "//pkg/genericapiserver:go_default_library",
         "//pkg/registry/generic:go_default_library",
         "//pkg/runtime/schema:go_default_library",

cmd/kubernetes-discovery/pkg/client/informers/BUILD

+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_binary",
+    "go_library",
+    "go_test",
+    "cgo_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "factory.go",
+        "generic.go",
+    ],
+    tags = ["automanaged"],
+    deps = [
+        "//cmd/kubernetes-discovery/pkg/apis/apiregistration:go_default_library",
+        "//cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1:go_default_library",
+        "//cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset:go_default_library",
+        "//cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5:go_default_library",
+        "//cmd/kubernetes-discovery/pkg/client/informers/apiregistration:go_default_library",
+        "//cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces:go_default_library",
+        "//pkg/client/cache:go_default_library",
+        "//pkg/runtime:go_default_library",
+        "//pkg/runtime/schema:go_default_library",
+    ],
+)

cmd/kubernetes-discovery/pkg/client/informers/apiregistration/BUILD

+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_binary",
+    "go_library",
+    "go_test",
+    "cgo_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = ["interface.go"],
+    tags = ["automanaged"],
+    deps = [
+        "//cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion:go_default_library",
+        "//cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1:go_default_library",
+        "//cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces:go_default_library",
+    ],
+)

cmd/kubernetes-discovery/pkg/client/informers/apiregistration/interface.go

+/*
+Copyright 2016 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 with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1] --internal-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers --output-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers --versioned-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5
+
+package apiregistration
+
+import (
+	internalversion "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion"
+	v1alpha1 "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1"
+	internalinterfaces "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers/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 {
+	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)
+}
+
+// V1alpha1 returns a new v1alpha1.Interface.
+func (g *group) V1alpha1() v1alpha1.Interface {
+	return v1alpha1.New(g.SharedInformerFactory)
+}

cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion/BUILD

+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_binary",
+    "go_library",
+    "go_test",
+    "cgo_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "apiservice.go",
+        "interface.go",
+    ],
+    tags = ["automanaged"],
+    deps = [
+        "//cmd/kubernetes-discovery/pkg/apis/apiregistration:go_default_library",
+        "//cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset:go_default_library",
+        "//cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces:go_default_library",
+        "//cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion:go_default_library",
+        "//pkg/api:go_default_library",
+        "//pkg/api/v1:go_default_library",
+        "//pkg/client/cache:go_default_library",
+        "//pkg/runtime:go_default_library",
+        "//pkg/watch:go_default_library",
+    ],
+)

cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion/apiservice.go

+/*
+Copyright 2016 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 with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1] --internal-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers --output-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers --versioned-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5
+
+package internalversion
+
+import (
+	apiregistration "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration"
+	internalclientset "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset"
+	internalinterfaces "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces"
+	internalversion "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion"
+	api "k8s.io/kubernetes/pkg/api"
+	v1 "k8s.io/kubernetes/pkg/api/v1"
+	cache "k8s.io/kubernetes/pkg/client/cache"
+	runtime "k8s.io/kubernetes/pkg/runtime"
+	watch "k8s.io/kubernetes/pkg/watch"
+	time "time"
+)
+
+// APIServiceInformer provides access to a shared informer and lister for
+// APIServices.
+type APIServiceInformer interface {
+	Informer() cache.SharedIndexInformer
+	Lister() internalversion.APIServiceLister
+}
+
+type aPIServiceInformer struct {
+	factory internalinterfaces.SharedInformerFactory
+}
+
+func newAPIServiceInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
+	sharedIndexInformer := cache.NewSharedIndexInformer(
+		&cache.ListWatch{
+			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
+				var internalOptions api.ListOptions
+				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
+					return nil, err
+				}
+				return client.Apiregistration().APIServices().List(internalOptions)
+			},
+			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
+				var internalOptions api.ListOptions
+				if err := api.Scheme.Convert(&options, &internalOptions, nil); err != nil {
+					return nil, err
+				}
+				return client.Apiregistration().APIServices().Watch(internalOptions)
+			},
+		},
+		&apiregistration.APIService{},
+		resyncPeriod,
+		cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc},
+	)
+
+	return sharedIndexInformer
+}
+
+func (f *aPIServiceInformer) Informer() cache.SharedIndexInformer {
+	return f.factory.InternalInformerFor(&apiregistration.APIService{}, newAPIServiceInformer)
+}
+
+func (f *aPIServiceInformer) Lister() internalversion.APIServiceLister {
+	return internalversion.NewAPIServiceLister(f.Informer().GetIndexer())
+}

cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion/interface.go

+/*
+Copyright 2016 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 with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1] --internal-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers --output-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers --versioned-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5
+
+package internalversion
+
+import (
+	internalinterfaces "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces"
+)
+
+// Interface provides access to all the informers in this group version.
+type Interface interface {
+	// APIServices returns a APIServiceInformer.
+	APIServices() APIServiceInformer
+}
+
+type version struct {
+	internalinterfaces.SharedInformerFactory
+}
+
+// New returns a new Interface.
+func New(f internalinterfaces.SharedInformerFactory) Interface {
+	return &version{f}
+}
+
+// APIServices returns a APIServiceInformer.
+func (v *version) APIServices() APIServiceInformer {
+	return &aPIServiceInformer{factory: v.SharedInformerFactory}
+}

cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1/BUILD

+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_binary",
+    "go_library",
+    "go_test",
+    "cgo_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "apiservice.go",
+        "interface.go",
+    ],
+    tags = ["automanaged"],
+    deps = [
+        "//cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1:go_default_library",
+        "//cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5:go_default_library",
+        "//cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces:go_default_library",
+        "//cmd/kubernetes-discovery/pkg/client/listers/apiregistration/v1alpha1:go_default_library",
+        "//pkg/api/v1:go_default_library",
+        "//pkg/client/cache:go_default_library",
+        "//pkg/runtime:go_default_library",
+        "//pkg/watch:go_default_library",
+    ],
+)

cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1/apiservice.go

+/*
+Copyright 2016 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 with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1] --internal-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers --output-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers --versioned-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5
+
+package v1alpha1
+
+import (
+	apiregistration_v1alpha1 "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1"
+	release_1_5 "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5"
+	internalinterfaces "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces"
+	v1alpha1 "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers/apiregistration/v1alpha1"
+	v1 "k8s.io/kubernetes/pkg/api/v1"
+	cache "k8s.io/kubernetes/pkg/client/cache"
+	runtime "k8s.io/kubernetes/pkg/runtime"
+	watch "k8s.io/kubernetes/pkg/watch"
+	time "time"
+)
+
+// APIServiceInformer provides access to a shared informer and lister for
+// APIServices.
+type APIServiceInformer interface {
+	Informer() cache.SharedIndexInformer
+	Lister() v1alpha1.APIServiceLister
+}
+
+type aPIServiceInformer struct {
+	factory internalinterfaces.SharedInformerFactory
+}
+
+func newAPIServiceInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
+	sharedIndexInformer := cache.NewSharedIndexInformer(
+		&cache.ListWatch{
+			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
+				return client.ApiregistrationV1alpha1().APIServices().List(options)
+			},
+			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
+				return client.ApiregistrationV1alpha1().APIServices().Watch(options)
+			},
+		},
+		&apiregistration_v1alpha1.APIService{},
+		resyncPeriod,
+		cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc},
+	)
+
+	return sharedIndexInformer
+}
+
+func (f *aPIServiceInformer) Informer() cache.SharedIndexInformer {
+	return f.factory.VersionedInformerFor(&apiregistration_v1alpha1.APIService{}, newAPIServiceInformer)
+}
+
+func (f *aPIServiceInformer) Lister() v1alpha1.APIServiceLister {
+	return v1alpha1.NewAPIServiceLister(f.Informer().GetIndexer())
+}

cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1/interface.go

+/*
+Copyright 2016 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 with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1] --internal-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers --output-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers --versioned-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5
+
+package v1alpha1
+
+import (
+	internalinterfaces "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces"
+)
+
+// Interface provides access to all the informers in this group version.
+type Interface interface {
+	// APIServices returns a APIServiceInformer.
+	APIServices() APIServiceInformer
+}
+
+type version struct {
+	internalinterfaces.SharedInformerFactory
+}
+
+// New returns a new Interface.
+func New(f internalinterfaces.SharedInformerFactory) Interface {
+	return &version{f}
+}
+
+// APIServices returns a APIServiceInformer.
+func (v *version) APIServices() APIServiceInformer {
+	return &aPIServiceInformer{factory: v.SharedInformerFactory}
+}

cmd/kubernetes-discovery/pkg/client/informers/factory.go

+/*
+Copyright 2016 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 with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1] --internal-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers --output-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers --versioned-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5
+
+package informers
+
+import (
+	internalclientset "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset"
+	release_1_5 "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5"
+	apiregistration "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers/apiregistration"
+	internalinterfaces "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces"
+	cache "k8s.io/kubernetes/pkg/client/cache"
+	runtime "k8s.io/kubernetes/pkg/runtime"
+	reflect "reflect"
+	sync "sync"
+	time "time"
+)
+
+type sharedInformerFactory struct {
+	internalClient  internalclientset.Interface
+	versionedClient release_1_5.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(internalClient internalclientset.Interface, versionedClient release_1_5.Interface, defaultResync time.Duration) SharedInformerFactory {
+	return &sharedInformerFactory{
+		internalClient:   internalClient,
+		versionedClient:  versionedClient,
+		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) InternalInformerFor(obj runtime.Object, newFunc internalinterfaces.NewInternalInformerFunc) 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.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)
+	f.informers[informerType] = informer
+
+	return informer
+}
+
+// SharedInformerFactory provides shared informers for resources in all known
+// API group versions.
+type SharedInformerFactory interface {
+	internalinterfaces.SharedInformerFactory
+
+	Apiregistration() apiregistration.Interface
+}
+
+func (f *sharedInformerFactory) Apiregistration() apiregistration.Interface {
+	return apiregistration.New(f)
+}

cmd/kubernetes-discovery/pkg/client/informers/generic.go

+/*
+Copyright 2016 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 with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1] --internal-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers --output-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers --versioned-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5
+
+package informers
+
+import (
+	"fmt"
+	apiregistration "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration"
+	v1alpha1 "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1"
+	cache "k8s.io/kubernetes/pkg/client/cache"
+	schema "k8s.io/kubernetes/pkg/runtime/schema"
+)
+
+// 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=InternalVersion
+	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/kubernetes-discovery/pkg/client/informers/internalinterfaces/BUILD

+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_binary",
+    "go_library",
+    "go_test",
+    "cgo_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = ["internal_interfaces.go"],
+    tags = ["automanaged"],
+    deps = [
+        "//cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset:go_default_library",
+        "//cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5:go_default_library",
+        "//pkg/client/cache:go_default_library",
+        "//pkg/runtime:go_default_library",
+    ],
+)

cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces/internal_interfaces.go

+/*
+Copyright 2016 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 with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1] --internal-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers --output-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers --versioned-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5
+
+package internalinterfaces
+
+import (
+	internalclientset "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset"
+	release_1_5 "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5"
+	cache "k8s.io/kubernetes/pkg/client/cache"
+	runtime "k8s.io/kubernetes/pkg/runtime"
+	time "time"
+)
+
+type NewInternalInformerFunc func(internalclientset.Interface, time.Duration) cache.SharedIndexInformer
+type NewVersionedInformerFunc func(release_1_5.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
+}

cmd/kubernetes-discovery/pkg/cmd/server/BUILD

@@ -15,10 +15,10 @@ go_library(
     srcs = ["start.go"],
     tags = ["automanaged"],
     deps = [
+        "//cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1:go_default_library",
         "//cmd/kubernetes-discovery/pkg/apiserver:go_default_library",
         "//cmd/kubernetes-discovery/pkg/legacy:go_default_library",
         "//pkg/api:go_default_library",
-        "//pkg/apimachinery/registered:go_default_library",
         "//pkg/genericapiserver:go_default_library",
         "//pkg/genericapiserver/options:go_default_library",
         "//pkg/kubectl/cmd/util:go_default_library",

cmd/kubernetes-discovery/pkg/registry/apiservice/BUILD

+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_binary",
+    "go_library",
+    "go_test",
+    "cgo_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "etcd.go",
+        "strategy.go",
+    ],
+    tags = ["automanaged"],
+    deps = [
+        "//cmd/kubernetes-discovery/pkg/apis/apiregistration:go_default_library",
+        "//cmd/kubernetes-discovery/pkg/apis/apiregistration/validation:go_default_library",
+        "//pkg/api:go_default_library",
+        "//pkg/fields:go_default_library",
+        "//pkg/labels:go_default_library",
+        "//pkg/registry/generic:go_default_library",
+        "//pkg/registry/generic/registry:go_default_library",
+        "//pkg/runtime:go_default_library",
+        "//pkg/storage:go_default_library",
+        "//pkg/util/validation/field:go_default_library",
+    ],
+)

cmd/libs/go2idl/informer-gen/generators/BUILD

@@ -15,6 +15,7 @@ go_library(
     srcs = [
         "customargs.go",
         "factory.go",
+        "factoryinterface.go",
         "generic.go",
         "groupinterface.go",
         "informer.go",

hack/.linted_packages

@@ -23,6 +23,10 @@ cmd/kubectl
 cmd/kubelet
 cmd/kubernetes-discovery
 cmd/kubernetes-discovery/pkg/apis/apiregistration/install
+cmd/kubernetes-discovery/pkg/client/informers
+cmd/kubernetes-discovery/pkg/client/informers/apiregistration
+cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion
+cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1
 cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion
 cmd/kubernetes-discovery/pkg/client/listers/apiregistration/v1alpha1
 cmd/libs/go2idl/client-gen

pkg/client/informers/informers_generated/BUILD

@@ -46,10 +46,10 @@ go_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/interfaces:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/runtime/schema:go_default_library",
     ],

pkg/client/informers/informers_generated/apps/BUILD

@@ -17,6 +17,6 @@ go_library(
     deps = [
         "//pkg/client/informers/informers_generated/apps/internalversion:go_default_library",
         "//pkg/client/informers/informers_generated/apps/v1beta1:go_default_library",
-        "//pkg/client/informers/interfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
     ],
 )

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

@@ -21,7 +21,7 @@ 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"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 )
 
 // Interface provides access to each of this group's versions.
@@ -33,11 +33,11 @@ type Interface interface {
 }
 
 type group struct {
-	interfaces.SharedInformerFactory
+	internalinterfaces.SharedInformerFactory
 }
 
 // New returns a new Interface.
-func New(f interfaces.SharedInformerFactory) Interface {
+func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &group{f}
 }
 

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

@@ -23,7 +23,7 @@ go_library(
         "//pkg/apis/apps:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
-        "//pkg/client/informers/interfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/apps/internalversion:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/watch:go_default_library",

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

@@ -19,7 +19,7 @@ limitations under the License.
 package internalversion
 
 import (
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.
@@ -29,11 +29,11 @@ type Interface interface {
 }
 
 type version struct {
-	interfaces.SharedInformerFactory
+	internalinterfaces.SharedInformerFactory
 }
 
 // New returns a new Interface.
-func New(f interfaces.SharedInformerFactory) Interface {
+func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &version{f}
 }
 

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

@@ -24,7 +24,7 @@ import (
 	apps "k8s.io/kubernetes/pkg/apis/apps"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/apps/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -39,7 +39,7 @@ type StatefulSetInformer interface {
 }
 
 type statefulSetInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newStatefulSetInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -22,7 +22,7 @@ go_library(
         "//pkg/apis/apps/v1beta1:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/release_1_5:go_default_library",
-        "//pkg/client/informers/interfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/apps/v1beta1:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/watch:go_default_library",

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

@@ -19,7 +19,7 @@ limitations under the License.
 package v1beta1
 
 import (
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.
@@ -29,11 +29,11 @@ type Interface interface {
 }
 
 type version struct {
-	interfaces.SharedInformerFactory
+	internalinterfaces.SharedInformerFactory
 }
 
 // New returns a new Interface.
-func New(f interfaces.SharedInformerFactory) Interface {
+func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &version{f}
 }
 

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

@@ -23,7 +23,7 @@ import (
 	apps_v1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1beta1 "k8s.io/kubernetes/pkg/client/listers/apps/v1beta1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type StatefulSetInformer interface {
 }
 
 type statefulSetInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newStatefulSetInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

pkg/client/informers/informers_generated/autoscaling/BUILD

@@ -17,6 +17,6 @@ go_library(
     deps = [
         "//pkg/client/informers/informers_generated/autoscaling/internalversion:go_default_library",
         "//pkg/client/informers/informers_generated/autoscaling/v1:go_default_library",
-        "//pkg/client/informers/interfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
     ],
 )

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

@@ -21,7 +21,7 @@ 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"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 )
 
 // Interface provides access to each of this group's versions.
@@ -33,11 +33,11 @@ type Interface interface {
 }
 
 type group struct {
-	interfaces.SharedInformerFactory
+	internalinterfaces.SharedInformerFactory
 }
 
 // New returns a new Interface.
-func New(f interfaces.SharedInformerFactory) Interface {
+func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &group{f}
 }
 

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

@@ -23,7 +23,7 @@ go_library(
         "//pkg/apis/autoscaling:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
-        "//pkg/client/informers/interfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/autoscaling/internalversion:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/watch:go_default_library",

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

@@ -24,7 +24,7 @@ import (
 	autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/autoscaling/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -39,7 +39,7 @@ type HorizontalPodAutoscalerInformer interface {
 }
 
 type horizontalPodAutoscalerInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newHorizontalPodAutoscalerInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -19,7 +19,7 @@ limitations under the License.
 package internalversion
 
 import (
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.
@@ -29,11 +29,11 @@ type Interface interface {
 }
 
 type version struct {
-	interfaces.SharedInformerFactory
+	internalinterfaces.SharedInformerFactory
 }
 
 // New returns a new Interface.
-func New(f interfaces.SharedInformerFactory) Interface {
+func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &version{f}
 }
 

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

@@ -22,7 +22,7 @@ go_library(
         "//pkg/apis/autoscaling/v1:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/release_1_5:go_default_library",
-        "//pkg/client/informers/interfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/autoscaling/v1:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/watch:go_default_library",

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

@@ -23,7 +23,7 @@ import (
 	autoscaling_v1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/autoscaling/v1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type HorizontalPodAutoscalerInformer interface {
 }
 
 type horizontalPodAutoscalerInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newHorizontalPodAutoscalerInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -19,7 +19,7 @@ limitations under the License.
 package v1
 
 import (
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.
@@ -29,11 +29,11 @@ type Interface interface {
 }
 
 type version struct {
-	interfaces.SharedInformerFactory
+	internalinterfaces.SharedInformerFactory
 }
 
 // New returns a new Interface.
-func New(f interfaces.SharedInformerFactory) Interface {
+func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &version{f}
 }
 

pkg/client/informers/informers_generated/batch/BUILD

@@ -18,6 +18,6 @@ go_library(
         "//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/interfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
     ],
 )

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

@@ -22,7 +22,7 @@ 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"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 )
 
 // Interface provides access to each of this group's versions.
@@ -36,11 +36,11 @@ type Interface interface {
 }
 
 type group struct {
-	interfaces.SharedInformerFactory
+	internalinterfaces.SharedInformerFactory
 }
 
 // New returns a new Interface.
-func New(f interfaces.SharedInformerFactory) Interface {
+func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &group{f}
 }
 

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

@@ -24,7 +24,7 @@ go_library(
         "//pkg/apis/batch:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
-        "//pkg/client/informers/interfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/batch/internalversion:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/watch:go_default_library",

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

@@ -24,7 +24,7 @@ import (
 	batch "k8s.io/kubernetes/pkg/apis/batch"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/batch/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -39,7 +39,7 @@ type CronJobInformer interface {
 }
 
 type cronJobInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newCronJobInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -19,7 +19,7 @@ limitations under the License.
 package internalversion
 
 import (
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.
@@ -31,11 +31,11 @@ type Interface interface {
 }
 
 type version struct {
-	interfaces.SharedInformerFactory
+	internalinterfaces.SharedInformerFactory
 }
 
 // New returns a new Interface.
-func New(f interfaces.SharedInformerFactory) Interface {
+func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &version{f}
 }
 

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

@@ -24,7 +24,7 @@ import (
 	batch "k8s.io/kubernetes/pkg/apis/batch"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/batch/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -39,7 +39,7 @@ type JobInformer interface {
 }
 
 type jobInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newJobInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -22,7 +22,7 @@ go_library(
         "//pkg/apis/batch/v1:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/release_1_5:go_default_library",
-        "//pkg/client/informers/interfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/batch/v1:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/watch:go_default_library",

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

@@ -19,7 +19,7 @@ limitations under the License.
 package v1
 
 import (
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.
@@ -29,11 +29,11 @@ type Interface interface {
 }
 
 type version struct {
-	interfaces.SharedInformerFactory
+	internalinterfaces.SharedInformerFactory
 }
 
 // New returns a new Interface.
-func New(f interfaces.SharedInformerFactory) Interface {
+func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &version{f}
 }
 

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

@@ -23,7 +23,7 @@ import (
 	batch_v1 "k8s.io/kubernetes/pkg/apis/batch/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/batch/v1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type JobInformer interface {
 }
 
 type jobInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newJobInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -23,7 +23,7 @@ go_library(
         "//pkg/apis/batch/v2alpha1:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/release_1_5:go_default_library",
-        "//pkg/client/informers/interfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/batch/v2alpha1:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/watch:go_default_library",

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

@@ -23,7 +23,7 @@ import (
 	batch_v2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v2alpha1 "k8s.io/kubernetes/pkg/client/listers/batch/v2alpha1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type CronJobInformer interface {
 }
 
 type cronJobInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newCronJobInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -19,7 +19,7 @@ limitations under the License.
 package v2alpha1
 
 import (
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.
@@ -31,11 +31,11 @@ type Interface interface {
 }
 
 type version struct {
-	interfaces.SharedInformerFactory
+	internalinterfaces.SharedInformerFactory
 }
 
 // New returns a new Interface.
-func New(f interfaces.SharedInformerFactory) Interface {
+func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &version{f}
 }
 

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

@@ -23,7 +23,7 @@ import (
 	batch_v2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v2alpha1 "k8s.io/kubernetes/pkg/client/listers/batch/v2alpha1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type JobInformer interface {
 }
 
 type jobInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newJobInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

pkg/client/informers/informers_generated/certificates/BUILD

@@ -17,6 +17,6 @@ go_library(
     deps = [
         "//pkg/client/informers/informers_generated/certificates/internalversion:go_default_library",
         "//pkg/client/informers/informers_generated/certificates/v1alpha1:go_default_library",
-        "//pkg/client/informers/interfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
     ],
 )

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

@@ -21,7 +21,7 @@ package certificates
 import (
 	internalversion "k8s.io/kubernetes/pkg/client/informers/informers_generated/certificates/internalversion"
 	v1alpha1 "k8s.io/kubernetes/pkg/client/informers/informers_generated/certificates/v1alpha1"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 )
 
 // Interface provides access to each of this group's versions.
@@ -33,11 +33,11 @@ type Interface interface {
 }
 
 type group struct {
-	interfaces.SharedInformerFactory
+	internalinterfaces.SharedInformerFactory
 }
 
 // New returns a new Interface.
-func New(f interfaces.SharedInformerFactory) Interface {
+func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &group{f}
 }
 

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

@@ -23,7 +23,7 @@ go_library(
         "//pkg/apis/certificates:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
-        "//pkg/client/informers/interfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/certificates/internalversion:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/watch:go_default_library",

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

@@ -24,7 +24,7 @@ import (
 	certificates "k8s.io/kubernetes/pkg/apis/certificates"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/certificates/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -39,7 +39,7 @@ type CertificateSigningRequestInformer interface {
 }
 
 type certificateSigningRequestInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newCertificateSigningRequestInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -19,7 +19,7 @@ limitations under the License.
 package internalversion
 
 import (
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.
@@ -29,11 +29,11 @@ type Interface interface {
 }
 
 type version struct {
-	interfaces.SharedInformerFactory
+	internalinterfaces.SharedInformerFactory
 }
 
 // New returns a new Interface.
-func New(f interfaces.SharedInformerFactory) Interface {
+func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &version{f}
 }
 

pkg/client/informers/informers_generated/certificates/v1alpha1/BUILD

@@ -22,7 +22,7 @@ go_library(
         "//pkg/apis/certificates/v1alpha1:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/release_1_5:go_default_library",
-        "//pkg/client/informers/interfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/certificates/v1alpha1:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/watch:go_default_library",

pkg/client/informers/informers_generated/certificates/v1alpha1/certificatesigningrequest.go

@@ -23,7 +23,7 @@ import (
 	certificates_v1alpha1 "k8s.io/kubernetes/pkg/apis/certificates/v1alpha1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1alpha1 "k8s.io/kubernetes/pkg/client/listers/certificates/v1alpha1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type CertificateSigningRequestInformer interface {
 }
 
 type certificateSigningRequestInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newCertificateSigningRequestInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -19,7 +19,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.
@@ -29,11 +29,11 @@ type Interface interface {
 }
 
 type version struct {
-	interfaces.SharedInformerFactory
+	internalinterfaces.SharedInformerFactory
 }
 
 // New returns a new Interface.
-func New(f interfaces.SharedInformerFactory) Interface {
+func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &version{f}
 }
 

pkg/client/informers/informers_generated/core/BUILD

@@ -17,6 +17,6 @@ go_library(
     deps = [
         "//pkg/client/informers/informers_generated/core/internalversion:go_default_library",
         "//pkg/client/informers/informers_generated/core/v1:go_default_library",
-        "//pkg/client/informers/interfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
     ],
 )

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

@@ -21,7 +21,7 @@ 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"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 )
 
 // Interface provides access to each of this group's versions.
@@ -33,11 +33,11 @@ type Interface interface {
 }
 
 type group struct {
-	interfaces.SharedInformerFactory
+	internalinterfaces.SharedInformerFactory
 }
 
 // New returns a new Interface.
-func New(f interfaces.SharedInformerFactory) Interface {
+func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &group{f}
 }
 

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

@@ -37,7 +37,7 @@ go_library(
         "//pkg/api/v1:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
-        "//pkg/client/informers/interfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/core/internalversion:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/watch:go_default_library",

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

@@ -23,7 +23,7 @@ import (
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type ComponentStatusInformer interface {
 }
 
 type componentStatusInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newComponentStatusInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -23,7 +23,7 @@ import (
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type ConfigMapInformer interface {
 }
 
 type configMapInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newConfigMapInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -23,7 +23,7 @@ import (
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type EndpointsInformer interface {
 }
 
 type endpointsInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newEndpointsInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -23,7 +23,7 @@ import (
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type EventInformer interface {
 }
 
 type eventInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newEventInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -19,7 +19,7 @@ limitations under the License.
 package internalversion
 
 import (
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.
@@ -59,11 +59,11 @@ type Interface interface {
 }
 
 type version struct {
-	interfaces.SharedInformerFactory
+	internalinterfaces.SharedInformerFactory
 }
 
 // New returns a new Interface.
-func New(f interfaces.SharedInformerFactory) Interface {
+func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &version{f}
 }
 

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

@@ -23,7 +23,7 @@ import (
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type LimitRangeInformer interface {
 }
 
 type limitRangeInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newLimitRangeInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -23,7 +23,7 @@ import (
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type NamespaceInformer interface {
 }
 
 type namespaceInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newNamespaceInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -23,7 +23,7 @@ import (
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type NodeInformer interface {
 }
 
 type nodeInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newNodeInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -23,7 +23,7 @@ import (
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type PersistentVolumeInformer interface {
 }
 
 type persistentVolumeInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newPersistentVolumeInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -23,7 +23,7 @@ import (
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type PersistentVolumeClaimInformer interface {
 }
 
 type persistentVolumeClaimInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newPersistentVolumeClaimInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -23,7 +23,7 @@ import (
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type PodInformer interface {
 }
 
 type podInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newPodInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -23,7 +23,7 @@ import (
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type PodTemplateInformer interface {
 }
 
 type podTemplateInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newPodTemplateInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -23,7 +23,7 @@ import (
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type ReplicationControllerInformer interface {
 }
 
 type replicationControllerInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newReplicationControllerInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -23,7 +23,7 @@ import (
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type ResourceQuotaInformer interface {
 }
 
 type resourceQuotaInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newResourceQuotaInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -23,7 +23,7 @@ import (
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type SecretInformer interface {
 }
 
 type secretInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newSecretInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -23,7 +23,7 @@ import (
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type ServiceInformer interface {
 }
 
 type serviceInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newServiceInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -23,7 +23,7 @@ import (
 	v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/core/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type ServiceAccountInformer interface {
 }
 
 type serviceAccountInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newServiceAccountInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -36,7 +36,7 @@ go_library(
         "//pkg/api/v1:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/release_1_5:go_default_library",
-        "//pkg/client/informers/interfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/core/v1:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/watch:go_default_library",

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

@@ -22,7 +22,7 @@ import (
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -37,7 +37,7 @@ type ComponentStatusInformer interface {
 }
 
 type componentStatusInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newComponentStatusInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -22,7 +22,7 @@ import (
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -37,7 +37,7 @@ type ConfigMapInformer interface {
 }
 
 type configMapInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newConfigMapInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -22,7 +22,7 @@ import (
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -37,7 +37,7 @@ type EndpointsInformer interface {
 }
 
 type endpointsInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newEndpointsInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -22,7 +22,7 @@ import (
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -37,7 +37,7 @@ type EventInformer interface {
 }
 
 type eventInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newEventInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -19,7 +19,7 @@ limitations under the License.
 package v1
 
 import (
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.
@@ -59,11 +59,11 @@ type Interface interface {
 }
 
 type version struct {
-	interfaces.SharedInformerFactory
+	internalinterfaces.SharedInformerFactory
 }
 
 // New returns a new Interface.
-func New(f interfaces.SharedInformerFactory) Interface {
+func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &version{f}
 }
 

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

@@ -22,7 +22,7 @@ import (
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -37,7 +37,7 @@ type LimitRangeInformer interface {
 }
 
 type limitRangeInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newLimitRangeInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -22,7 +22,7 @@ import (
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -37,7 +37,7 @@ type NamespaceInformer interface {
 }
 
 type namespaceInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newNamespaceInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -22,7 +22,7 @@ import (
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -37,7 +37,7 @@ type NodeInformer interface {
 }
 
 type nodeInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newNodeInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -22,7 +22,7 @@ import (
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -37,7 +37,7 @@ type PersistentVolumeInformer interface {
 }
 
 type persistentVolumeInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newPersistentVolumeInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -22,7 +22,7 @@ import (
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -37,7 +37,7 @@ type PersistentVolumeClaimInformer interface {
 }
 
 type persistentVolumeClaimInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newPersistentVolumeClaimInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -22,7 +22,7 @@ import (
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -37,7 +37,7 @@ type PodInformer interface {
 }
 
 type podInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newPodInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -22,7 +22,7 @@ import (
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -37,7 +37,7 @@ type PodTemplateInformer interface {
 }
 
 type podTemplateInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newPodTemplateInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -22,7 +22,7 @@ import (
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -37,7 +37,7 @@ type ReplicationControllerInformer interface {
 }
 
 type replicationControllerInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newReplicationControllerInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -22,7 +22,7 @@ import (
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -37,7 +37,7 @@ type ResourceQuotaInformer interface {
 }
 
 type resourceQuotaInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newResourceQuotaInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -22,7 +22,7 @@ import (
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -37,7 +37,7 @@ type SecretInformer interface {
 }
 
 type secretInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newSecretInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -22,7 +22,7 @@ import (
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -37,7 +37,7 @@ type ServiceInformer interface {
 }
 
 type serviceInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newServiceInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -22,7 +22,7 @@ import (
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1 "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -37,7 +37,7 @@ type ServiceAccountInformer interface {
 }
 
 type serviceAccountInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newServiceAccountInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

pkg/client/informers/informers_generated/extensions/BUILD

@@ -17,6 +17,6 @@ go_library(
     deps = [
         "//pkg/client/informers/informers_generated/extensions/internalversion:go_default_library",
         "//pkg/client/informers/informers_generated/extensions/v1beta1:go_default_library",
-        "//pkg/client/informers/interfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
     ],
 )

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

@@ -21,7 +21,7 @@ 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"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 )
 
 // Interface provides access to each of this group's versions.
@@ -33,11 +33,11 @@ type Interface interface {
 }
 
 type group struct {
-	interfaces.SharedInformerFactory
+	internalinterfaces.SharedInformerFactory
 }
 
 // New returns a new Interface.
-func New(f interfaces.SharedInformerFactory) Interface {
+func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &group{f}
 }
 

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

@@ -29,7 +29,7 @@ go_library(
         "//pkg/apis/extensions:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
-        "//pkg/client/informers/interfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/extensions/internalversion:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/watch:go_default_library",

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

@@ -24,7 +24,7 @@ import (
 	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/extensions/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -39,7 +39,7 @@ type DaemonSetInformer interface {
 }
 
 type daemonSetInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newDaemonSetInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -24,7 +24,7 @@ import (
 	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/extensions/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -39,7 +39,7 @@ type DeploymentInformer interface {
 }
 
 type deploymentInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newDeploymentInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -24,7 +24,7 @@ import (
 	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/extensions/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -39,7 +39,7 @@ type IngressInformer interface {
 }
 
 type ingressInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newIngressInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -19,7 +19,7 @@ limitations under the License.
 package internalversion
 
 import (
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.
@@ -41,11 +41,11 @@ type Interface interface {
 }
 
 type version struct {
-	interfaces.SharedInformerFactory
+	internalinterfaces.SharedInformerFactory
 }
 
 // New returns a new Interface.
-func New(f interfaces.SharedInformerFactory) Interface {
+func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &version{f}
 }
 

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

@@ -24,7 +24,7 @@ import (
 	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/extensions/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -39,7 +39,7 @@ type NetworkPolicyInformer interface {
 }
 
 type networkPolicyInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newNetworkPolicyInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -24,7 +24,7 @@ import (
 	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/extensions/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -39,7 +39,7 @@ type PodSecurityPolicyInformer interface {
 }
 
 type podSecurityPolicyInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newPodSecurityPolicyInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -24,7 +24,7 @@ import (
 	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/extensions/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -39,7 +39,7 @@ type ReplicaSetInformer interface {
 }
 
 type replicaSetInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newReplicaSetInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -24,7 +24,7 @@ import (
 	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/extensions/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -39,7 +39,7 @@ type ThirdPartyResourceInformer interface {
 }
 
 type thirdPartyResourceInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newThirdPartyResourceInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -28,7 +28,7 @@ go_library(
         "//pkg/apis/extensions/v1beta1:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/release_1_5:go_default_library",
-        "//pkg/client/informers/interfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/extensions/v1beta1:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/watch:go_default_library",

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

@@ -23,7 +23,7 @@ import (
 	extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1beta1 "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type DaemonSetInformer interface {
 }
 
 type daemonSetInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newDaemonSetInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -23,7 +23,7 @@ import (
 	extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1beta1 "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type DeploymentInformer interface {
 }
 
 type deploymentInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newDeploymentInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -23,7 +23,7 @@ import (
 	extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1beta1 "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type IngressInformer interface {
 }
 
 type ingressInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newIngressInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -19,7 +19,7 @@ limitations under the License.
 package v1beta1
 
 import (
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.
@@ -41,11 +41,11 @@ type Interface interface {
 }
 
 type version struct {
-	interfaces.SharedInformerFactory
+	internalinterfaces.SharedInformerFactory
 }
 
 // New returns a new Interface.
-func New(f interfaces.SharedInformerFactory) Interface {
+func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &version{f}
 }
 

pkg/client/informers/informers_generated/extensions/v1beta1/job.go

@@ -23,7 +23,7 @@ import (
 	extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1beta1 "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type JobInformer interface {
 }
 
 type jobInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newJobInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -23,7 +23,7 @@ import (
 	extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1beta1 "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type PodSecurityPolicyInformer interface {
 }
 
 type podSecurityPolicyInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newPodSecurityPolicyInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -23,7 +23,7 @@ import (
 	extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1beta1 "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type ReplicaSetInformer interface {
 }
 
 type replicaSetInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newReplicaSetInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -23,7 +23,7 @@ import (
 	extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1beta1 "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type ThirdPartyResourceInformer interface {
 }
 
 type thirdPartyResourceInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newThirdPartyResourceInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

pkg/client/informers/informers_generated/factory.go

@@ -28,10 +28,10 @@ import (
 	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"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	reflect "reflect"
 	sync "sync"
@@ -51,7 +51,7 @@ type sharedInformerFactory struct {
 }
 
 // NewSharedInformerFactory constructs a new instance of sharedInformerFactory
-func NewSharedInformerFactory(internalClient internalclientset.Interface, versionedClient release_1_5.Interface, defaultResync time.Duration) interfaces.SharedInformerFactory {
+func NewSharedInformerFactory(internalClient internalclientset.Interface, versionedClient release_1_5.Interface, defaultResync time.Duration) SharedInformerFactory {
 	return &sharedInformerFactory{
 		internalClient:   internalClient,
 		versionedClient:  versionedClient,
@@ -76,7 +76,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 interfaces.NewInternalInformerFunc) cache.SharedIndexInformer {
+func (f *sharedInformerFactory) InternalInformerFor(obj runtime.Object, newFunc internalinterfaces.NewInternalInformerFunc) cache.SharedIndexInformer {
 	f.lock.Lock()
 	defer f.lock.Unlock()
 
@@ -93,7 +93,7 @@ func (f *sharedInformerFactory) InternalInformerFor(obj runtime.Object, newFunc
 
 // VersionedInformerFor returns the SharedIndexInformer for obj using a
 // versioned client.
-func (f *sharedInformerFactory) VersionedInformerFor(obj runtime.Object, newFunc interfaces.NewVersionedInformerFunc) cache.SharedIndexInformer {
+func (f *sharedInformerFactory) VersionedInformerFor(obj runtime.Object, newFunc internalinterfaces.NewVersionedInformerFunc) cache.SharedIndexInformer {
 	f.lock.Lock()
 	defer f.lock.Unlock()
 
@@ -111,7 +111,7 @@ func (f *sharedInformerFactory) VersionedInformerFor(obj runtime.Object, newFunc
 // SharedInformerFactory provides shared informers for resources in all known
 // API group versions.
 type SharedInformerFactory interface {
-	interfaces.SharedInformerFactory
+	internalinterfaces.SharedInformerFactory
 
 	Apps() apps.Interface
 	Autoscaling() autoscaling.Interface

pkg/client/informers/informers_generated/internalinterfaces/BUILD

+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_binary",
+    "go_library",
+    "go_test",
+    "cgo_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = ["internal_interfaces.go"],
+    tags = ["automanaged"],
+    deps = [
+        "//pkg/client/cache:go_default_library",
+        "//pkg/client/clientset_generated/internalclientset:go_default_library",
+        "//pkg/client/clientset_generated/release_1_5:go_default_library",
+        "//pkg/runtime:go_default_library",
+    ],
+)

pkg/client/informers/informers_generated/internalinterfaces/internal_interfaces.go

+/*
+Copyright 2016 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 with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5
+
+package internalinterfaces
+
+import (
+	cache "k8s.io/kubernetes/pkg/client/cache"
+	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
+	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
+	runtime "k8s.io/kubernetes/pkg/runtime"
+	time "time"
+)
+
+type NewInternalInformerFunc func(internalclientset.Interface, time.Duration) cache.SharedIndexInformer
+type NewVersionedInformerFunc func(release_1_5.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
+}

pkg/client/informers/informers_generated/policy/BUILD

@@ -15,8 +15,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/interfaces:go_default_library",
     ],
 )

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

@@ -19,9 +19,9 @@ 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"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
 )
 
 // Interface provides access to each of this group's versions.
@@ -33,11 +33,11 @@ type Interface interface {
 }
 
 type group struct {
-	interfaces.SharedInformerFactory
+	internalinterfaces.SharedInformerFactory
 }
 
 // New returns a new Interface.
-func New(f interfaces.SharedInformerFactory) Interface {
+func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &group{f}
 }
 

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

@@ -23,7 +23,7 @@ go_library(
         "//pkg/apis/policy:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
-        "//pkg/client/informers/interfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/policy/internalversion:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/watch:go_default_library",

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

@@ -19,7 +19,7 @@ limitations under the License.
 package internalversion
 
 import (
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.
@@ -29,11 +29,11 @@ type Interface interface {
 }
 
 type version struct {
-	interfaces.SharedInformerFactory
+	internalinterfaces.SharedInformerFactory
 }
 
 // New returns a new Interface.
-func New(f interfaces.SharedInformerFactory) Interface {
+func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &version{f}
 }
 

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

@@ -24,7 +24,7 @@ import (
 	policy "k8s.io/kubernetes/pkg/apis/policy"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/policy/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -39,7 +39,7 @@ type PodDisruptionBudgetInformer interface {
 }
 
 type podDisruptionBudgetInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newPodDisruptionBudgetInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -22,7 +22,7 @@ go_library(
         "//pkg/apis/policy/v1beta1:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/release_1_5:go_default_library",
-        "//pkg/client/informers/interfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/policy/v1beta1:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/watch:go_default_library",

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

@@ -19,7 +19,7 @@ limitations under the License.
 package v1beta1
 
 import (
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.
@@ -29,11 +29,11 @@ type Interface interface {
 }
 
 type version struct {
-	interfaces.SharedInformerFactory
+	internalinterfaces.SharedInformerFactory
 }
 
 // New returns a new Interface.
-func New(f interfaces.SharedInformerFactory) Interface {
+func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &version{f}
 }
 

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

@@ -23,7 +23,7 @@ import (
 	policy_v1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1beta1 "k8s.io/kubernetes/pkg/client/listers/policy/v1beta1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type PodDisruptionBudgetInformer interface {
 }
 
 type podDisruptionBudgetInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newPodDisruptionBudgetInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

pkg/client/informers/informers_generated/rbac/BUILD

@@ -15,8 +15,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/interfaces:go_default_library",
     ],
 )

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

@@ -19,9 +19,9 @@ 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"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
 )
 
 // Interface provides access to each of this group's versions.
@@ -33,11 +33,11 @@ type Interface interface {
 }
 
 type group struct {
-	interfaces.SharedInformerFactory
+	internalinterfaces.SharedInformerFactory
 }
 
 // New returns a new Interface.
-func New(f interfaces.SharedInformerFactory) Interface {
+func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &group{f}
 }
 

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

@@ -26,7 +26,7 @@ go_library(
         "//pkg/apis/rbac:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
-        "//pkg/client/informers/interfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/rbac/internalversion:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/watch:go_default_library",

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

@@ -24,7 +24,7 @@ import (
 	rbac "k8s.io/kubernetes/pkg/apis/rbac"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/rbac/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -39,7 +39,7 @@ type ClusterRoleInformer interface {
 }
 
 type clusterRoleInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newClusterRoleInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -24,7 +24,7 @@ import (
 	rbac "k8s.io/kubernetes/pkg/apis/rbac"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/rbac/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -39,7 +39,7 @@ type ClusterRoleBindingInformer interface {
 }
 
 type clusterRoleBindingInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newClusterRoleBindingInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -19,7 +19,7 @@ limitations under the License.
 package internalversion
 
 import (
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.
@@ -35,11 +35,11 @@ type Interface interface {
 }
 
 type version struct {
-	interfaces.SharedInformerFactory
+	internalinterfaces.SharedInformerFactory
 }
 
 // New returns a new Interface.
-func New(f interfaces.SharedInformerFactory) Interface {
+func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &version{f}
 }
 

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

@@ -24,7 +24,7 @@ import (
 	rbac "k8s.io/kubernetes/pkg/apis/rbac"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/rbac/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -39,7 +39,7 @@ type RoleInformer interface {
 }
 
 type roleInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newRoleInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -24,7 +24,7 @@ import (
 	rbac "k8s.io/kubernetes/pkg/apis/rbac"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/rbac/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -39,7 +39,7 @@ type RoleBindingInformer interface {
 }
 
 type roleBindingInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newRoleBindingInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -25,7 +25,7 @@ go_library(
         "//pkg/apis/rbac/v1alpha1:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/release_1_5:go_default_library",
-        "//pkg/client/informers/interfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/rbac/v1alpha1:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/watch:go_default_library",

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

@@ -23,7 +23,7 @@ import (
 	rbac_v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1alpha1 "k8s.io/kubernetes/pkg/client/listers/rbac/v1alpha1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type ClusterRoleInformer interface {
 }
 
 type clusterRoleInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newClusterRoleInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -23,7 +23,7 @@ import (
 	rbac_v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1alpha1 "k8s.io/kubernetes/pkg/client/listers/rbac/v1alpha1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type ClusterRoleBindingInformer interface {
 }
 
 type clusterRoleBindingInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newClusterRoleBindingInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -19,7 +19,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.
@@ -35,11 +35,11 @@ type Interface interface {
 }
 
 type version struct {
-	interfaces.SharedInformerFactory
+	internalinterfaces.SharedInformerFactory
 }
 
 // New returns a new Interface.
-func New(f interfaces.SharedInformerFactory) Interface {
+func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &version{f}
 }
 

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

@@ -23,7 +23,7 @@ import (
 	rbac_v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1alpha1 "k8s.io/kubernetes/pkg/client/listers/rbac/v1alpha1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type RoleInformer interface {
 }
 
 type roleInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newRoleInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -23,7 +23,7 @@ import (
 	rbac_v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1alpha1 "k8s.io/kubernetes/pkg/client/listers/rbac/v1alpha1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type RoleBindingInformer interface {
 }
 
 type roleBindingInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newRoleBindingInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

pkg/client/informers/informers_generated/storage/BUILD

@@ -15,8 +15,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/interfaces:go_default_library",
     ],
 )

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

@@ -19,9 +19,9 @@ 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"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
 )
 
 // Interface provides access to each of this group's versions.
@@ -33,11 +33,11 @@ type Interface interface {
 }
 
 type group struct {
-	interfaces.SharedInformerFactory
+	internalinterfaces.SharedInformerFactory
 }
 
 // New returns a new Interface.
-func New(f interfaces.SharedInformerFactory) Interface {
+func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &group{f}
 }
 

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

@@ -23,7 +23,7 @@ go_library(
         "//pkg/apis/storage:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
-        "//pkg/client/informers/interfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/storage/internalversion:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/watch:go_default_library",

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

@@ -19,7 +19,7 @@ limitations under the License.
 package internalversion
 
 import (
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.
@@ -29,11 +29,11 @@ type Interface interface {
 }
 
 type version struct {
-	interfaces.SharedInformerFactory
+	internalinterfaces.SharedInformerFactory
 }
 
 // New returns a new Interface.
-func New(f interfaces.SharedInformerFactory) Interface {
+func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &version{f}
 }
 

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

@@ -24,7 +24,7 @@ import (
 	storage "k8s.io/kubernetes/pkg/apis/storage"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	internalversion "k8s.io/kubernetes/pkg/client/listers/storage/internalversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -39,7 +39,7 @@ type StorageClassInformer interface {
 }
 
 type storageClassInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newStorageClassInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {

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

@@ -22,7 +22,7 @@ go_library(
         "//pkg/apis/storage/v1beta1:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/release_1_5:go_default_library",
-        "//pkg/client/informers/interfaces:go_default_library",
+        "//pkg/client/informers/informers_generated/internalinterfaces:go_default_library",
         "//pkg/client/listers/storage/v1beta1:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/watch:go_default_library",

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

@@ -19,7 +19,7 @@ limitations under the License.
 package v1beta1
 
 import (
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.
@@ -29,11 +29,11 @@ type Interface interface {
 }
 
 type version struct {
-	interfaces.SharedInformerFactory
+	internalinterfaces.SharedInformerFactory
 }
 
 // New returns a new Interface.
-func New(f interfaces.SharedInformerFactory) Interface {
+func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &version{f}
 }
 

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

@@ -23,7 +23,7 @@ import (
 	storage_v1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1"
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	interfaces "k8s.io/kubernetes/pkg/client/informers/interfaces"
+	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces"
 	v1beta1 "k8s.io/kubernetes/pkg/client/listers/storage/v1beta1"
 	runtime "k8s.io/kubernetes/pkg/runtime"
 	watch "k8s.io/kubernetes/pkg/watch"
@@ -38,7 +38,7 @@ type StorageClassInformer interface {
 }
 
 type storageClassInformer struct {
-	factory interfaces.SharedInformerFactory
+	factory internalinterfaces.SharedInformerFactory
 }
 
 func newStorageClassInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {