github/open-cluster-management
1
0
Fork 0
mirror of https://github.com/open-cluster-management-io/ocm.git synced 2026-05-09 18:57:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #136 from elgnay/update_controller_name

Browse Source 
include cluster name in name of client cert controller
This commit is contained in:
OpenShift Merge Robot
2021-04-19 23:36:04 -04:00
committed by GitHub
parent f6d45dab3c 63bc28fa1e
commit eaab210e7f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/spoke/spokeagent.go
View File

@@ -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