From 4f20a72ea00bb2eac43b636dbdfbb45f333fed98 Mon Sep 17 00:00:00 2001 From: gccio Date: Tue, 12 Sep 2023 23:23:43 +0800 Subject: [PATCH] variable name should not conflit with import package, replace the variable name --- cmd/kube-controller-manager/app/controllermanager.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go index b60dba90e20..6a6e2e1e9a5 100644 --- a/cmd/kube-controller-manager/app/controllermanager.go +++ b/cmd/kube-controller-manager/app/controllermanager.go @@ -653,7 +653,7 @@ func (c serviceAccountTokenControllerStarter) startServiceAccountTokenController if err != nil { return nil, false, fmt.Errorf("failed to build token generator: %v", err) } - controller, err := serviceaccountcontroller.NewTokensController( + tokenController, err := serviceaccountcontroller.NewTokensController( controllerContext.InformerFactory.Core().V1().ServiceAccounts(), controllerContext.InformerFactory.Core().V1().Secrets(), c.rootClientBuilder.ClientOrDie("tokens-controller"), @@ -665,7 +665,7 @@ func (c serviceAccountTokenControllerStarter) startServiceAccountTokenController if err != nil { return nil, true, fmt.Errorf("error creating Tokens controller: %v", err) } - go controller.Run(ctx, int(controllerContext.ComponentConfig.SAController.ConcurrentSATokenSyncs)) + go tokenController.Run(ctx, int(controllerContext.ComponentConfig.SAController.ConcurrentSATokenSyncs)) // start the first set of informers now so that other controllers can start controllerContext.InformerFactory.Start(ctx.Done())