github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 19:23:40 +00:00
Code Issues Projects Releases Wiki Activity

variable name should not conflit with import package, replace the variable name

Browse Source
This commit is contained in:
gccio 2023-09-12 23:23:43 +08:00
parent e2b03d41c5
commit 4f20a72ea0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kube-controller-manager/app/controllermanager.go
View File

@ -653,7 +653,7 @@ func (c serviceAccountTokenControllerStarter) startServiceAccountTokenController
if err != nil { if err != nil {
return nil, false, fmt.Errorf("failed to build token generator: %v", err) 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().ServiceAccounts(),
controllerContext.InformerFactory.Core().V1().Secrets(), controllerContext.InformerFactory.Core().V1().Secrets(),
c.rootClientBuilder.ClientOrDie("tokens-controller"), c.rootClientBuilder.ClientOrDie("tokens-controller"),
@ -665,7 +665,7 @@ func (c serviceAccountTokenControllerStarter) startServiceAccountTokenController
if err != nil { if err != nil {
return nil, true, fmt.Errorf("error creating Tokens controller: %v", err) 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 // start the first set of informers now so that other controllers can start
controllerContext.InformerFactory.Start(ctx.Done()) controllerContext.InformerFactory.Start(ctx.Done())