From 3521ebd1e7d75195fcb3468a51793baa5b00f58d Mon Sep 17 00:00:00 2001 From: andrewsykim Date: Fri, 19 Oct 2018 17:01:13 -0400 Subject: [PATCH] pass in stopCh for GCE cluster ID controller --- pkg/cloudprovider/providers/gce/gce.go | 2 +- pkg/cloudprovider/providers/gce/gce_clusterid.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/cloudprovider/providers/gce/gce.go b/pkg/cloudprovider/providers/gce/gce.go index 857c266fcf3..794bf85efd3 100644 --- a/pkg/cloudprovider/providers/gce/gce.go +++ b/pkg/cloudprovider/providers/gce/gce.go @@ -620,7 +620,7 @@ func (gce *GCECloud) Initialize(clientBuilder cloudprovider.ControllerClientBuil gce.eventRecorder = gce.eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "gce-cloudprovider"}) } - go gce.watchClusterID() + go gce.watchClusterID(stop) } // LoadBalancer returns an implementation of LoadBalancer for Google Compute Engine. diff --git a/pkg/cloudprovider/providers/gce/gce_clusterid.go b/pkg/cloudprovider/providers/gce/gce_clusterid.go index 46b4ff4f6a0..80e54bd1723 100644 --- a/pkg/cloudprovider/providers/gce/gce_clusterid.go +++ b/pkg/cloudprovider/providers/gce/gce_clusterid.go @@ -59,7 +59,7 @@ type ClusterID struct { } // Continually watches for changes to the cluster id config map -func (gce *GCECloud) watchClusterID() { +func (gce *GCECloud) watchClusterID(stop <-chan struct{}) { gce.ClusterID = ClusterID{ cfgMapKey: fmt.Sprintf("%v/%v", UIDNamespace, UIDConfigMapName), client: gce.client, @@ -105,7 +105,7 @@ func (gce *GCECloud) watchClusterID() { var controller cache.Controller gce.ClusterID.store, controller = cache.NewInformer(newSingleObjectListerWatcher(listerWatcher, UIDConfigMapName), &v1.ConfigMap{}, updateFuncFrequency, mapEventHandler) - controller.Run(nil) + controller.Run(stop) } // GetID returns the id which is unique to this cluster