Merge pull request #128340 from googs1025/automated-cherry-pick-of-#127834-upstream-release-1.31

Automated cherry pick of #127834: fix(leaderelection): nil check in OnStoppedLeading func
2024-11-12 10:18:46 +00:00
parent f7d6fad111 c94baacfff
commit 11d2b4d7ed
1 changed files with 3 additions and 1 deletions
--- a/pkg/controlplane/controller/leaderelection/run_with_leaderelection.go
+++ b/pkg/controlplane/controller/leaderelection/run_with_leaderelection.go
@@ -50,7 +50,9 @@ func RunWithLeaderElection(ctx context.Context, config *rest.Config, newRunnerFn
 			run(ctx, 1)
 		},
 		OnStoppedLeading: func() {
+			if cancel != nil {
 				cancel()
+			}
 		},
 	}