diff --git a/cmd/kubernetes-discovery/BUILD b/cmd/kubernetes-discovery/BUILD index 29bba2b0bde..10578a886b3 100644 --- a/cmd/kubernetes-discovery/BUILD +++ b/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", diff --git a/cmd/kubernetes-discovery/hack/update-codegen.sh b/cmd/kubernetes-discovery/hack/update-codegen.sh index 8558646735c..6ae3323daaf 100755 --- a/cmd/kubernetes-discovery/hack/update-codegen.sh +++ b/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 + "$@" diff --git a/cmd/kubernetes-discovery/main.go b/cmd/kubernetes-discovery/main.go index 6c39db6fb1e..ed373e0b1e3 100644 --- a/cmd/kubernetes-discovery/main.go +++ b/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" ) diff --git a/cmd/kubernetes-discovery/pkg/apiserver/BUILD b/cmd/kubernetes-discovery/pkg/apiserver/BUILD index 00ad8a80619..c09d4e2a679 100644 --- a/cmd/kubernetes-discovery/pkg/apiserver/BUILD +++ b/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", diff --git a/cmd/kubernetes-discovery/pkg/client/informers/BUILD b/cmd/kubernetes-discovery/pkg/client/informers/BUILD new file mode 100644 index 00000000000..626c4ff1923 --- /dev/null +++ b/cmd/kubernetes-discovery/pkg/client/informers/BUILD @@ -0,0 +1,31 @@ +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", + ], +) diff --git a/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/BUILD b/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/BUILD new file mode 100644 index 00000000000..eee2a5db6f3 --- /dev/null +++ b/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/BUILD @@ -0,0 +1,22 @@ +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", + ], +) diff --git a/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/interface.go b/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/interface.go new file mode 100644 index 00000000000..2bd2a4792fb --- /dev/null +++ b/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/interface.go @@ -0,0 +1,52 @@ +/* +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) +} diff --git a/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion/BUILD b/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion/BUILD new file mode 100644 index 00000000000..d1807718ad0 --- /dev/null +++ b/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion/BUILD @@ -0,0 +1,31 @@ +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", + ], +) diff --git a/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion/apiservice.go b/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion/apiservice.go new file mode 100644 index 00000000000..34c49a6af95 --- /dev/null +++ b/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion/apiservice.go @@ -0,0 +1,77 @@ +/* +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()) +} diff --git a/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion/interface.go b/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion/interface.go new file mode 100644 index 00000000000..294aad245da --- /dev/null +++ b/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion/interface.go @@ -0,0 +1,43 @@ +/* +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} +} diff --git a/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1/BUILD b/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1/BUILD new file mode 100644 index 00000000000..5501f016531 --- /dev/null +++ b/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1/BUILD @@ -0,0 +1,30 @@ +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", + ], +) diff --git a/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1/apiservice.go b/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1/apiservice.go new file mode 100644 index 00000000000..1cd0d560d97 --- /dev/null +++ b/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1/apiservice.go @@ -0,0 +1,68 @@ +/* +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()) +} diff --git a/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1/interface.go b/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1/interface.go new file mode 100644 index 00000000000..894790db028 --- /dev/null +++ b/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1/interface.go @@ -0,0 +1,43 @@ +/* +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} +} diff --git a/cmd/kubernetes-discovery/pkg/client/informers/factory.go b/cmd/kubernetes-discovery/pkg/client/informers/factory.go new file mode 100644 index 00000000000..0c8ebe2297d --- /dev/null +++ b/cmd/kubernetes-discovery/pkg/client/informers/factory.go @@ -0,0 +1,113 @@ +/* +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) +} diff --git a/cmd/kubernetes-discovery/pkg/client/informers/generic.go b/cmd/kubernetes-discovery/pkg/client/informers/generic.go new file mode 100644 index 00000000000..8cbe09edb8f --- /dev/null +++ b/cmd/kubernetes-discovery/pkg/client/informers/generic.go @@ -0,0 +1,66 @@ +/* +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) +} diff --git a/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces/BUILD b/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces/BUILD new file mode 100644 index 00000000000..ce024870ce9 --- /dev/null +++ b/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces/BUILD @@ -0,0 +1,23 @@ +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", + ], +) diff --git a/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces/internal_interfaces.go b/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces/internal_interfaces.go new file mode 100644 index 00000000000..5c2633dcdad --- /dev/null +++ b/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces/internal_interfaces.go @@ -0,0 +1,37 @@ +/* +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 +} diff --git a/cmd/kubernetes-discovery/pkg/cmd/server/BUILD b/cmd/kubernetes-discovery/pkg/cmd/server/BUILD index c9f0d6a8955..49d4dbd49b7 100644 --- a/cmd/kubernetes-discovery/pkg/cmd/server/BUILD +++ b/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", diff --git a/cmd/kubernetes-discovery/pkg/registry/apiservice/BUILD b/cmd/kubernetes-discovery/pkg/registry/apiservice/BUILD new file mode 100644 index 00000000000..1452e833cad --- /dev/null +++ b/cmd/kubernetes-discovery/pkg/registry/apiservice/BUILD @@ -0,0 +1,32 @@ +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", + ], +) diff --git a/cmd/libs/go2idl/informer-gen/generators/BUILD b/cmd/libs/go2idl/informer-gen/generators/BUILD index 345ed88b11d..ad539d64399 100644 --- a/cmd/libs/go2idl/informer-gen/generators/BUILD +++ b/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", diff --git a/hack/.linted_packages b/hack/.linted_packages index 9d53fff8c5c..e3f25cf1277 100644 --- a/hack/.linted_packages +++ b/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 diff --git a/pkg/client/informers/informers_generated/BUILD b/pkg/client/informers/informers_generated/BUILD index e5d68888ffe..1a2f7b17971 100644 --- a/pkg/client/informers/informers_generated/BUILD +++ b/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", ], diff --git a/pkg/client/informers/informers_generated/apps/BUILD b/pkg/client/informers/informers_generated/apps/BUILD index 661040b5784..63dd11b0ee7 100644 --- a/pkg/client/informers/informers_generated/apps/BUILD +++ b/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", ], ) diff --git a/pkg/client/informers/informers_generated/apps/interface.go b/pkg/client/informers/informers_generated/apps/interface.go index ade8b27d224..05f51ecb934 100644 --- a/pkg/client/informers/informers_generated/apps/interface.go +++ b/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} } diff --git a/pkg/client/informers/informers_generated/apps/internalversion/BUILD b/pkg/client/informers/informers_generated/apps/internalversion/BUILD index a60f461f7b0..7f0e6b8ecb1 100644 --- a/pkg/client/informers/informers_generated/apps/internalversion/BUILD +++ b/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", diff --git a/pkg/client/informers/informers_generated/apps/internalversion/interface.go b/pkg/client/informers/informers_generated/apps/internalversion/interface.go index 7d419651dc4..c3d071cdaf3 100644 --- a/pkg/client/informers/informers_generated/apps/internalversion/interface.go +++ b/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} } diff --git a/pkg/client/informers/informers_generated/apps/internalversion/statefulset.go b/pkg/client/informers/informers_generated/apps/internalversion/statefulset.go index 88c7074f978..8b63173a7ef 100644 --- a/pkg/client/informers/informers_generated/apps/internalversion/statefulset.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/apps/v1beta1/BUILD b/pkg/client/informers/informers_generated/apps/v1beta1/BUILD index 921ad77fe6d..f0512fac129 100644 --- a/pkg/client/informers/informers_generated/apps/v1beta1/BUILD +++ b/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", diff --git a/pkg/client/informers/informers_generated/apps/v1beta1/interface.go b/pkg/client/informers/informers_generated/apps/v1beta1/interface.go index bb26f4358a1..38abb9cbabb 100644 --- a/pkg/client/informers/informers_generated/apps/v1beta1/interface.go +++ b/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} } diff --git a/pkg/client/informers/informers_generated/apps/v1beta1/statefulset.go b/pkg/client/informers/informers_generated/apps/v1beta1/statefulset.go index d7ec88fbee1..b73db7cc0d8 100644 --- a/pkg/client/informers/informers_generated/apps/v1beta1/statefulset.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/autoscaling/BUILD b/pkg/client/informers/informers_generated/autoscaling/BUILD index c81bf59aa7a..96926203695 100644 --- a/pkg/client/informers/informers_generated/autoscaling/BUILD +++ b/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", ], ) diff --git a/pkg/client/informers/informers_generated/autoscaling/interface.go b/pkg/client/informers/informers_generated/autoscaling/interface.go index 846b209d214..bb76cca26ba 100644 --- a/pkg/client/informers/informers_generated/autoscaling/interface.go +++ b/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} } diff --git a/pkg/client/informers/informers_generated/autoscaling/internalversion/BUILD b/pkg/client/informers/informers_generated/autoscaling/internalversion/BUILD index 354a809120b..47df7b167e3 100644 --- a/pkg/client/informers/informers_generated/autoscaling/internalversion/BUILD +++ b/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", diff --git a/pkg/client/informers/informers_generated/autoscaling/internalversion/horizontalpodautoscaler.go b/pkg/client/informers/informers_generated/autoscaling/internalversion/horizontalpodautoscaler.go index e84f4544f82..db6a5eabc51 100644 --- a/pkg/client/informers/informers_generated/autoscaling/internalversion/horizontalpodautoscaler.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/autoscaling/internalversion/interface.go b/pkg/client/informers/informers_generated/autoscaling/internalversion/interface.go index 6f1bb37d1fe..c7d8b66cbc9 100644 --- a/pkg/client/informers/informers_generated/autoscaling/internalversion/interface.go +++ b/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} } diff --git a/pkg/client/informers/informers_generated/autoscaling/v1/BUILD b/pkg/client/informers/informers_generated/autoscaling/v1/BUILD index b784d876922..b81a96a52b9 100644 --- a/pkg/client/informers/informers_generated/autoscaling/v1/BUILD +++ b/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", diff --git a/pkg/client/informers/informers_generated/autoscaling/v1/horizontalpodautoscaler.go b/pkg/client/informers/informers_generated/autoscaling/v1/horizontalpodautoscaler.go index 64c9f25d85a..370c783d276 100644 --- a/pkg/client/informers/informers_generated/autoscaling/v1/horizontalpodautoscaler.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/autoscaling/v1/interface.go b/pkg/client/informers/informers_generated/autoscaling/v1/interface.go index a63a69cdb0f..8159cbf9e75 100644 --- a/pkg/client/informers/informers_generated/autoscaling/v1/interface.go +++ b/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} } diff --git a/pkg/client/informers/informers_generated/batch/BUILD b/pkg/client/informers/informers_generated/batch/BUILD index 3d9caa87681..59db51cf89b 100644 --- a/pkg/client/informers/informers_generated/batch/BUILD +++ b/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", ], ) diff --git a/pkg/client/informers/informers_generated/batch/interface.go b/pkg/client/informers/informers_generated/batch/interface.go index 73b45d24621..1be3dbe5239 100644 --- a/pkg/client/informers/informers_generated/batch/interface.go +++ b/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} } diff --git a/pkg/client/informers/informers_generated/batch/internalversion/BUILD b/pkg/client/informers/informers_generated/batch/internalversion/BUILD index 23e204b5f52..30fc18e589b 100644 --- a/pkg/client/informers/informers_generated/batch/internalversion/BUILD +++ b/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", diff --git a/pkg/client/informers/informers_generated/batch/internalversion/cronjob.go b/pkg/client/informers/informers_generated/batch/internalversion/cronjob.go index e1ecb2fe99a..8cb4ca3c917 100644 --- a/pkg/client/informers/informers_generated/batch/internalversion/cronjob.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/batch/internalversion/interface.go b/pkg/client/informers/informers_generated/batch/internalversion/interface.go index b33c63ed842..03f0c953867 100644 --- a/pkg/client/informers/informers_generated/batch/internalversion/interface.go +++ b/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} } diff --git a/pkg/client/informers/informers_generated/batch/internalversion/job.go b/pkg/client/informers/informers_generated/batch/internalversion/job.go index 154ea316ed6..d5bacdf7e4f 100644 --- a/pkg/client/informers/informers_generated/batch/internalversion/job.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/batch/v1/BUILD b/pkg/client/informers/informers_generated/batch/v1/BUILD index 710d68e2e2f..b5f81bfd009 100644 --- a/pkg/client/informers/informers_generated/batch/v1/BUILD +++ b/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", diff --git a/pkg/client/informers/informers_generated/batch/v1/interface.go b/pkg/client/informers/informers_generated/batch/v1/interface.go index fb7ac0483b4..06d321c3acc 100644 --- a/pkg/client/informers/informers_generated/batch/v1/interface.go +++ b/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} } diff --git a/pkg/client/informers/informers_generated/batch/v1/job.go b/pkg/client/informers/informers_generated/batch/v1/job.go index 7a1dbfa61da..2765d16587f 100644 --- a/pkg/client/informers/informers_generated/batch/v1/job.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/batch/v2alpha1/BUILD b/pkg/client/informers/informers_generated/batch/v2alpha1/BUILD index ff80a47ddcd..06080c13971 100644 --- a/pkg/client/informers/informers_generated/batch/v2alpha1/BUILD +++ b/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", diff --git a/pkg/client/informers/informers_generated/batch/v2alpha1/cronjob.go b/pkg/client/informers/informers_generated/batch/v2alpha1/cronjob.go index 6901f606bb7..3702e12023a 100644 --- a/pkg/client/informers/informers_generated/batch/v2alpha1/cronjob.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/batch/v2alpha1/interface.go b/pkg/client/informers/informers_generated/batch/v2alpha1/interface.go index f21a4ca7088..0b1c1c42c45 100644 --- a/pkg/client/informers/informers_generated/batch/v2alpha1/interface.go +++ b/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} } diff --git a/pkg/client/informers/informers_generated/batch/v2alpha1/job.go b/pkg/client/informers/informers_generated/batch/v2alpha1/job.go index 5e8c3466fd0..7e20b134986 100644 --- a/pkg/client/informers/informers_generated/batch/v2alpha1/job.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/certificates/BUILD b/pkg/client/informers/informers_generated/certificates/BUILD index 9b870204eac..a00da620e36 100644 --- a/pkg/client/informers/informers_generated/certificates/BUILD +++ b/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", ], ) diff --git a/pkg/client/informers/informers_generated/certificates/interface.go b/pkg/client/informers/informers_generated/certificates/interface.go index 53758738c30..9d5951272ec 100644 --- a/pkg/client/informers/informers_generated/certificates/interface.go +++ b/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} } diff --git a/pkg/client/informers/informers_generated/certificates/internalversion/BUILD b/pkg/client/informers/informers_generated/certificates/internalversion/BUILD index dd0f69fcb31..8500d20b723 100644 --- a/pkg/client/informers/informers_generated/certificates/internalversion/BUILD +++ b/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", diff --git a/pkg/client/informers/informers_generated/certificates/internalversion/certificatesigningrequest.go b/pkg/client/informers/informers_generated/certificates/internalversion/certificatesigningrequest.go index ae4640106e1..a005c28ab5a 100644 --- a/pkg/client/informers/informers_generated/certificates/internalversion/certificatesigningrequest.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/certificates/internalversion/interface.go b/pkg/client/informers/informers_generated/certificates/internalversion/interface.go index 60a4d8350ab..bf2fe7d0622 100644 --- a/pkg/client/informers/informers_generated/certificates/internalversion/interface.go +++ b/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} } diff --git a/pkg/client/informers/informers_generated/certificates/v1alpha1/BUILD b/pkg/client/informers/informers_generated/certificates/v1alpha1/BUILD index 3f3b8568458..1ad7099fb85 100644 --- a/pkg/client/informers/informers_generated/certificates/v1alpha1/BUILD +++ b/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", diff --git a/pkg/client/informers/informers_generated/certificates/v1alpha1/certificatesigningrequest.go b/pkg/client/informers/informers_generated/certificates/v1alpha1/certificatesigningrequest.go index 61a6111dc68..d1d9e97f3e9 100644 --- a/pkg/client/informers/informers_generated/certificates/v1alpha1/certificatesigningrequest.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/certificates/v1alpha1/interface.go b/pkg/client/informers/informers_generated/certificates/v1alpha1/interface.go index 8d21c5aaa37..c3873cbdb62 100644 --- a/pkg/client/informers/informers_generated/certificates/v1alpha1/interface.go +++ b/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} } diff --git a/pkg/client/informers/informers_generated/core/BUILD b/pkg/client/informers/informers_generated/core/BUILD index 0b9d5f361ac..d0e065c1215 100644 --- a/pkg/client/informers/informers_generated/core/BUILD +++ b/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", ], ) diff --git a/pkg/client/informers/informers_generated/core/interface.go b/pkg/client/informers/informers_generated/core/interface.go index e7dfee7cc2f..5e3ef0aed96 100644 --- a/pkg/client/informers/informers_generated/core/interface.go +++ b/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} } diff --git a/pkg/client/informers/informers_generated/core/internalversion/BUILD b/pkg/client/informers/informers_generated/core/internalversion/BUILD index 8b8866aa07f..5921ec33ceb 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/BUILD +++ b/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", diff --git a/pkg/client/informers/informers_generated/core/internalversion/componentstatus.go b/pkg/client/informers/informers_generated/core/internalversion/componentstatus.go index 2dc0cae5685..c657b2bc155 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/componentstatus.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/internalversion/configmap.go b/pkg/client/informers/informers_generated/core/internalversion/configmap.go index c4a12e2c93c..f474b28c440 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/configmap.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/internalversion/endpoints.go b/pkg/client/informers/informers_generated/core/internalversion/endpoints.go index f6611d8067b..090bbbd2e34 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/endpoints.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/internalversion/event.go b/pkg/client/informers/informers_generated/core/internalversion/event.go index 26f2a736368..8a34d8f1d27 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/event.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/internalversion/interface.go b/pkg/client/informers/informers_generated/core/internalversion/interface.go index 168b9777e4d..6a69e06305e 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/interface.go +++ b/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} } diff --git a/pkg/client/informers/informers_generated/core/internalversion/limitrange.go b/pkg/client/informers/informers_generated/core/internalversion/limitrange.go index e1eabc1f87f..dbbe6b7a479 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/limitrange.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/internalversion/namespace.go b/pkg/client/informers/informers_generated/core/internalversion/namespace.go index 060271e6029..2e33f181b25 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/namespace.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/internalversion/node.go b/pkg/client/informers/informers_generated/core/internalversion/node.go index c92113a545a..ae0dee5ebc7 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/node.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/internalversion/persistentvolume.go b/pkg/client/informers/informers_generated/core/internalversion/persistentvolume.go index 3d77b908eb9..967a4996f2b 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/persistentvolume.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/internalversion/persistentvolumeclaim.go b/pkg/client/informers/informers_generated/core/internalversion/persistentvolumeclaim.go index 68eb878b02c..bb5424aebe3 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/persistentvolumeclaim.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/internalversion/pod.go b/pkg/client/informers/informers_generated/core/internalversion/pod.go index f4d35fc2880..7e8e00c4f0e 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/pod.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/internalversion/podtemplate.go b/pkg/client/informers/informers_generated/core/internalversion/podtemplate.go index 6722cad1494..f57b5ef2eca 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/podtemplate.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/internalversion/replicationcontroller.go b/pkg/client/informers/informers_generated/core/internalversion/replicationcontroller.go index 3473db71a8c..51e49530cfd 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/replicationcontroller.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/internalversion/resourcequota.go b/pkg/client/informers/informers_generated/core/internalversion/resourcequota.go index 20400752231..e9084c33c66 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/resourcequota.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/internalversion/secret.go b/pkg/client/informers/informers_generated/core/internalversion/secret.go index d68a77a232a..cff1060b9d9 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/secret.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/internalversion/service.go b/pkg/client/informers/informers_generated/core/internalversion/service.go index d9f4704f9b0..97263ba1c2b 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/service.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/internalversion/serviceaccount.go b/pkg/client/informers/informers_generated/core/internalversion/serviceaccount.go index 5ea40cd2c7c..507e377a232 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/serviceaccount.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/v1/BUILD b/pkg/client/informers/informers_generated/core/v1/BUILD index 77defec6970..d762e954ef5 100644 --- a/pkg/client/informers/informers_generated/core/v1/BUILD +++ b/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", diff --git a/pkg/client/informers/informers_generated/core/v1/componentstatus.go b/pkg/client/informers/informers_generated/core/v1/componentstatus.go index f760ef1f26b..a5d5819a539 100644 --- a/pkg/client/informers/informers_generated/core/v1/componentstatus.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/v1/configmap.go b/pkg/client/informers/informers_generated/core/v1/configmap.go index 8de43d4f871..50d904c5d83 100644 --- a/pkg/client/informers/informers_generated/core/v1/configmap.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/v1/endpoints.go b/pkg/client/informers/informers_generated/core/v1/endpoints.go index a728c028502..5b6715950c2 100644 --- a/pkg/client/informers/informers_generated/core/v1/endpoints.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/v1/event.go b/pkg/client/informers/informers_generated/core/v1/event.go index 8042680d0e3..2c548339825 100644 --- a/pkg/client/informers/informers_generated/core/v1/event.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/v1/interface.go b/pkg/client/informers/informers_generated/core/v1/interface.go index 3373f98c839..9b2d69cfa6b 100644 --- a/pkg/client/informers/informers_generated/core/v1/interface.go +++ b/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} } diff --git a/pkg/client/informers/informers_generated/core/v1/limitrange.go b/pkg/client/informers/informers_generated/core/v1/limitrange.go index 63705de48f4..8b08d042e1c 100644 --- a/pkg/client/informers/informers_generated/core/v1/limitrange.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/v1/namespace.go b/pkg/client/informers/informers_generated/core/v1/namespace.go index 8ffece2fb3a..8c9614de057 100644 --- a/pkg/client/informers/informers_generated/core/v1/namespace.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/v1/node.go b/pkg/client/informers/informers_generated/core/v1/node.go index d389f041453..e2ab41e23ef 100644 --- a/pkg/client/informers/informers_generated/core/v1/node.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/v1/persistentvolume.go b/pkg/client/informers/informers_generated/core/v1/persistentvolume.go index 47cb64b8d36..16a37a962e7 100644 --- a/pkg/client/informers/informers_generated/core/v1/persistentvolume.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/v1/persistentvolumeclaim.go b/pkg/client/informers/informers_generated/core/v1/persistentvolumeclaim.go index e6c77783e70..adb5e7e3556 100644 --- a/pkg/client/informers/informers_generated/core/v1/persistentvolumeclaim.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/v1/pod.go b/pkg/client/informers/informers_generated/core/v1/pod.go index d318deee40a..de8e372d5a8 100644 --- a/pkg/client/informers/informers_generated/core/v1/pod.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/v1/podtemplate.go b/pkg/client/informers/informers_generated/core/v1/podtemplate.go index baf1277861f..7a4fa46670c 100644 --- a/pkg/client/informers/informers_generated/core/v1/podtemplate.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/v1/replicationcontroller.go b/pkg/client/informers/informers_generated/core/v1/replicationcontroller.go index 8cc31f2295e..90973e72d70 100644 --- a/pkg/client/informers/informers_generated/core/v1/replicationcontroller.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/v1/resourcequota.go b/pkg/client/informers/informers_generated/core/v1/resourcequota.go index 3900bc32be8..16a3161fe1b 100644 --- a/pkg/client/informers/informers_generated/core/v1/resourcequota.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/v1/secret.go b/pkg/client/informers/informers_generated/core/v1/secret.go index 5910e252566..f8bcf1c513c 100644 --- a/pkg/client/informers/informers_generated/core/v1/secret.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/v1/service.go b/pkg/client/informers/informers_generated/core/v1/service.go index b48155ec563..f32839caca4 100644 --- a/pkg/client/informers/informers_generated/core/v1/service.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/core/v1/serviceaccount.go b/pkg/client/informers/informers_generated/core/v1/serviceaccount.go index fc5f976521c..a18a7e6e290 100644 --- a/pkg/client/informers/informers_generated/core/v1/serviceaccount.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/extensions/BUILD b/pkg/client/informers/informers_generated/extensions/BUILD index 74c9f2a8e98..bdd3512e60d 100644 --- a/pkg/client/informers/informers_generated/extensions/BUILD +++ b/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", ], ) diff --git a/pkg/client/informers/informers_generated/extensions/interface.go b/pkg/client/informers/informers_generated/extensions/interface.go index 94a347a357b..c6389122766 100644 --- a/pkg/client/informers/informers_generated/extensions/interface.go +++ b/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} } diff --git a/pkg/client/informers/informers_generated/extensions/internalversion/BUILD b/pkg/client/informers/informers_generated/extensions/internalversion/BUILD index 6e85b60b6da..4fca4ad3a53 100644 --- a/pkg/client/informers/informers_generated/extensions/internalversion/BUILD +++ b/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", diff --git a/pkg/client/informers/informers_generated/extensions/internalversion/daemonset.go b/pkg/client/informers/informers_generated/extensions/internalversion/daemonset.go index 7c05fbe1487..de65180bfa5 100644 --- a/pkg/client/informers/informers_generated/extensions/internalversion/daemonset.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/extensions/internalversion/deployment.go b/pkg/client/informers/informers_generated/extensions/internalversion/deployment.go index d56d03fb5ea..d8bb023a7b3 100644 --- a/pkg/client/informers/informers_generated/extensions/internalversion/deployment.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/extensions/internalversion/ingress.go b/pkg/client/informers/informers_generated/extensions/internalversion/ingress.go index e86f408bb75..14d94374074 100644 --- a/pkg/client/informers/informers_generated/extensions/internalversion/ingress.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/extensions/internalversion/interface.go b/pkg/client/informers/informers_generated/extensions/internalversion/interface.go index 9fa3628edbd..38498ccbf69 100644 --- a/pkg/client/informers/informers_generated/extensions/internalversion/interface.go +++ b/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} } diff --git a/pkg/client/informers/informers_generated/extensions/internalversion/networkpolicy.go b/pkg/client/informers/informers_generated/extensions/internalversion/networkpolicy.go index ced27d1f697..1ba49172eb5 100644 --- a/pkg/client/informers/informers_generated/extensions/internalversion/networkpolicy.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/extensions/internalversion/podsecuritypolicy.go b/pkg/client/informers/informers_generated/extensions/internalversion/podsecuritypolicy.go index d2df7a07429..b3a19ca35dd 100644 --- a/pkg/client/informers/informers_generated/extensions/internalversion/podsecuritypolicy.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/extensions/internalversion/replicaset.go b/pkg/client/informers/informers_generated/extensions/internalversion/replicaset.go index dc949545399..76b3acc35e5 100644 --- a/pkg/client/informers/informers_generated/extensions/internalversion/replicaset.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/extensions/internalversion/thirdpartyresource.go b/pkg/client/informers/informers_generated/extensions/internalversion/thirdpartyresource.go index 21b277a9e80..53f130fdec8 100644 --- a/pkg/client/informers/informers_generated/extensions/internalversion/thirdpartyresource.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/BUILD b/pkg/client/informers/informers_generated/extensions/v1beta1/BUILD index 4822bc750e1..107f8b46c4a 100644 --- a/pkg/client/informers/informers_generated/extensions/v1beta1/BUILD +++ b/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", diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/daemonset.go b/pkg/client/informers/informers_generated/extensions/v1beta1/daemonset.go index 46ae573a03b..c4ce6c643f9 100644 --- a/pkg/client/informers/informers_generated/extensions/v1beta1/daemonset.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/deployment.go b/pkg/client/informers/informers_generated/extensions/v1beta1/deployment.go index 97b964d1e77..711c78538c4 100644 --- a/pkg/client/informers/informers_generated/extensions/v1beta1/deployment.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/ingress.go b/pkg/client/informers/informers_generated/extensions/v1beta1/ingress.go index dee4c9f4e28..1cbb29b8972 100644 --- a/pkg/client/informers/informers_generated/extensions/v1beta1/ingress.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/interface.go b/pkg/client/informers/informers_generated/extensions/v1beta1/interface.go index 7e6a5851703..e60dc49511e 100644 --- a/pkg/client/informers/informers_generated/extensions/v1beta1/interface.go +++ b/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} } diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/job.go b/pkg/client/informers/informers_generated/extensions/v1beta1/job.go index 92d518051bf..6918ed248ce 100644 --- a/pkg/client/informers/informers_generated/extensions/v1beta1/job.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/podsecuritypolicy.go b/pkg/client/informers/informers_generated/extensions/v1beta1/podsecuritypolicy.go index bba64d303b6..24c5e64c9fa 100644 --- a/pkg/client/informers/informers_generated/extensions/v1beta1/podsecuritypolicy.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/replicaset.go b/pkg/client/informers/informers_generated/extensions/v1beta1/replicaset.go index 1160388d610..1fab82d73d0 100644 --- a/pkg/client/informers/informers_generated/extensions/v1beta1/replicaset.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/thirdpartyresource.go b/pkg/client/informers/informers_generated/extensions/v1beta1/thirdpartyresource.go index 15a6eb2fc1d..5279dce4d4f 100644 --- a/pkg/client/informers/informers_generated/extensions/v1beta1/thirdpartyresource.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/factory.go b/pkg/client/informers/informers_generated/factory.go index 2c2124f72f2..8bd8246bde4 100644 --- a/pkg/client/informers/informers_generated/factory.go +++ b/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 diff --git a/pkg/client/informers/informers_generated/internalinterfaces/BUILD b/pkg/client/informers/informers_generated/internalinterfaces/BUILD new file mode 100644 index 00000000000..4e7dc458bf5 --- /dev/null +++ b/pkg/client/informers/informers_generated/internalinterfaces/BUILD @@ -0,0 +1,23 @@ +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", + ], +) diff --git a/pkg/client/informers/informers_generated/internalinterfaces/internal_interfaces.go b/pkg/client/informers/informers_generated/internalinterfaces/internal_interfaces.go new file mode 100644 index 00000000000..ee2bcd4f6e7 --- /dev/null +++ b/pkg/client/informers/informers_generated/internalinterfaces/internal_interfaces.go @@ -0,0 +1,37 @@ +/* +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 +} diff --git a/pkg/client/informers/informers_generated/policy/BUILD b/pkg/client/informers/informers_generated/policy/BUILD index c157510114f..0b2ccde9001 100644 --- a/pkg/client/informers/informers_generated/policy/BUILD +++ b/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", ], ) diff --git a/pkg/client/informers/informers_generated/policy/interface.go b/pkg/client/informers/informers_generated/policy/interface.go index a0136cde1df..1fad7cf2966 100644 --- a/pkg/client/informers/informers_generated/policy/interface.go +++ b/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} } diff --git a/pkg/client/informers/informers_generated/policy/internalversion/BUILD b/pkg/client/informers/informers_generated/policy/internalversion/BUILD index e5c99fdd73c..55c1432b9db 100644 --- a/pkg/client/informers/informers_generated/policy/internalversion/BUILD +++ b/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", diff --git a/pkg/client/informers/informers_generated/policy/internalversion/interface.go b/pkg/client/informers/informers_generated/policy/internalversion/interface.go index 0f20dc853be..df35e0df91d 100644 --- a/pkg/client/informers/informers_generated/policy/internalversion/interface.go +++ b/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} } diff --git a/pkg/client/informers/informers_generated/policy/internalversion/poddisruptionbudget.go b/pkg/client/informers/informers_generated/policy/internalversion/poddisruptionbudget.go index 38a9ad6ce6e..54ae21c81ca 100644 --- a/pkg/client/informers/informers_generated/policy/internalversion/poddisruptionbudget.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/policy/v1beta1/BUILD b/pkg/client/informers/informers_generated/policy/v1beta1/BUILD index f5c1a8afb38..d050343b04a 100644 --- a/pkg/client/informers/informers_generated/policy/v1beta1/BUILD +++ b/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", diff --git a/pkg/client/informers/informers_generated/policy/v1beta1/interface.go b/pkg/client/informers/informers_generated/policy/v1beta1/interface.go index ce008b41a7b..d51eafa3fd7 100644 --- a/pkg/client/informers/informers_generated/policy/v1beta1/interface.go +++ b/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} } diff --git a/pkg/client/informers/informers_generated/policy/v1beta1/poddisruptionbudget.go b/pkg/client/informers/informers_generated/policy/v1beta1/poddisruptionbudget.go index 6d427ac30e2..ed2b7cd43e2 100644 --- a/pkg/client/informers/informers_generated/policy/v1beta1/poddisruptionbudget.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/rbac/BUILD b/pkg/client/informers/informers_generated/rbac/BUILD index 910501baa8a..c9472926035 100644 --- a/pkg/client/informers/informers_generated/rbac/BUILD +++ b/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", ], ) diff --git a/pkg/client/informers/informers_generated/rbac/interface.go b/pkg/client/informers/informers_generated/rbac/interface.go index 1ca853fef53..91383048237 100644 --- a/pkg/client/informers/informers_generated/rbac/interface.go +++ b/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} } diff --git a/pkg/client/informers/informers_generated/rbac/internalversion/BUILD b/pkg/client/informers/informers_generated/rbac/internalversion/BUILD index 0b9ad17d0a3..04588e424b2 100644 --- a/pkg/client/informers/informers_generated/rbac/internalversion/BUILD +++ b/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", diff --git a/pkg/client/informers/informers_generated/rbac/internalversion/clusterrole.go b/pkg/client/informers/informers_generated/rbac/internalversion/clusterrole.go index 69825b2fa5f..ba29130fe2d 100644 --- a/pkg/client/informers/informers_generated/rbac/internalversion/clusterrole.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/rbac/internalversion/clusterrolebinding.go b/pkg/client/informers/informers_generated/rbac/internalversion/clusterrolebinding.go index 4747d51a3e4..7f09e4c60cc 100644 --- a/pkg/client/informers/informers_generated/rbac/internalversion/clusterrolebinding.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/rbac/internalversion/interface.go b/pkg/client/informers/informers_generated/rbac/internalversion/interface.go index 78d8f5b2b6a..e58365e8b6d 100644 --- a/pkg/client/informers/informers_generated/rbac/internalversion/interface.go +++ b/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} } diff --git a/pkg/client/informers/informers_generated/rbac/internalversion/role.go b/pkg/client/informers/informers_generated/rbac/internalversion/role.go index 71c8b7a8c48..9fb9b25fbc6 100644 --- a/pkg/client/informers/informers_generated/rbac/internalversion/role.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/rbac/internalversion/rolebinding.go b/pkg/client/informers/informers_generated/rbac/internalversion/rolebinding.go index ecb903fa08c..bbf66f3242b 100644 --- a/pkg/client/informers/informers_generated/rbac/internalversion/rolebinding.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/rbac/v1alpha1/BUILD b/pkg/client/informers/informers_generated/rbac/v1alpha1/BUILD index a0719b4dc73..0e0daf0f471 100644 --- a/pkg/client/informers/informers_generated/rbac/v1alpha1/BUILD +++ b/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", diff --git a/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrole.go b/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrole.go index 4c3b2729394..b13a8eb2f43 100644 --- a/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrole.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrolebinding.go b/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrolebinding.go index afad92fdcca..0068cef86a5 100644 --- a/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrolebinding.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/rbac/v1alpha1/interface.go b/pkg/client/informers/informers_generated/rbac/v1alpha1/interface.go index 8ad54db3a69..5c0f38a0a68 100644 --- a/pkg/client/informers/informers_generated/rbac/v1alpha1/interface.go +++ b/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} } diff --git a/pkg/client/informers/informers_generated/rbac/v1alpha1/role.go b/pkg/client/informers/informers_generated/rbac/v1alpha1/role.go index e9279f5bc13..faf2f69a925 100644 --- a/pkg/client/informers/informers_generated/rbac/v1alpha1/role.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/rbac/v1alpha1/rolebinding.go b/pkg/client/informers/informers_generated/rbac/v1alpha1/rolebinding.go index 74b8c19dc7d..f6df2626647 100644 --- a/pkg/client/informers/informers_generated/rbac/v1alpha1/rolebinding.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/storage/BUILD b/pkg/client/informers/informers_generated/storage/BUILD index f2a8655ac77..ac4aee4fd1a 100644 --- a/pkg/client/informers/informers_generated/storage/BUILD +++ b/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", ], ) diff --git a/pkg/client/informers/informers_generated/storage/interface.go b/pkg/client/informers/informers_generated/storage/interface.go index 49255248107..cbb093f3697 100644 --- a/pkg/client/informers/informers_generated/storage/interface.go +++ b/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} } diff --git a/pkg/client/informers/informers_generated/storage/internalversion/BUILD b/pkg/client/informers/informers_generated/storage/internalversion/BUILD index cd2607d3436..6ceaedd8301 100644 --- a/pkg/client/informers/informers_generated/storage/internalversion/BUILD +++ b/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", diff --git a/pkg/client/informers/informers_generated/storage/internalversion/interface.go b/pkg/client/informers/informers_generated/storage/internalversion/interface.go index 6233eedb709..7e137546d9e 100644 --- a/pkg/client/informers/informers_generated/storage/internalversion/interface.go +++ b/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} } diff --git a/pkg/client/informers/informers_generated/storage/internalversion/storageclass.go b/pkg/client/informers/informers_generated/storage/internalversion/storageclass.go index 8bb75b99c1e..d6f1e067b2f 100644 --- a/pkg/client/informers/informers_generated/storage/internalversion/storageclass.go +++ b/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 { diff --git a/pkg/client/informers/informers_generated/storage/v1beta1/BUILD b/pkg/client/informers/informers_generated/storage/v1beta1/BUILD index 6c172e8a31f..a635833faba 100644 --- a/pkg/client/informers/informers_generated/storage/v1beta1/BUILD +++ b/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", diff --git a/pkg/client/informers/informers_generated/storage/v1beta1/interface.go b/pkg/client/informers/informers_generated/storage/v1beta1/interface.go index 550a5139f18..a37897fe8f0 100644 --- a/pkg/client/informers/informers_generated/storage/v1beta1/interface.go +++ b/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} } diff --git a/pkg/client/informers/informers_generated/storage/v1beta1/storageclass.go b/pkg/client/informers/informers_generated/storage/v1beta1/storageclass.go index bc0d9c4dd4a..f268c83ab2f 100644 --- a/pkg/client/informers/informers_generated/storage/v1beta1/storageclass.go +++ b/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 {