From 3f9a825d856857ea747e535f30712a1d65eba707 Mon Sep 17 00:00:00 2001 From: Shintaro Murakami Date: Mon, 15 Apr 2019 19:38:47 +0900 Subject: [PATCH] Pass appropriate context to leaderelector.Run --- pkg/manager/internal.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkg/manager/internal.go b/pkg/manager/internal.go index 60138b904c..1ca1f08d9c 100644 --- a/pkg/manager/internal.go +++ b/pkg/manager/internal.go @@ -309,7 +309,16 @@ func (cm *controllerManager) startLeaderElection() (err error) { return err } + ctx, cancel := context.WithCancel(context.Background()) + go func() { + select { + case <-cm.internalStop: + cancel() + case <-ctx.Done(): + } + }() + // Start the leader elector process - go l.Run(context.Background()) + go l.Run(ctx) return nil }