From fd34b11e137c4620602db742555cbc847204288d Mon Sep 17 00:00:00 2001 From: deads2k Date: Wed, 8 Feb 2017 16:18:21 -0500 Subject: [PATCH] react to informer updates --- cmd/cloud-controller-manager/app/BUILD | 1 + .../app/controllermanager.go | 4 +- cmd/kube-aggregator/main.go | 2 - cmd/kube-aggregator/pkg/apiserver/BUILD | 4 +- .../pkg/apiserver/apiserver.go | 8 +- .../pkg/apiserver/apiservice_controller.go | 2 +- .../pkg/apiserver/handler_apis.go | 2 +- cmd/kube-controller-manager/app/BUILD | 1 + .../app/controllermanager.go | 4 +- hack/.linted_packages | 81 +++++++++++-------- pkg/BUILD | 1 - .../autoscaling/v2alpha1/BUILD | 39 --------- .../v2alpha1/horizontalpodautoscaler.go | 68 ---------------- .../autoscaling/v2alpha1/interface.go | 43 ---------- pkg/controller/certificates/BUILD | 2 + .../certificates/certificate_controller.go | 2 +- .../certificate_controller_test.go | 4 +- pkg/controller/cloud/BUILD | 2 + pkg/controller/cloud/nodecontroller.go | 2 +- pkg/controller/cloud/nodecontroller_test.go | 4 +- pkg/controller/daemon/BUILD | 3 + pkg/controller/daemon/daemoncontroller.go | 4 +- .../daemon/daemoncontroller_test.go | 4 +- pkg/controller/deployment/BUILD | 3 + .../deployment/deployment_controller.go | 4 +- .../deployment/deployment_controller_test.go | 6 +- pkg/controller/deployment/recreate_test.go | 4 +- pkg/controller/deployment/sync_test.go | 4 +- pkg/controller/disruption/BUILD | 5 ++ pkg/controller/disruption/disruption.go | 8 +- pkg/controller/disruption/disruption_test.go | 4 +- pkg/controller/endpoint/BUILD | 2 + .../endpoint/endpoints_controller.go | 2 +- .../endpoint/endpoints_controller_test.go | 4 +- pkg/controller/job/BUILD | 3 + pkg/controller/job/jobcontroller.go | 4 +- pkg/controller/job/jobcontroller_test.go | 4 +- pkg/controller/node/BUILD | 5 ++ pkg/controller/node/nodecontroller.go | 4 +- pkg/controller/node/nodecontroller_test.go | 8 +- pkg/controller/podautoscaler/BUILD | 2 + pkg/controller/podautoscaler/horizontal.go | 2 +- .../podautoscaler/horizontal_test.go | 4 +- pkg/controller/podgc/BUILD | 3 + pkg/controller/podgc/gc_controller.go | 2 +- pkg/controller/podgc/gc_controller_test.go | 6 +- pkg/controller/replicaset/BUILD | 3 + pkg/controller/replicaset/replica_set.go | 4 +- pkg/controller/replicaset/replica_set_test.go | 6 +- pkg/controller/replication/BUILD | 3 + .../replication/replication_controller.go | 2 +- .../replication_controller_test.go | 8 +- pkg/controller/ttl/BUILD | 1 + pkg/controller/ttl/ttlcontroller.go | 2 +- pkg/controller/volume/attachdetach/BUILD | 2 + .../attachdetach/attach_detach_controller.go | 2 +- .../attach_detach_controller_test.go | 4 +- .../volume/attachdetach/reconciler/BUILD | 1 + .../reconciler/reconciler_test.go | 4 +- test/integration/evictions/evictions_test.go | 4 +- test/integration/framework/BUILD | 1 + test/integration/framework/master_utils.go | 4 +- test/integration/quota/quota_test.go | 4 +- .../integration/replicaset/replicaset_test.go | 4 +- .../replicationcontroller_test.go | 4 +- .../ttlcontroller/ttlcontroller_test.go | 4 +- test/integration/volume/attach_detach_test.go | 4 +- 67 files changed, 177 insertions(+), 274 deletions(-) delete mode 100644 pkg/client/informers/informers_generated/autoscaling/v2alpha1/BUILD delete mode 100644 pkg/client/informers/informers_generated/autoscaling/v2alpha1/horizontalpodautoscaler.go delete mode 100644 pkg/client/informers/informers_generated/autoscaling/v2alpha1/interface.go diff --git a/cmd/cloud-controller-manager/app/BUILD b/cmd/cloud-controller-manager/app/BUILD index bd911aa7c9c..728a7f2fdad 100644 --- a/cmd/cloud-controller-manager/app/BUILD +++ b/cmd/cloud-controller-manager/app/BUILD @@ -15,6 +15,7 @@ go_library( "//cmd/cloud-controller-manager/app/options:go_default_library", "//pkg/api:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", + "//pkg/client/informers/informers_generated/externalversions:go_default_library", "//pkg/client/leaderelection:go_default_library", "//pkg/client/leaderelection/resourcelock:go_default_library", "//pkg/cloudprovider:go_default_library", diff --git a/cmd/cloud-controller-manager/app/controllermanager.go b/cmd/cloud-controller-manager/app/controllermanager.go index 84ec566ca90..ea67e4f624b 100644 --- a/cmd/cloud-controller-manager/app/controllermanager.go +++ b/cmd/cloud-controller-manager/app/controllermanager.go @@ -36,7 +36,7 @@ import ( "k8s.io/kubernetes/cmd/cloud-controller-manager/app/options" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - newinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated" + newinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/client/leaderelection" "k8s.io/kubernetes/pkg/client/leaderelection/resourcelock" "k8s.io/kubernetes/pkg/cloudprovider" @@ -197,7 +197,7 @@ func StartControllers(s *options.CloudControllerManagerServer, kubeconfig *restc versionedClient := client("shared-informers") // TODO replace sharedInformers with newSharedInformers sharedInformers := informers.NewSharedInformerFactory(versionedClient, nil, resyncPeriod(s)()) - newSharedInformers := newinformers.NewSharedInformerFactory(nil, versionedClient, resyncPeriod(s)()) + newSharedInformers := newinformers.NewSharedInformerFactory(versionedClient, resyncPeriod(s)()) _, clusterCIDR, err := net.ParseCIDR(s.ClusterCIDR) if err != nil { diff --git a/cmd/kube-aggregator/main.go b/cmd/kube-aggregator/main.go index f705f9fe9da..f8b9bc40fe2 100644 --- a/cmd/kube-aggregator/main.go +++ b/cmd/kube-aggregator/main.go @@ -29,8 +29,6 @@ import ( _ "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/install" _ "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/validation" _ "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset" - _ "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion" - _ "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/apiregistration/v1alpha1" _ "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion" _ "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1" ) diff --git a/cmd/kube-aggregator/pkg/apiserver/BUILD b/cmd/kube-aggregator/pkg/apiserver/BUILD index d8f1787df5a..3ab0f6055a4 100644 --- a/cmd/kube-aggregator/pkg/apiserver/BUILD +++ b/cmd/kube-aggregator/pkg/apiserver/BUILD @@ -45,12 +45,14 @@ go_library( deps = [ "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", "//cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library", - "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset:go_default_library", "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset:go_default_library", + "//cmd/kube-aggregator/pkg/client/informers/internalversion:go_default_library", + "//cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion:go_default_library", "//cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion:go_default_library", "//cmd/kube-aggregator/pkg/registry/apiservice/etcd:go_default_library", "//pkg/api:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", + "//pkg/client/informers/informers_generated/externalversions:go_default_library", "//pkg/client/listers/core/v1:go_default_library", "//pkg/controller:go_default_library", "//pkg/version:go_default_library", diff --git a/cmd/kube-aggregator/pkg/apiserver/apiserver.go b/cmd/kube-aggregator/pkg/apiserver/apiserver.go index 8311ab7040a..c28a962afc3 100644 --- a/cmd/kube-aggregator/pkg/apiserver/apiserver.go +++ b/cmd/kube-aggregator/pkg/apiserver/apiserver.go @@ -29,15 +29,14 @@ import ( genericfilters "k8s.io/apiserver/pkg/server/filters" "k8s.io/kubernetes/pkg/api" kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - kubeinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated" + kubeinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" v1listers "k8s.io/kubernetes/pkg/client/listers/core/v1" "k8s.io/kubernetes/pkg/version" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" - aggregatorclient "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset" - "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers" + informers "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalversion" listers "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion" apiservicestorage "k8s.io/kubernetes/cmd/kube-aggregator/pkg/registry/apiservice/etcd" ) @@ -105,10 +104,9 @@ func (c *Config) SkipComplete() completedConfig { func (c completedConfig) New() (*APIAggregator, error) { informerFactory := informers.NewSharedInformerFactory( internalclientset.NewForConfigOrDie(c.Config.GenericConfig.LoopbackClientConfig), - aggregatorclient.NewForConfigOrDie(c.Config.GenericConfig.LoopbackClientConfig), 5*time.Minute, // this is effectively used as a refresh interval right now. Might want to do something nicer later on. ) - kubeInformers := kubeinformers.NewSharedInformerFactory(nil, c.CoreAPIServerClient, 5*time.Minute) + kubeInformers := kubeinformers.NewSharedInformerFactory(c.CoreAPIServerClient, 5*time.Minute) proxyMux := http.NewServeMux() diff --git a/cmd/kube-aggregator/pkg/apiserver/apiservice_controller.go b/cmd/kube-aggregator/pkg/apiserver/apiservice_controller.go index c880762d0f2..fb3f3634b7b 100644 --- a/cmd/kube-aggregator/pkg/apiserver/apiservice_controller.go +++ b/cmd/kube-aggregator/pkg/apiserver/apiservice_controller.go @@ -30,7 +30,7 @@ import ( "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" - informers "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion" + informers "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion" listers "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion" ) diff --git a/cmd/kube-aggregator/pkg/apiserver/handler_apis.go b/cmd/kube-aggregator/pkg/apiserver/handler_apis.go index b6f25682b7b..0f1e46b82b5 100644 --- a/cmd/kube-aggregator/pkg/apiserver/handler_apis.go +++ b/cmd/kube-aggregator/pkg/apiserver/handler_apis.go @@ -30,7 +30,7 @@ import ( apiregistrationapi "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" apiregistrationv1alpha1api "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" - informers "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion" + informers "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion" listers "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion" ) diff --git a/cmd/kube-controller-manager/app/BUILD b/cmd/kube-controller-manager/app/BUILD index 3dec947ec3d..fbd0cdb6795 100644 --- a/cmd/kube-controller-manager/app/BUILD +++ b/cmd/kube-controller-manager/app/BUILD @@ -31,6 +31,7 @@ go_library( "//pkg/apis/componentconfig:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", + "//pkg/client/informers/informers_generated/externalversions:go_default_library", "//pkg/client/leaderelection:go_default_library", "//pkg/client/leaderelection/resourcelock:go_default_library", "//pkg/cloudprovider:go_default_library", diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go index 0b34ae7e532..515a334d19a 100644 --- a/cmd/kube-controller-manager/app/controllermanager.go +++ b/cmd/kube-controller-manager/app/controllermanager.go @@ -46,7 +46,7 @@ import ( "k8s.io/kubernetes/cmd/kube-controller-manager/app/options" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - newinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated" + newinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/client/leaderelection" "k8s.io/kubernetes/pkg/client/leaderelection/resourcelock" "k8s.io/kubernetes/pkg/cloudprovider" @@ -344,7 +344,7 @@ func StartControllers(controllers map[string]InitFunc, s *options.CMServer, root versionedClient := rootClientBuilder.ClientOrDie("shared-informers") // TODO replace sharedInformers with newSharedInformers sharedInformers := informers.NewSharedInformerFactory(versionedClient, nil, ResyncPeriod(s)()) - newSharedInformers := newinformers.NewSharedInformerFactory(nil, versionedClient, ResyncPeriod(s)()) + newSharedInformers := newinformers.NewSharedInformerFactory(versionedClient, ResyncPeriod(s)()) // always start the SA token controller first using a full-power client, since it needs to mint tokens for the rest if len(s.ServiceAccountKeyFile) > 0 { diff --git a/hack/.linted_packages b/hack/.linted_packages index 1e8a9c89280..4a6a31b6de8 100644 --- a/hack/.linted_packages +++ b/hack/.linted_packages @@ -10,10 +10,12 @@ cmd/genswaggertypedocs cmd/genyaml cmd/kube-aggregator cmd/kube-aggregator/pkg/apis/apiregistration/install -cmd/kube-aggregator/pkg/client/informers -cmd/kube-aggregator/pkg/client/informers/apiregistration -cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion -cmd/kube-aggregator/pkg/client/informers/apiregistration/v1alpha1 +cmd/kube-aggregator/pkg/client/informers/externalversions +cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration +cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1 +cmd/kube-aggregator/pkg/client/informers/internalversion +cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration +cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1 cmd/kube-apiserver @@ -89,36 +91,47 @@ pkg/apis/storage/install pkg/apis/storage/validation pkg/bootstrap/api pkg/client/conditions -pkg/client/informers/informers_generated/apps -pkg/client/informers/informers_generated/apps/internalversion -pkg/client/informers/informers_generated/apps/v1beta1 -pkg/client/informers/informers_generated/autoscaling -pkg/client/informers/informers_generated/autoscaling/internalversion -pkg/client/informers/informers_generated/autoscaling/v1 -pkg/client/informers/informers_generated/autoscaling/v2alpha1 -pkg/client/informers/informers_generated/batch -pkg/client/informers/informers_generated/batch/internalversion -pkg/client/informers/informers_generated/batch/v1 -pkg/client/informers/informers_generated/batch/v2alpha1 -pkg/client/informers/informers_generated/certificates -pkg/client/informers/informers_generated/certificates/internalversion -pkg/client/informers/informers_generated/certificates/v1beta1 -pkg/client/informers/informers_generated/core -pkg/client/informers/informers_generated/core/internalversion -pkg/client/informers/informers_generated/core/v1 -pkg/client/informers/informers_generated/extensions -pkg/client/informers/informers_generated/extensions/internalversion -pkg/client/informers/informers_generated/extensions/v1beta1 -pkg/client/informers/informers_generated/policy -pkg/client/informers/informers_generated/policy/internalversion -pkg/client/informers/informers_generated/policy/v1beta1 -pkg/client/informers/informers_generated/rbac -pkg/client/informers/informers_generated/rbac/internalversion -pkg/client/informers/informers_generated/rbac/v1alpha1 -pkg/client/informers/informers_generated/rbac/v1beta1 -pkg/client/informers/informers_generated/storage -pkg/client/informers/informers_generated/storage/internalversion -pkg/client/informers/informers_generated/storage/v1beta1 +pkg/client/informers/informers_generated/externalversions +pkg/client/informers/informers_generated/externalversions/apps +pkg/client/informers/informers_generated/externalversions/apps/v1beta1 +pkg/client/informers/informers_generated/externalversions/autoscaling +pkg/client/informers/informers_generated/externalversions/autoscaling/v1 +pkg/client/informers/informers_generated/externalversions/autoscaling/v2alpha1 +pkg/client/informers/informers_generated/externalversions/batch +pkg/client/informers/informers_generated/externalversions/batch/v1 +pkg/client/informers/informers_generated/externalversions/batch/v2alpha1 +pkg/client/informers/informers_generated/externalversions/certificates +pkg/client/informers/informers_generated/externalversions/certificates/v1beta1 +pkg/client/informers/informers_generated/externalversions/core +pkg/client/informers/informers_generated/externalversions/core/v1 +pkg/client/informers/informers_generated/externalversions/extensions +pkg/client/informers/informers_generated/externalversions/extensions/v1beta1 +pkg/client/informers/informers_generated/externalversions/policy +pkg/client/informers/informers_generated/externalversions/policy/v1beta1 +pkg/client/informers/informers_generated/externalversions/rbac +pkg/client/informers/informers_generated/externalversions/rbac/v1alpha1 +pkg/client/informers/informers_generated/externalversions/rbac/v1beta1 +pkg/client/informers/informers_generated/externalversions/storage +pkg/client/informers/informers_generated/externalversions/storage/v1beta1 +pkg/client/informers/informers_generated/internalversion +pkg/client/informers/informers_generated/internalversion/apps +pkg/client/informers/informers_generated/internalversion/apps/internalversion +pkg/client/informers/informers_generated/internalversion/autoscaling +pkg/client/informers/informers_generated/internalversion/autoscaling/internalversion +pkg/client/informers/informers_generated/internalversion/batch +pkg/client/informers/informers_generated/internalversion/batch/internalversion +pkg/client/informers/informers_generated/internalversion/certificates +pkg/client/informers/informers_generated/internalversion/certificates/internalversion +pkg/client/informers/informers_generated/internalversion/core +pkg/client/informers/informers_generated/internalversion/core/internalversion +pkg/client/informers/informers_generated/internalversion/extensions +pkg/client/informers/informers_generated/internalversion/extensions/internalversion +pkg/client/informers/informers_generated/internalversion/policy +pkg/client/informers/informers_generated/internalversion/policy/internalversion +pkg/client/informers/informers_generated/internalversion/rbac +pkg/client/informers/informers_generated/internalversion/rbac/internalversion +pkg/client/informers/informers_generated/internalversion/storage +pkg/client/informers/informers_generated/internalversion/storage/internalversion pkg/client/listers/apps/internalversion pkg/client/listers/apps/v1beta1 pkg/client/listers/authentication/internalversion diff --git a/pkg/BUILD b/pkg/BUILD index cd4de404ce9..1307dffd852 100644 --- a/pkg/BUILD +++ b/pkg/BUILD @@ -37,7 +37,6 @@ filegroup( "//pkg/client/clientset_generated/clientset:all-srcs", "//pkg/client/clientset_generated/internalclientset:all-srcs", "//pkg/client/conditions:all-srcs", - "//pkg/client/informers/informers_generated/autoscaling/v2alpha1:all-srcs", "//pkg/client/informers/informers_generated/externalversions:all-srcs", "//pkg/client/informers/informers_generated/internalversion:all-srcs", "//pkg/client/leaderelection:all-srcs", diff --git a/pkg/client/informers/informers_generated/autoscaling/v2alpha1/BUILD b/pkg/client/informers/informers_generated/autoscaling/v2alpha1/BUILD deleted file mode 100644 index 9f24e51bfba..00000000000 --- a/pkg/client/informers/informers_generated/autoscaling/v2alpha1/BUILD +++ /dev/null @@ -1,39 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "horizontalpodautoscaler.go", - "interface.go", - ], - tags = ["automanaged"], - deps = [ - "//pkg/apis/autoscaling/v2alpha1:go_default_library", - "//pkg/client/clientset_generated/clientset:go_default_library", - "//pkg/client/listers/autoscaling/v2alpha1:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/tools/cache", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/client/informers/informers_generated/autoscaling/v2alpha1/horizontalpodautoscaler.go b/pkg/client/informers/informers_generated/autoscaling/v2alpha1/horizontalpodautoscaler.go deleted file mode 100644 index 7c2341a0f4f..00000000000 --- a/pkg/client/informers/informers_generated/autoscaling/v2alpha1/horizontalpodautoscaler.go +++ /dev/null @@ -1,68 +0,0 @@ -/* -Copyright 2017 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// This file was automatically generated by informer-gen - -package v2alpha1 - -import ( - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - watch "k8s.io/apimachinery/pkg/watch" - cache "k8s.io/client-go/tools/cache" - autoscaling_v2alpha1 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" - v2alpha1 "k8s.io/kubernetes/pkg/client/listers/autoscaling/v2alpha1" - time "time" -) - -// HorizontalPodAutoscalerInformer provides access to a shared informer and lister for -// HorizontalPodAutoscalers. -type HorizontalPodAutoscalerInformer interface { - Informer() cache.SharedIndexInformer - Lister() v2alpha1.HorizontalPodAutoscalerLister -} - -type horizontalPodAutoscalerInformer struct { - factory internalinterfaces.SharedInformerFactory -} - -func newHorizontalPodAutoscalerInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - sharedIndexInformer := cache.NewSharedIndexInformer( - &cache.ListWatch{ - ListFunc: func(options v1.ListOptions) (runtime.Object, error) { - return client.AutoscalingV2alpha1().HorizontalPodAutoscalers(v1.NamespaceAll).List(options) - }, - WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { - return client.AutoscalingV2alpha1().HorizontalPodAutoscalers(v1.NamespaceAll).Watch(options) - }, - }, - &autoscaling_v2alpha1.HorizontalPodAutoscaler{}, - resyncPeriod, - cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, - ) - - return sharedIndexInformer -} - -func (f *horizontalPodAutoscalerInformer) Informer() cache.SharedIndexInformer { - return f.factory.VersionedInformerFor(&autoscaling_v2alpha1.HorizontalPodAutoscaler{}, newHorizontalPodAutoscalerInformer) -} - -func (f *horizontalPodAutoscalerInformer) Lister() v2alpha1.HorizontalPodAutoscalerLister { - return v2alpha1.NewHorizontalPodAutoscalerLister(f.Informer().GetIndexer()) -} diff --git a/pkg/client/informers/informers_generated/autoscaling/v2alpha1/interface.go b/pkg/client/informers/informers_generated/autoscaling/v2alpha1/interface.go deleted file mode 100644 index 8521a184946..00000000000 --- a/pkg/client/informers/informers_generated/autoscaling/v2alpha1/interface.go +++ /dev/null @@ -1,43 +0,0 @@ -/* -Copyright 2017 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// This file was automatically generated by informer-gen - -package v2alpha1 - -import ( - internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" -) - -// Interface provides access to all the informers in this group version. -type Interface interface { - // HorizontalPodAutoscalers returns a HorizontalPodAutoscalerInformer. - HorizontalPodAutoscalers() HorizontalPodAutoscalerInformer -} - -type version struct { - internalinterfaces.SharedInformerFactory -} - -// New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory) Interface { - return &version{f} -} - -// HorizontalPodAutoscalers returns a HorizontalPodAutoscalerInformer. -func (v *version) HorizontalPodAutoscalers() HorizontalPodAutoscalerInformer { - return &horizontalPodAutoscalerInformer{factory: v.SharedInformerFactory} -} diff --git a/pkg/controller/certificates/BUILD b/pkg/controller/certificates/BUILD index 9784614a143..e93be582fec 100644 --- a/pkg/controller/certificates/BUILD +++ b/pkg/controller/certificates/BUILD @@ -21,6 +21,7 @@ go_library( deps = [ "//pkg/apis/certificates/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", + "//pkg/client/informers/informers_generated/externalversions/certificates/v1beta1:go_default_library", "//pkg/client/listers/certificates/v1beta1:go_default_library", "//pkg/controller:go_default_library", "//vendor:github.com/cloudflare/cfssl/config", @@ -69,6 +70,7 @@ go_test( deps = [ "//pkg/apis/certificates/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", + "//pkg/client/informers/informers_generated/externalversions:go_default_library", "//pkg/controller:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", diff --git a/pkg/controller/certificates/certificate_controller.go b/pkg/controller/certificates/certificate_controller.go index 9efe1ec738d..04d406ab38e 100644 --- a/pkg/controller/certificates/certificate_controller.go +++ b/pkg/controller/certificates/certificate_controller.go @@ -30,7 +30,7 @@ import ( "k8s.io/client-go/util/workqueue" certificates "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - certificatesinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/certificates/v1beta1" + certificatesinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/certificates/v1beta1" certificateslisters "k8s.io/kubernetes/pkg/client/listers/certificates/v1beta1" "k8s.io/kubernetes/pkg/controller" diff --git a/pkg/controller/certificates/certificate_controller_test.go b/pkg/controller/certificates/certificate_controller_test.go index f74f562acae..94e7a31a337 100644 --- a/pkg/controller/certificates/certificate_controller_test.go +++ b/pkg/controller/certificates/certificate_controller_test.go @@ -34,7 +34,7 @@ import ( "k8s.io/client-go/util/cert/triple" certificates "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - informers "k8s.io/kubernetes/pkg/client/informers/informers_generated" + informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller" ) @@ -51,7 +51,7 @@ func alwaysReady() bool { return true } func newController(csrs ...runtime.Object) (*testController, error) { client := fake.NewSimpleClientset(csrs...) - informerFactory := informers.NewSharedInformerFactory(nil, client, controller.NoResyncPeriodFunc()) + informerFactory := informers.NewSharedInformerFactory(client, controller.NoResyncPeriodFunc()) certFile, keyFile, err := createTestCertFiles() if err != nil { diff --git a/pkg/controller/cloud/BUILD b/pkg/controller/cloud/BUILD index 3147a210633..c6208aac976 100644 --- a/pkg/controller/cloud/BUILD +++ b/pkg/controller/cloud/BUILD @@ -16,6 +16,7 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", + "//pkg/client/informers/informers_generated/externalversions/core/v1:go_default_library", "//pkg/cloudprovider:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -37,6 +38,7 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", + "//pkg/client/informers/informers_generated/externalversions:go_default_library", "//pkg/cloudprovider:go_default_library", "//pkg/cloudprovider/providers/fake:go_default_library", "//pkg/controller:go_default_library", diff --git a/pkg/controller/cloud/nodecontroller.go b/pkg/controller/cloud/nodecontroller.go index 82ce93cad57..58e7a102125 100644 --- a/pkg/controller/cloud/nodecontroller.go +++ b/pkg/controller/cloud/nodecontroller.go @@ -32,7 +32,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/core/v1" + coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/core/v1" "k8s.io/kubernetes/pkg/cloudprovider" ) diff --git a/pkg/controller/cloud/nodecontroller_test.go b/pkg/controller/cloud/nodecontroller_test.go index 8884dd8544b..74f2267101b 100644 --- a/pkg/controller/cloud/nodecontroller_test.go +++ b/pkg/controller/cloud/nodecontroller_test.go @@ -30,7 +30,7 @@ import ( clientv1 "k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/api" - informers "k8s.io/kubernetes/pkg/client/informers/informers_generated" + informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/cloudprovider" fakecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake" "k8s.io/kubernetes/pkg/controller" @@ -99,7 +99,7 @@ func TestNodeDeleted(t *testing.T) { DeleteWaitChan: make(chan struct{}), } - factory := informers.NewSharedInformerFactory(nil, fnh, controller.NoResyncPeriodFunc()) + factory := informers.NewSharedInformerFactory(fnh, controller.NoResyncPeriodFunc()) eventBroadcaster := record.NewBroadcaster() cloudNodeController := &CloudNodeController{ diff --git a/pkg/controller/daemon/BUILD b/pkg/controller/daemon/BUILD index 82d73062528..a6eb36cdd6a 100644 --- a/pkg/controller/daemon/BUILD +++ b/pkg/controller/daemon/BUILD @@ -21,6 +21,8 @@ go_library( "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/typed/extensions/v1beta1:go_default_library", + "//pkg/client/informers/informers_generated/externalversions/core/v1:go_default_library", + "//pkg/client/informers/informers_generated/externalversions/extensions/v1beta1:go_default_library", "//pkg/client/listers/core/v1:go_default_library", "//pkg/client/listers/extensions/v1beta1:go_default_library", "//pkg/controller:go_default_library", @@ -53,6 +55,7 @@ go_test( "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", + "//pkg/client/informers/informers_generated/externalversions:go_default_library", "//pkg/controller:go_default_library", "//pkg/securitycontext:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/resource", diff --git a/pkg/controller/daemon/daemoncontroller.go b/pkg/controller/daemon/daemoncontroller.go index b9f1916bf0e..613baaf3b57 100644 --- a/pkg/controller/daemon/daemoncontroller.go +++ b/pkg/controller/daemon/daemoncontroller.go @@ -39,8 +39,8 @@ import ( extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" unversionedextensions "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1" - coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/core/v1" - extensionsinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/extensions/v1beta1" + coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/core/v1" + extensionsinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1" corelisters "k8s.io/kubernetes/pkg/client/listers/core/v1" extensionslisters "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1" "k8s.io/kubernetes/pkg/controller" diff --git a/pkg/controller/daemon/daemoncontroller_test.go b/pkg/controller/daemon/daemoncontroller_test.go index 0fef358b058..4e47c2e5237 100644 --- a/pkg/controller/daemon/daemoncontroller_test.go +++ b/pkg/controller/daemon/daemoncontroller_test.go @@ -32,7 +32,7 @@ import ( "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - informers "k8s.io/kubernetes/pkg/client/informers/informers_generated" + informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/securitycontext" ) @@ -157,7 +157,7 @@ type daemonSetsController struct { func newTestController(initialObjects ...runtime.Object) (*daemonSetsController, *controller.FakePodControl, *fake.Clientset) { clientset := fake.NewSimpleClientset(initialObjects...) - informerFactory := informers.NewSharedInformerFactory(nil, clientset, controller.NoResyncPeriodFunc()) + informerFactory := informers.NewSharedInformerFactory(clientset, controller.NoResyncPeriodFunc()) manager := NewDaemonSetsController( informerFactory.Extensions().V1beta1().DaemonSets(), diff --git a/pkg/controller/deployment/BUILD b/pkg/controller/deployment/BUILD index 6e8f5656be6..41a506c359a 100644 --- a/pkg/controller/deployment/BUILD +++ b/pkg/controller/deployment/BUILD @@ -24,6 +24,8 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", + "//pkg/client/informers/informers_generated/externalversions/core/v1:go_default_library", + "//pkg/client/informers/informers_generated/externalversions/extensions/v1beta1:go_default_library", "//pkg/client/listers/core/v1:go_default_library", "//pkg/client/listers/extensions/v1beta1:go_default_library", "//pkg/controller:go_default_library", @@ -63,6 +65,7 @@ go_test( "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", + "//pkg/client/informers/informers_generated/externalversions:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/deployment/util:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", diff --git a/pkg/controller/deployment/deployment_controller.go b/pkg/controller/deployment/deployment_controller.go index 182fcc9304e..974567ec656 100644 --- a/pkg/controller/deployment/deployment_controller.go +++ b/pkg/controller/deployment/deployment_controller.go @@ -44,8 +44,8 @@ import ( "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/core/v1" - extensionsinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/extensions/v1beta1" + coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/core/v1" + extensionsinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1" corelisters "k8s.io/kubernetes/pkg/client/listers/core/v1" extensionslisters "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1" "k8s.io/kubernetes/pkg/controller" diff --git a/pkg/controller/deployment/deployment_controller_test.go b/pkg/controller/deployment/deployment_controller_test.go index 85aed3d3db6..cbd3181facd 100644 --- a/pkg/controller/deployment/deployment_controller_test.go +++ b/pkg/controller/deployment/deployment_controller_test.go @@ -32,7 +32,7 @@ import ( "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - informers "k8s.io/kubernetes/pkg/client/informers/informers_generated" + informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/deployment/util" ) @@ -166,7 +166,7 @@ func newFixture(t *testing.T) *fixture { func (f *fixture) newController() (*DeploymentController, informers.SharedInformerFactory) { f.client = fake.NewSimpleClientset(f.objects...) - informers := informers.NewSharedInformerFactory(nil, f.client, controller.NoResyncPeriodFunc()) + informers := informers.NewSharedInformerFactory(f.client, controller.NoResyncPeriodFunc()) c := NewDeploymentController(informers.Extensions().V1beta1().Deployments(), informers.Extensions().V1beta1().ReplicaSets(), informers.Core().V1().Pods(), f.client) c.eventRecorder = &record.FakeRecorder{} c.dListerSynced = alwaysReady @@ -246,7 +246,7 @@ func TestSyncDeploymentDontDoAnythingDuringDeletion(t *testing.T) { // issue: https://github.com/kubernetes/kubernetes/issues/23218 func TestDeploymentController_dontSyncDeploymentsWithEmptyPodSelector(t *testing.T) { fake := &fake.Clientset{} - informers := informers.NewSharedInformerFactory(nil, fake, controller.NoResyncPeriodFunc()) + informers := informers.NewSharedInformerFactory(fake, controller.NoResyncPeriodFunc()) controller := NewDeploymentController(informers.Extensions().V1beta1().Deployments(), informers.Extensions().V1beta1().ReplicaSets(), informers.Core().V1().Pods(), fake) controller.eventRecorder = &record.FakeRecorder{} controller.dListerSynced = alwaysReady diff --git a/pkg/controller/deployment/recreate_test.go b/pkg/controller/deployment/recreate_test.go index 4fb0c7803a8..87ebe875b21 100644 --- a/pkg/controller/deployment/recreate_test.go +++ b/pkg/controller/deployment/recreate_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - informers "k8s.io/kubernetes/pkg/client/informers/informers_generated" + informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller" ) @@ -68,7 +68,7 @@ func TestScaleDownOldReplicaSets(t *testing.T) { } kc := fake.NewSimpleClientset(expected...) - informers := informers.NewSharedInformerFactory(nil, kc, controller.NoResyncPeriodFunc()) + informers := informers.NewSharedInformerFactory(kc, controller.NoResyncPeriodFunc()) c := NewDeploymentController(informers.Extensions().V1beta1().Deployments(), informers.Extensions().V1beta1().ReplicaSets(), informers.Core().V1().Pods(), kc) c.eventRecorder = &record.FakeRecorder{} diff --git a/pkg/controller/deployment/sync_test.go b/pkg/controller/deployment/sync_test.go index aaf0a006257..68f9c900a1a 100644 --- a/pkg/controller/deployment/sync_test.go +++ b/pkg/controller/deployment/sync_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/client-go/tools/record" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - informers "k8s.io/kubernetes/pkg/client/informers/informers_generated" + informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller" deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" ) @@ -383,7 +383,7 @@ func TestDeploymentController_cleanupDeployment(t *testing.T) { t.Logf("scenario %d", i) fake := &fake.Clientset{} - informers := informers.NewSharedInformerFactory(nil, fake, controller.NoResyncPeriodFunc()) + informers := informers.NewSharedInformerFactory(fake, controller.NoResyncPeriodFunc()) controller := NewDeploymentController(informers.Extensions().V1beta1().Deployments(), informers.Extensions().V1beta1().ReplicaSets(), informers.Core().V1().Pods(), fake) controller.eventRecorder = &record.FakeRecorder{} diff --git a/pkg/controller/disruption/BUILD b/pkg/controller/disruption/BUILD index ba03cf9dd0c..ca375e7d6f9 100644 --- a/pkg/controller/disruption/BUILD +++ b/pkg/controller/disruption/BUILD @@ -18,6 +18,10 @@ go_library( "//pkg/apis/policy/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/typed/policy/v1beta1:go_default_library", + "//pkg/client/informers/informers_generated/externalversions/apps/v1beta1:go_default_library", + "//pkg/client/informers/informers_generated/externalversions/core/v1:go_default_library", + "//pkg/client/informers/informers_generated/externalversions/extensions/v1beta1:go_default_library", + "//pkg/client/informers/informers_generated/externalversions/policy/v1beta1:go_default_library", "//pkg/client/listers/apps/v1beta1:go_default_library", "//pkg/client/listers/core/v1:go_default_library", "//pkg/client/listers/extensions/v1beta1:go_default_library", @@ -49,6 +53,7 @@ go_test( "//pkg/apis/apps/v1beta1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/apis/policy/v1beta1:go_default_library", + "//pkg/client/informers/informers_generated/externalversions:go_default_library", "//pkg/controller:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/util/intstr", diff --git a/pkg/controller/disruption/disruption.go b/pkg/controller/disruption/disruption.go index 7d251c6b883..1d89a2ba737 100644 --- a/pkg/controller/disruption/disruption.go +++ b/pkg/controller/disruption/disruption.go @@ -37,10 +37,10 @@ import ( policy "k8s.io/kubernetes/pkg/apis/policy/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" policyclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/policy/v1beta1" - appsinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/apps/v1beta1" - coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/core/v1" - extensionsinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/extensions/v1beta1" - policyinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/policy/v1beta1" + appsinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/apps/v1beta1" + coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/core/v1" + extensionsinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1" + policyinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/policy/v1beta1" appslisters "k8s.io/kubernetes/pkg/client/listers/apps/v1beta1" corelisters "k8s.io/kubernetes/pkg/client/listers/core/v1" extensionslisters "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1" diff --git a/pkg/controller/disruption/disruption_test.go b/pkg/controller/disruption/disruption_test.go index 01f8d2855ca..b729cf528aa 100644 --- a/pkg/controller/disruption/disruption_test.go +++ b/pkg/controller/disruption/disruption_test.go @@ -33,7 +33,7 @@ import ( apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" policy "k8s.io/kubernetes/pkg/apis/policy/v1beta1" - informers "k8s.io/kubernetes/pkg/client/informers/informers_generated" + informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller" ) @@ -99,7 +99,7 @@ type disruptionController struct { func newFakeDisruptionController() (*disruptionController, *pdbStates) { ps := &pdbStates{} - informerFactory := informers.NewSharedInformerFactory(nil, nil, controller.NoResyncPeriodFunc()) + informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc()) dc := NewDisruptionController( informerFactory.Core().V1().Pods(), diff --git a/pkg/controller/endpoint/BUILD b/pkg/controller/endpoint/BUILD index 533d660446c..bd1ea282e49 100644 --- a/pkg/controller/endpoint/BUILD +++ b/pkg/controller/endpoint/BUILD @@ -20,6 +20,7 @@ go_library( "//pkg/api/v1/endpoints:go_default_library", "//pkg/api/v1/pod:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", + "//pkg/client/informers/informers_generated/externalversions/core/v1:go_default_library", "//pkg/client/listers/core/v1:go_default_library", "//pkg/util/metrics:go_default_library", "//vendor:github.com/golang/glog", @@ -45,6 +46,7 @@ go_test( "//pkg/api/v1:go_default_library", "//pkg/api/v1/endpoints:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", + "//pkg/client/informers/informers_generated/externalversions:go_default_library", "//pkg/controller:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", diff --git a/pkg/controller/endpoint/endpoints_controller.go b/pkg/controller/endpoint/endpoints_controller.go index befecc5e17c..54c8b9c3344 100644 --- a/pkg/controller/endpoint/endpoints_controller.go +++ b/pkg/controller/endpoint/endpoints_controller.go @@ -35,7 +35,7 @@ import ( podutil "k8s.io/kubernetes/pkg/api/v1/pod" utilpod "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/core/v1" + coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/core/v1" corelisters "k8s.io/kubernetes/pkg/client/listers/core/v1" "k8s.io/kubernetes/pkg/util/metrics" diff --git a/pkg/controller/endpoint/endpoints_controller_test.go b/pkg/controller/endpoint/endpoints_controller_test.go index 613b519c61b..570e23ca7d0 100644 --- a/pkg/controller/endpoint/endpoints_controller_test.go +++ b/pkg/controller/endpoint/endpoints_controller_test.go @@ -33,7 +33,7 @@ import ( "k8s.io/kubernetes/pkg/api/v1" endptspkg "k8s.io/kubernetes/pkg/api/v1/endpoints" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - informers "k8s.io/kubernetes/pkg/client/informers/informers_generated" + informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller" ) @@ -101,7 +101,7 @@ type endpointController struct { func newController(url string) *endpointController { client := clientset.NewForConfigOrDie(&restclient.Config{Host: url, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) - informerFactory := informers.NewSharedInformerFactory(nil, client, controller.NoResyncPeriodFunc()) + informerFactory := informers.NewSharedInformerFactory(client, controller.NoResyncPeriodFunc()) endpoints := NewEndpointController(informerFactory.Core().V1().Pods(), informerFactory.Core().V1().Services(), client) endpoints.podsSynced = alwaysReady endpoints.servicesSynced = alwaysReady diff --git a/pkg/controller/job/BUILD b/pkg/controller/job/BUILD index e54aaab4f66..05c21f403db 100644 --- a/pkg/controller/job/BUILD +++ b/pkg/controller/job/BUILD @@ -21,6 +21,8 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/apis/batch/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", + "//pkg/client/informers/informers_generated/externalversions/batch/v1:go_default_library", + "//pkg/client/informers/informers_generated/externalversions/core/v1:go_default_library", "//pkg/client/listers/batch/v1:go_default_library", "//pkg/client/listers/core/v1:go_default_library", "//pkg/controller:go_default_library", @@ -52,6 +54,7 @@ go_test( "//pkg/apis/batch/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", + "//pkg/client/informers/informers_generated/externalversions:go_default_library", "//pkg/controller:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/equality", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", diff --git a/pkg/controller/job/jobcontroller.go b/pkg/controller/job/jobcontroller.go index cbbbc03b985..ed3eb7fa90a 100644 --- a/pkg/controller/job/jobcontroller.go +++ b/pkg/controller/job/jobcontroller.go @@ -36,8 +36,8 @@ import ( "k8s.io/kubernetes/pkg/api/v1" batch "k8s.io/kubernetes/pkg/apis/batch/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - batchinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/batch/v1" - coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/core/v1" + batchinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/batch/v1" + coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/core/v1" batchv1listers "k8s.io/kubernetes/pkg/client/listers/batch/v1" corelisters "k8s.io/kubernetes/pkg/client/listers/core/v1" "k8s.io/kubernetes/pkg/controller" diff --git a/pkg/controller/job/jobcontroller_test.go b/pkg/controller/job/jobcontroller_test.go index 99eb755ea10..4d3cb6116ce 100644 --- a/pkg/controller/job/jobcontroller_test.go +++ b/pkg/controller/job/jobcontroller_test.go @@ -34,7 +34,7 @@ import ( batch "k8s.io/kubernetes/pkg/apis/batch/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - informers "k8s.io/kubernetes/pkg/client/informers/informers_generated" + informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller" ) @@ -89,7 +89,7 @@ func getKey(job *batch.Job, t *testing.T) string { } func newJobControllerFromClient(kubeClient clientset.Interface, resyncPeriod controller.ResyncPeriodFunc) (*JobController, informers.SharedInformerFactory) { - sharedInformers := informers.NewSharedInformerFactory(nil, kubeClient, resyncPeriod()) + sharedInformers := informers.NewSharedInformerFactory(kubeClient, resyncPeriod()) jm := NewJobController(sharedInformers.Core().V1().Pods(), sharedInformers.Batch().V1().Jobs(), kubeClient) return jm, sharedInformers diff --git a/pkg/controller/node/BUILD b/pkg/controller/node/BUILD index f35f73e1036..7e9bfab94c8 100644 --- a/pkg/controller/node/BUILD +++ b/pkg/controller/node/BUILD @@ -26,6 +26,8 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", + "//pkg/client/informers/informers_generated/externalversions/core/v1:go_default_library", + "//pkg/client/informers/informers_generated/externalversions/extensions/v1beta1:go_default_library", "//pkg/client/listers/core/v1:go_default_library", "//pkg/client/listers/extensions/v1beta1:go_default_library", "//pkg/cloudprovider:go_default_library", @@ -73,6 +75,9 @@ go_test( "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", + "//pkg/client/informers/informers_generated/externalversions:go_default_library", + "//pkg/client/informers/informers_generated/externalversions/core/v1:go_default_library", + "//pkg/client/informers/informers_generated/externalversions/extensions/v1beta1:go_default_library", "//pkg/cloudprovider:go_default_library", "//pkg/cloudprovider/providers/fake:go_default_library", "//pkg/controller:go_default_library", diff --git a/pkg/controller/node/nodecontroller.go b/pkg/controller/node/nodecontroller.go index 9aaab8eaccd..2a915d7c095 100644 --- a/pkg/controller/node/nodecontroller.go +++ b/pkg/controller/node/nodecontroller.go @@ -40,8 +40,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/core/v1" - extensionsinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/extensions/v1beta1" + coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/core/v1" + extensionsinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1" corelisters "k8s.io/kubernetes/pkg/client/listers/core/v1" extensionslisters "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1" "k8s.io/kubernetes/pkg/cloudprovider" diff --git a/pkg/controller/node/nodecontroller_test.go b/pkg/controller/node/nodecontroller_test.go index beb92f57446..33333083c06 100644 --- a/pkg/controller/node/nodecontroller_test.go +++ b/pkg/controller/node/nodecontroller_test.go @@ -33,9 +33,9 @@ import ( extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - informers "k8s.io/kubernetes/pkg/client/informers/informers_generated" - coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/core/v1" - extensionsinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/extensions/v1beta1" + informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" + coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/core/v1" + extensionsinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1" "k8s.io/kubernetes/pkg/cloudprovider" fakecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake" "k8s.io/kubernetes/pkg/controller" @@ -76,7 +76,7 @@ func NewNodeControllerFromClient( nodeCIDRMaskSize int, allocateNodeCIDRs bool) (*nodeController, error) { - factory := informers.NewSharedInformerFactory(nil, kubeClient, controller.NoResyncPeriodFunc()) + factory := informers.NewSharedInformerFactory(kubeClient, controller.NoResyncPeriodFunc()) nodeInformer := factory.Core().V1().Nodes() daemonSetInformer := factory.Extensions().V1beta1().DaemonSets() diff --git a/pkg/controller/podautoscaler/BUILD b/pkg/controller/podautoscaler/BUILD index 9b1503c4ba0..013a3c80d64 100644 --- a/pkg/controller/podautoscaler/BUILD +++ b/pkg/controller/podautoscaler/BUILD @@ -24,6 +24,7 @@ go_library( "//pkg/client/clientset_generated/clientset/typed/autoscaling/v1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/extensions/v1beta1:go_default_library", + "//pkg/client/informers/informers_generated/externalversions/autoscaling/v1:go_default_library", "//pkg/client/listers/autoscaling/v1:go_default_library", "//pkg/controller/podautoscaler/metrics:go_default_library", "//vendor:github.com/golang/glog", @@ -55,6 +56,7 @@ go_test( "//pkg/apis/extensions/install:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", + "//pkg/client/informers/informers_generated/externalversions:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/podautoscaler/metrics:go_default_library", "//vendor:github.com/stretchr/testify/assert", diff --git a/pkg/controller/podautoscaler/horizontal.go b/pkg/controller/podautoscaler/horizontal.go index dac09501e1d..9a596e1b67e 100644 --- a/pkg/controller/podautoscaler/horizontal.go +++ b/pkg/controller/podautoscaler/horizontal.go @@ -36,7 +36,7 @@ import ( extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" unversionedautoscaling "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/autoscaling/v1" unversionedextensions "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1" - autoscalinginformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/autoscaling/v1" + autoscalinginformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/autoscaling/v1" autoscalinglisters "k8s.io/kubernetes/pkg/client/listers/autoscaling/v1" ) diff --git a/pkg/controller/podautoscaler/horizontal_test.go b/pkg/controller/podautoscaler/horizontal_test.go index 159026548fb..52682ce0fcd 100644 --- a/pkg/controller/podautoscaler/horizontal_test.go +++ b/pkg/controller/podautoscaler/horizontal_test.go @@ -40,7 +40,7 @@ import ( autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - informers "k8s.io/kubernetes/pkg/client/informers/informers_generated" + informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics" @@ -474,7 +474,7 @@ func (tc *testCase) runTest(t *testing.T) { podsGetter: testClient.Core(), } - informerFactory := informers.NewSharedInformerFactory(nil, testClient, controller.NoResyncPeriodFunc()) + informerFactory := informers.NewSharedInformerFactory(testClient, controller.NoResyncPeriodFunc()) hpaController := NewHorizontalController( eventClient.Core(), diff --git a/pkg/controller/podgc/BUILD b/pkg/controller/podgc/BUILD index fe009520576..14cdfcc6bf5 100644 --- a/pkg/controller/podgc/BUILD +++ b/pkg/controller/podgc/BUILD @@ -18,6 +18,7 @@ go_library( deps = [ "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", + "//pkg/client/informers/informers_generated/externalversions/core/v1:go_default_library", "//pkg/client/listers/core/v1:go_default_library", "//pkg/util/metrics:go_default_library", "//vendor:github.com/golang/glog", @@ -39,6 +40,8 @@ go_test( "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", + "//pkg/client/informers/informers_generated/externalversions:go_default_library", + "//pkg/client/informers/informers_generated/externalversions/core/v1:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/node/testutil:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", diff --git a/pkg/controller/podgc/gc_controller.go b/pkg/controller/podgc/gc_controller.go index 185428c2825..381e4fbcaf2 100644 --- a/pkg/controller/podgc/gc_controller.go +++ b/pkg/controller/podgc/gc_controller.go @@ -30,7 +30,7 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/core/v1" + coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/core/v1" corelisters "k8s.io/kubernetes/pkg/client/listers/core/v1" "k8s.io/kubernetes/pkg/util/metrics" diff --git a/pkg/controller/podgc/gc_controller_test.go b/pkg/controller/podgc/gc_controller_test.go index fa890732902..0095dc92b45 100644 --- a/pkg/controller/podgc/gc_controller_test.go +++ b/pkg/controller/podgc/gc_controller_test.go @@ -27,8 +27,8 @@ import ( "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - informers "k8s.io/kubernetes/pkg/client/informers/informers_generated" - coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/core/v1" + informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" + coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/core/v1" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/node/testutil" ) @@ -48,7 +48,7 @@ func (*FakeController) LastSyncResourceVersion() string { func alwaysReady() bool { return true } func NewFromClient(kubeClient clientset.Interface, terminatedPodThreshold int) (*PodGCController, coreinformers.PodInformer) { - informerFactory := informers.NewSharedInformerFactory(nil, kubeClient, controller.NoResyncPeriodFunc()) + informerFactory := informers.NewSharedInformerFactory(kubeClient, controller.NoResyncPeriodFunc()) podInformer := informerFactory.Core().V1().Pods() controller := NewPodGC(kubeClient, podInformer, terminatedPodThreshold) controller.podListerSynced = alwaysReady diff --git a/pkg/controller/replicaset/BUILD b/pkg/controller/replicaset/BUILD index 63bfb2d1b62..70deeceae0d 100644 --- a/pkg/controller/replicaset/BUILD +++ b/pkg/controller/replicaset/BUILD @@ -22,6 +22,8 @@ go_library( "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/typed/extensions/v1beta1:go_default_library", + "//pkg/client/informers/informers_generated/externalversions/core/v1:go_default_library", + "//pkg/client/informers/informers_generated/externalversions/extensions/v1beta1:go_default_library", "//pkg/client/listers/core/v1:go_default_library", "//pkg/client/listers/extensions/v1beta1:go_default_library", "//pkg/controller:go_default_library", @@ -54,6 +56,7 @@ go_test( "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", + "//pkg/client/informers/informers_generated/externalversions:go_default_library", "//pkg/controller:go_default_library", "//pkg/securitycontext:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/equality", diff --git a/pkg/controller/replicaset/replica_set.go b/pkg/controller/replicaset/replica_set.go index 6cc58a34555..159045def4c 100644 --- a/pkg/controller/replicaset/replica_set.go +++ b/pkg/controller/replicaset/replica_set.go @@ -43,8 +43,8 @@ import ( "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/core/v1" - extensionsinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/extensions/v1beta1" + coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/core/v1" + extensionsinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1" corelisters "k8s.io/kubernetes/pkg/client/listers/core/v1" extensionslisters "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1" "k8s.io/kubernetes/pkg/controller" diff --git a/pkg/controller/replicaset/replica_set_test.go b/pkg/controller/replicaset/replica_set_test.go index f6bfe671cfc..654a9fe0ad7 100644 --- a/pkg/controller/replicaset/replica_set_test.go +++ b/pkg/controller/replicaset/replica_set_test.go @@ -46,13 +46,13 @@ import ( "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" fakeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - informers "k8s.io/kubernetes/pkg/client/informers/informers_generated" + informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/securitycontext" ) func testNewReplicaSetControllerFromClient(client clientset.Interface, stopCh chan struct{}, burstReplicas int, lookupCacheSize int) (*ReplicaSetController, informers.SharedInformerFactory) { - informers := informers.NewSharedInformerFactory(nil, client, controller.NoResyncPeriodFunc()) + informers := informers.NewSharedInformerFactory(client, controller.NoResyncPeriodFunc()) ret := NewReplicaSetController( informers.Extensions().V1beta1().ReplicaSets(), @@ -525,7 +525,7 @@ func TestWatchControllers(t *testing.T) { client.PrependWatchReactor("replicasets", core.DefaultWatchReactor(fakeWatch, nil)) stopCh := make(chan struct{}) defer close(stopCh) - informers := informers.NewSharedInformerFactory(nil, client, controller.NoResyncPeriodFunc()) + informers := informers.NewSharedInformerFactory(client, controller.NoResyncPeriodFunc()) manager := NewReplicaSetController( informers.Extensions().V1beta1().ReplicaSets(), informers.Core().V1().Pods(), diff --git a/pkg/controller/replication/BUILD b/pkg/controller/replication/BUILD index 9bcd743ae07..da0393f2d50 100644 --- a/pkg/controller/replication/BUILD +++ b/pkg/controller/replication/BUILD @@ -21,6 +21,7 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library", + "//pkg/client/informers/informers_generated/externalversions/core/v1:go_default_library", "//pkg/client/listers/core/v1:go_default_library", "//pkg/controller:go_default_library", "//pkg/util/metrics:go_default_library", @@ -52,6 +53,8 @@ go_test( "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", + "//pkg/client/informers/informers_generated/externalversions:go_default_library", + "//pkg/client/informers/informers_generated/externalversions/core/v1:go_default_library", "//pkg/controller:go_default_library", "//pkg/securitycontext:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/equality", diff --git a/pkg/controller/replication/replication_controller.go b/pkg/controller/replication/replication_controller.go index a0c96c1d127..4940bb027a8 100644 --- a/pkg/controller/replication/replication_controller.go +++ b/pkg/controller/replication/replication_controller.go @@ -42,7 +42,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/core/v1" + coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/core/v1" corelisters "k8s.io/kubernetes/pkg/client/listers/core/v1" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/util/metrics" diff --git a/pkg/controller/replication/replication_controller_test.go b/pkg/controller/replication/replication_controller_test.go index 6c3dd5a0238..0155637dc98 100644 --- a/pkg/controller/replication/replication_controller_test.go +++ b/pkg/controller/replication/replication_controller_test.go @@ -44,8 +44,8 @@ import ( "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" fakeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - informers "k8s.io/kubernetes/pkg/client/informers/informers_generated" - coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/core/v1" + informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" + coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/core/v1" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/securitycontext" ) @@ -161,7 +161,7 @@ type serverResponse struct { } func NewReplicationManagerFromClient(kubeClient clientset.Interface, burstReplicas int, lookupCacheSize int) (*ReplicationManager, coreinformers.PodInformer, coreinformers.ReplicationControllerInformer) { - informerFactory := informers.NewSharedInformerFactory(nil, kubeClient, controller.NoResyncPeriodFunc()) + informerFactory := informers.NewSharedInformerFactory(kubeClient, controller.NoResyncPeriodFunc()) podInformer := informerFactory.Core().V1().Pods() rcInformer := informerFactory.Core().V1().ReplicationControllers() rm := NewReplicationManager(podInformer, rcInformer, kubeClient, burstReplicas, lookupCacheSize, false) @@ -456,7 +456,7 @@ func TestWatchControllers(t *testing.T) { c.AddWatchReactor("replicationcontrollers", core.DefaultWatchReactor(fakeWatch, nil)) stopCh := make(chan struct{}) defer close(stopCh) - informers := informers.NewSharedInformerFactory(nil, c, controller.NoResyncPeriodFunc()) + informers := informers.NewSharedInformerFactory(c, controller.NoResyncPeriodFunc()) podInformer := informers.Core().V1().Pods() rcInformer := informers.Core().V1().ReplicationControllers() manager := NewReplicationManager(podInformer, rcInformer, c, BurstReplicas, 0, false) diff --git a/pkg/controller/ttl/BUILD b/pkg/controller/ttl/BUILD index c1624fda0e8..a545032aecd 100644 --- a/pkg/controller/ttl/BUILD +++ b/pkg/controller/ttl/BUILD @@ -16,6 +16,7 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", + "//pkg/client/informers/informers_generated/externalversions/core/v1:go_default_library", "//pkg/client/listers/core/v1:go_default_library", "//pkg/controller:go_default_library", "//vendor:github.com/golang/glog", diff --git a/pkg/controller/ttl/ttlcontroller.go b/pkg/controller/ttl/ttlcontroller.go index 2d0b921ef77..8ed9c9daeb5 100644 --- a/pkg/controller/ttl/ttlcontroller.go +++ b/pkg/controller/ttl/ttlcontroller.go @@ -44,7 +44,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/core/v1" + informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/core/v1" listers "k8s.io/kubernetes/pkg/client/listers/core/v1" "k8s.io/kubernetes/pkg/controller" diff --git a/pkg/controller/volume/attachdetach/BUILD b/pkg/controller/volume/attachdetach/BUILD index 99a640d0762..e8e7313eb28 100644 --- a/pkg/controller/volume/attachdetach/BUILD +++ b/pkg/controller/volume/attachdetach/BUILD @@ -16,6 +16,7 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", + "//pkg/client/informers/informers_generated/externalversions/core/v1:go_default_library", "//pkg/client/listers/core/v1:go_default_library", "//pkg/cloudprovider:go_default_library", "//pkg/controller/volume/attachdetach/cache:go_default_library", @@ -43,6 +44,7 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ + "//pkg/client/informers/informers_generated/externalversions:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/volume/attachdetach/testing:go_default_library", ], diff --git a/pkg/controller/volume/attachdetach/attach_detach_controller.go b/pkg/controller/volume/attachdetach/attach_detach_controller.go index 28d826d41fb..4d9487ee48b 100644 --- a/pkg/controller/volume/attachdetach/attach_detach_controller.go +++ b/pkg/controller/volume/attachdetach/attach_detach_controller.go @@ -33,7 +33,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/core/v1" + coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/core/v1" corelisters "k8s.io/kubernetes/pkg/client/listers/core/v1" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache" diff --git a/pkg/controller/volume/attachdetach/attach_detach_controller_test.go b/pkg/controller/volume/attachdetach/attach_detach_controller_test.go index 18886a0e73a..4a7a8ebfd25 100644 --- a/pkg/controller/volume/attachdetach/attach_detach_controller_test.go +++ b/pkg/controller/volume/attachdetach/attach_detach_controller_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - informers "k8s.io/kubernetes/pkg/client/informers/informers_generated" + informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller" controllervolumetesting "k8s.io/kubernetes/pkg/controller/volume/attachdetach/testing" ) @@ -28,7 +28,7 @@ import ( func Test_NewAttachDetachController_Positive(t *testing.T) { // Arrange fakeKubeClient := controllervolumetesting.CreateTestClient() - informerFactory := informers.NewSharedInformerFactory(nil, fakeKubeClient, controller.NoResyncPeriodFunc()) + informerFactory := informers.NewSharedInformerFactory(fakeKubeClient, controller.NoResyncPeriodFunc()) // Act _, err := NewAttachDetachController( diff --git a/pkg/controller/volume/attachdetach/reconciler/BUILD b/pkg/controller/volume/attachdetach/reconciler/BUILD index ba06d5ec7f1..783c63e1192 100644 --- a/pkg/controller/volume/attachdetach/reconciler/BUILD +++ b/pkg/controller/volume/attachdetach/reconciler/BUILD @@ -30,6 +30,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api/v1:go_default_library", + "//pkg/client/informers/informers_generated/externalversions:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/volume/attachdetach/cache:go_default_library", "//pkg/controller/volume/attachdetach/statusupdater:go_default_library", diff --git a/pkg/controller/volume/attachdetach/reconciler/reconciler_test.go b/pkg/controller/volume/attachdetach/reconciler/reconciler_test.go index a926d4c5471..79110725579 100644 --- a/pkg/controller/volume/attachdetach/reconciler/reconciler_test.go +++ b/pkg/controller/volume/attachdetach/reconciler/reconciler_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/api/v1" - informers "k8s.io/kubernetes/pkg/client/informers/informers_generated" + informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache" "k8s.io/kubernetes/pkg/controller/volume/attachdetach/statusupdater" @@ -51,7 +51,7 @@ func Test_Run_Positive_DoNothing(t *testing.T) { fakeKubeClient := controllervolumetesting.CreateTestClient() fakeRecorder := &record.FakeRecorder{} ad := operationexecutor.NewOperationExecutor(operationexecutor.NewOperationGenerator(fakeKubeClient, volumePluginMgr, fakeRecorder, false /* checkNodeCapabilitiesBeforeMount */)) - informerFactory := informers.NewSharedInformerFactory(nil, fakeKubeClient, controller.NoResyncPeriodFunc()) + informerFactory := informers.NewSharedInformerFactory(fakeKubeClient, controller.NoResyncPeriodFunc()) nsu := statusupdater.NewNodeStatusUpdater( fakeKubeClient, informerFactory.Core().V1().Nodes().Lister(), asw) reconciler := NewReconciler( diff --git a/test/integration/evictions/evictions_test.go b/test/integration/evictions/evictions_test.go index c37595f8d9c..ae955d97bf3 100644 --- a/test/integration/evictions/evictions_test.go +++ b/test/integration/evictions/evictions_test.go @@ -36,7 +36,7 @@ import ( "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/policy/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - informers "k8s.io/kubernetes/pkg/client/informers/informers_generated" + informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller/disruption" "k8s.io/kubernetes/test/integration/framework" ) @@ -237,7 +237,7 @@ func rmSetup(t *testing.T) (*httptest.Server, *disruption.DisruptionController, t.Fatalf("Error in create clientset: %v", err) } resyncPeriod := 12 * time.Hour - informers := informers.NewSharedInformerFactory(nil, clientset.NewForConfigOrDie(restclient.AddUserAgent(&config, "pdb-informers")), resyncPeriod) + informers := informers.NewSharedInformerFactory(clientset.NewForConfigOrDie(restclient.AddUserAgent(&config, "pdb-informers")), resyncPeriod) rm := disruption.NewDisruptionController( informers.Core().V1().Pods(), diff --git a/test/integration/framework/BUILD b/test/integration/framework/BUILD index 30e9db081b5..ca7de5fa8c0 100644 --- a/test/integration/framework/BUILD +++ b/test/integration/framework/BUILD @@ -30,6 +30,7 @@ go_library( "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", + "//pkg/client/informers/informers_generated/externalversions:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/replication:go_default_library", "//pkg/generated/openapi:go_default_library", diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go index fbe1b6b93b3..250a92e597c 100644 --- a/test/integration/framework/master_utils.go +++ b/test/integration/framework/master_utils.go @@ -57,7 +57,7 @@ import ( "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - informers "k8s.io/kubernetes/pkg/client/informers/informers_generated" + informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller" replicationcontroller "k8s.io/kubernetes/pkg/controller/replication" "k8s.io/kubernetes/pkg/generated/openapi" @@ -122,7 +122,7 @@ func NewMasterComponents(c *Config) *MasterComponents { // TODO: caesarxuchao: remove this client when the refactoring of client libraray is done. clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}, QPS: c.QPS, Burst: c.Burst}) rcStopCh := make(chan struct{}) - informerFactory := informers.NewSharedInformerFactory(nil, clientset, controller.NoResyncPeriodFunc()) + informerFactory := informers.NewSharedInformerFactory(clientset, controller.NoResyncPeriodFunc()) controllerManager := replicationcontroller.NewReplicationManager(informerFactory.Core().V1().Pods(), informerFactory.Core().V1().ReplicationControllers(), clientset, c.Burst, 4096, false) // TODO: Support events once we can cleanly shutdown an event recorder. diff --git a/test/integration/quota/quota_test.go b/test/integration/quota/quota_test.go index f95274668db..aade89595de 100644 --- a/test/integration/quota/quota_test.go +++ b/test/integration/quota/quota_test.go @@ -37,7 +37,7 @@ import ( "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - informers "k8s.io/kubernetes/pkg/client/informers/informers_generated" + informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller" replicationcontroller "k8s.io/kubernetes/pkg/controller/replication" resourcequotacontroller "k8s.io/kubernetes/pkg/controller/resourcequota" @@ -84,7 +84,7 @@ func TestQuota(t *testing.T) { controllerCh := make(chan struct{}) defer close(controllerCh) - informers := informers.NewSharedInformerFactory(nil, clientset, controller.NoResyncPeriodFunc()) + informers := informers.NewSharedInformerFactory(clientset, controller.NoResyncPeriodFunc()) rm := replicationcontroller.NewReplicationManager( informers.Core().V1().Pods(), informers.Core().V1().ReplicationControllers(), diff --git a/test/integration/replicaset/replicaset_test.go b/test/integration/replicaset/replicaset_test.go index 733bb77b54b..3aa95c14b4f 100644 --- a/test/integration/replicaset/replicaset_test.go +++ b/test/integration/replicaset/replicaset_test.go @@ -33,7 +33,7 @@ import ( "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - informers "k8s.io/kubernetes/pkg/client/informers/informers_generated" + informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller/replicaset" "k8s.io/kubernetes/test/integration/framework" ) @@ -136,7 +136,7 @@ func rmSetup(t *testing.T, enableGarbageCollector bool) (*httptest.Server, *repl t.Fatalf("Error in create clientset: %v", err) } resyncPeriod := 12 * time.Hour - informers := informers.NewSharedInformerFactory(nil, clientset.NewForConfigOrDie(restclient.AddUserAgent(&config, "rs-informers")), resyncPeriod) + informers := informers.NewSharedInformerFactory(clientset.NewForConfigOrDie(restclient.AddUserAgent(&config, "rs-informers")), resyncPeriod) rm := replicaset.NewReplicaSetController( informers.Extensions().V1beta1().ReplicaSets(), diff --git a/test/integration/replicationcontroller/replicationcontroller_test.go b/test/integration/replicationcontroller/replicationcontroller_test.go index 16b42ba6c22..89ab232d305 100644 --- a/test/integration/replicationcontroller/replicationcontroller_test.go +++ b/test/integration/replicationcontroller/replicationcontroller_test.go @@ -32,7 +32,7 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - informers "k8s.io/kubernetes/pkg/client/informers/informers_generated" + informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller/replication" "k8s.io/kubernetes/test/integration/framework" ) @@ -134,7 +134,7 @@ func rmSetup(t *testing.T, stopCh chan struct{}, enableGarbageCollector bool) (* } resyncPeriod := 12 * time.Hour - informers := informers.NewSharedInformerFactory(nil, clientSet, resyncPeriod) + informers := informers.NewSharedInformerFactory(clientSet, resyncPeriod) rm := replication.NewReplicationManager(informers.Core().V1().Pods(), informers.Core().V1().ReplicationControllers(), clientSet, replication.BurstReplicas, 4096, enableGarbageCollector) informers.Start(stopCh) diff --git a/test/integration/ttlcontroller/ttlcontroller_test.go b/test/integration/ttlcontroller/ttlcontroller_test.go index 1cb93c7d7f5..6b04a07cf2b 100644 --- a/test/integration/ttlcontroller/ttlcontroller_test.go +++ b/test/integration/ttlcontroller/ttlcontroller_test.go @@ -32,7 +32,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - informers "k8s.io/kubernetes/pkg/client/informers/informers_generated" + informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" listers "k8s.io/kubernetes/pkg/client/listers/core/v1" "k8s.io/kubernetes/pkg/controller/ttl" "k8s.io/kubernetes/test/integration/framework" @@ -46,7 +46,7 @@ func createClientAndInformers(t *testing.T, server *httptest.Server) (*clientset } testClient := clientset.NewForConfigOrDie(&config) - informers := informers.NewSharedInformerFactory(nil, testClient, time.Second) + informers := informers.NewSharedInformerFactory(testClient, time.Second) return testClient, informers } diff --git a/test/integration/volume/attach_detach_test.go b/test/integration/volume/attach_detach_test.go index f1b06f2fc1c..42ae3d5a146 100644 --- a/test/integration/volume/attach_detach_test.go +++ b/test/integration/volume/attach_detach_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - informers "k8s.io/kubernetes/pkg/client/informers/informers_generated" + informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" fakecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake" "k8s.io/kubernetes/pkg/controller/volume/attachdetach" "k8s.io/kubernetes/pkg/volume" @@ -193,7 +193,7 @@ func createAdClients(ns *v1.Namespace, t *testing.T, server *httptest.Server, sy } plugins := []volume.VolumePlugin{plugin} cloud := &fakecloud.FakeCloud{} - informers := informers.NewSharedInformerFactory(nil, testClient, resyncPeriod) + informers := informers.NewSharedInformerFactory(testClient, resyncPeriod) ctrl, err := attachdetach.NewAttachDetachController( testClient, informers.Core().V1().Pods(),