Revert "Release leader election on manager exit (openshift#773)" (ope…

…nshift#797) This reverts commit 8f21a27.
jmencak · Sep 19, 2023 · c2ba801 · c2ba801
1 parent 8f21a27
commit c2ba801
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/cmd/cluster-node-tuning-operator/main.go b/cmd/cluster-node-tuning-operator/main.go
@@ -119,16 +119,15 @@ func operatorRun() {
 	restConfig := ctrl.GetConfigOrDie()
 	le := util.GetLeaderElectionConfig(restConfig, enableLeaderElection)
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
-		NewCache:                      cache.MultiNamespacedCacheBuilder(namespaces),
-		Scheme:                        scheme,
-		LeaderElection:                true,
-		LeaderElectionID:              config.OperatorLockName,
-		LeaderElectionNamespace:       ntoNamespace,
-		LeaderElectionReleaseOnCancel: true,
-		LeaseDuration:                 &le.LeaseDuration.Duration,
-		RetryPeriod:                   &le.RetryPeriod.Duration,
-		RenewDeadline:                 &le.RenewDeadline.Duration,
-		Namespace:                     ntoNamespace,
+		NewCache:                cache.MultiNamespacedCacheBuilder(namespaces),
+		Scheme:                  scheme,
+		LeaderElection:          true,
+		LeaderElectionID:        config.OperatorLockName,
+		LeaderElectionNamespace: ntoNamespace,
+		LeaseDuration:           &le.LeaseDuration.Duration,
+		RetryPeriod:             &le.RetryPeriod.Duration,
+		RenewDeadline:           &le.RenewDeadline.Duration,
+		Namespace:               ntoNamespace,
 	})
 
 	if err != nil {