From e7ffd2bed693b7d34954f953ed262a211adeebd5 Mon Sep 17 00:00:00 2001 From: rfyiamcool Date: Fri, 30 Jun 2023 11:29:02 +0800 Subject: [PATCH] fix: set leaderelection's ctx that can sense signal in controller Signed-off-by: rfyiamcool --- cmd/controller-manager/app/server.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmd/controller-manager/app/server.go b/cmd/controller-manager/app/server.go index eeca173fce..44c2d8aade 100644 --- a/cmd/controller-manager/app/server.go +++ b/cmd/controller-manager/app/server.go @@ -40,6 +40,7 @@ import ( "volcano.sh/volcano/pkg/controllers/framework" "volcano.sh/volcano/pkg/controllers/job" "volcano.sh/volcano/pkg/kube" + "volcano.sh/volcano/pkg/signals" ) const ( @@ -65,8 +66,10 @@ func Run(opt *options.ServerOption) error { run := startControllers(config, opt) + ctx := signals.SetupSignalContext() + if !opt.EnableLeaderElection { - run(context.TODO()) + run(ctx) return fmt.Errorf("finished without leader elect") } @@ -100,7 +103,7 @@ func Run(opt *options.ServerOption) error { return fmt.Errorf("couldn't create resource lock: %v", err) } - leaderelection.RunOrDie(context.TODO(), leaderelection.LeaderElectionConfig{ + leaderelection.RunOrDie(ctx, leaderelection.LeaderElectionConfig{ Lock: rl, LeaseDuration: leaseDuration, RenewDeadline: renewDeadline,