github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename context

pull/8/head
Mikhail Mazurskiy 2018-06-09 13:06:23 +10:00
parent 102090d1f1
commit e458cfe02c
No known key found for this signature in database
GPG Key ID: 93551ECC96E2F568
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,7 +145,7 @@ func Run(c *config.CompletedConfig) error {
} }
} }
run := func(runCtx context.Context) { run := func(ctx context.Context) {
rootClientBuilder := controller.SimpleControllerClientBuilder{ rootClientBuilder := controller.SimpleControllerClientBuilder{
ClientConfig: c.Kubeconfig, ClientConfig: c.Kubeconfig,
} }
@ -165,18 +165,18 @@ func Run(c *config.CompletedConfig) error {
} else { } else {
clientBuilder = rootClientBuilder clientBuilder = rootClientBuilder
} }
ctx, err := CreateControllerContext(c, rootClientBuilder, clientBuilder, runCtx.Done()) controllerContext, err := CreateControllerContext(c, rootClientBuilder, clientBuilder, ctx.Done())
if err != nil { if err != nil {
glog.Fatalf("error building controller context: %v", err) glog.Fatalf("error building controller context: %v", err)
} }
saTokenControllerInitFunc := serviceAccountTokenControllerStarter{rootClientBuilder: rootClientBuilder}.startServiceAccountTokenController 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) glog.Fatalf("error starting controllers: %v", err)
} }
ctx.InformerFactory.Start(ctx.Stop) controllerContext.InformerFactory.Start(controllerContext.Stop)
close(ctx.InformersStarted) close(controllerContext.InformersStarted)
select {} select {}
} }