From e458cfe02ccb3b816f86d8025c03da67eae3ff0d Mon Sep 17 00:00:00 2001 From: Mikhail Mazurskiy Date: Sat, 9 Jun 2018 13:06:23 +1000 Subject: [PATCH] Rename context --- cmd/kube-controller-manager/app/controllermanager.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go index f3d45b2d13c..1e270069595 100644 --- a/cmd/kube-controller-manager/app/controllermanager.go +++ b/cmd/kube-controller-manager/app/controllermanager.go @@ -145,7 +145,7 @@ func Run(c *config.CompletedConfig) error { } } - run := func(runCtx context.Context) { + run := func(ctx context.Context) { rootClientBuilder := controller.SimpleControllerClientBuilder{ ClientConfig: c.Kubeconfig, } @@ -165,18 +165,18 @@ func Run(c *config.CompletedConfig) error { } else { clientBuilder = rootClientBuilder } - ctx, err := CreateControllerContext(c, rootClientBuilder, clientBuilder, runCtx.Done()) + controllerContext, err := CreateControllerContext(c, rootClientBuilder, clientBuilder, ctx.Done()) if err != nil { glog.Fatalf("error building controller context: %v", err) } saTokenControllerInitFunc := serviceAccountTokenControllerStarter{rootClientBuilder: rootClientBuilder}.startServiceAccountTokenController - if err := StartControllers(ctx, saTokenControllerInitFunc, NewControllerInitializers(ctx.LoopMode)); err != nil { + if err := StartControllers(controllerContext, saTokenControllerInitFunc, NewControllerInitializers(controllerContext.LoopMode)); err != nil { glog.Fatalf("error starting controllers: %v", err) } - ctx.InformerFactory.Start(ctx.Stop) - close(ctx.InformersStarted) + controllerContext.InformerFactory.Start(controllerContext.Stop) + close(controllerContext.InformersStarted) select {} }