From 63bc28fa1ea298d8bb2a8bd06d55cf39a6c162d2 Mon Sep 17 00:00:00 2001 From: Yang Le Date: Mon, 19 Apr 2021 13:33:01 +0800 Subject: [PATCH] include cluster name in name of client cert controller Signed-off-by: Yang Le --- pkg/spoke/spokeagent.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/spoke/spokeagent.go b/pkg/spoke/spokeagent.go index bfb71fb22..2ecc842e4 100644 --- a/pkg/spoke/spokeagent.go +++ b/pkg/spoke/spokeagent.go @@ -172,6 +172,7 @@ func (o *SpokeAgentOptions) RunSpokeAgent(ctx context.Context, controllerContext return err } + controllerName := fmt.Sprintf("BootstrapClientCertController@cluster:%s", o.ClusterName) clientCertForHubController := managedcluster.NewClientCertForHubController( o.ClusterName, o.AgentName, o.ComponentNamespace, o.HubKubeconfigSecret, kubeconfigData, @@ -180,7 +181,7 @@ func (o *SpokeAgentOptions) RunSpokeAgent(ctx context.Context, controllerContext bootstrapInformerFactory.Certificates().V1().CertificateSigningRequests(), namespacedSpokeKubeInformerFactory.Core().V1().Secrets(), controllerContext.EventRecorder, - "BootstrapClientCertForHubController", + controllerName, ) bootstrapCtx, stopBootstrap := context.WithCancel(ctx) @@ -245,6 +246,7 @@ func (o *SpokeAgentOptions) RunSpokeAgent(ctx context.Context, controllerContext } // create another ClientCertForHubController for client certificate rotation + controllerName := fmt.Sprintf("ClientCertController@cluster:%s", o.ClusterName) clientCertForHubController := managedcluster.NewClientCertForHubController( o.ClusterName, o.AgentName, o.ComponentNamespace, o.HubKubeconfigSecret, kubeconfigData, @@ -253,7 +255,7 @@ func (o *SpokeAgentOptions) RunSpokeAgent(ctx context.Context, controllerContext hubKubeInformerFactory.Certificates().V1().CertificateSigningRequests(), namespacedSpokeKubeInformerFactory.Core().V1().Secrets(), controllerContext.EventRecorder, - "ClientCertForHubController", + controllerName, ) // create ManagedClusterJoiningController to reconcile instances of ManagedCluster on the managed cluster