Merge pull request #237 from odvarkadaniel/leader-election-release

OCPBUGS-18056: Address long acquire times during upgrade
openshift · Sep 6, 2023 · edb6246 · edb6246
2 parents c49a354 + 9ce2f52
commit edb6246
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/cmd/control-plane-machine-set-operator/main.go b/cmd/control-plane-machine-set-operator/main.go
@@ -108,17 +108,18 @@ func main() { //nolint:funlen,cyclop
 	})
 
 	mgr, err := ctrl.NewManager(cfg, ctrl.Options{
-		Scheme:                  scheme,
-		MetricsBindAddress:      metricsAddr,
-		Port:                    webhookPort,
-		HealthProbeBindAddress:  probeAddr,
-		LeaderElectionNamespace: leaderElectionConfig.ResourceNamespace,
-		LeaderElection:          leaderElectionConfig.LeaderElect,
-		LeaderElectionID:        leaderElectionConfig.ResourceName,
-		LeaseDuration:           &le.LeaseDuration.Duration,
-		RetryPeriod:             &le.RetryPeriod.Duration,
-		RenewDeadline:           &le.RenewDeadline.Duration,
-		Namespace:               managedNamespace,
+		Scheme:                        scheme,
+		MetricsBindAddress:            metricsAddr,
+		Port:                          webhookPort,
+		HealthProbeBindAddress:        probeAddr,
+		LeaderElectionNamespace:       leaderElectionConfig.ResourceNamespace,
+		LeaderElection:                leaderElectionConfig.LeaderElect,
+		LeaderElectionID:              leaderElectionConfig.ResourceName,
+		LeaderElectionReleaseOnCancel: true,
+		LeaseDuration:                 &le.LeaseDuration.Duration,
+		RetryPeriod:                   &le.RetryPeriod.Duration,
+		RenewDeadline:                 &le.RenewDeadline.Duration,
+		Namespace:                     managedNamespace,
 		// Do a full resync to catch up in case of missing events.
 		SyncPeriod: &defaultSyncPeriod,
 	})