Merge pull request #128340 from googs1025/automated-cherry-pick-of-#1…

…27834-upstream-release-1.31 Automated cherry pick of #127834: fix(leaderelection): nil check in OnStoppedLeading func
kubernetes · Nov 12, 2024 · 11d2b4d · 11d2b4d
2 parents f7d6fad + c94baac
commit 11d2b4d
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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() {
-			cancel()
+			if cancel != nil {
+				cancel()
+			}
 		},
 	}