fix nits

openshift · Feb 10, 2022 · a93d87b · a93d87b
1 parent 86248b9
commit a93d87b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/manifests/40-rbac.yaml b/manifests/40-rbac.yaml
@@ -65,7 +65,7 @@ rules:
 - apiGroups: ["machineconfiguration.openshift.io"]
   resources: ["machineconfigpools"]
   verbs: ["get","list","watch"]
-# Needed by new leases mechanism.
+# Needed by the leases mechanism.
 - apiGroups: ["coordination.k8s.io"]
   resources: ["leases"]
   verbs: ["create","get","update","patch"]

diff --git a/pkg/util/leaderelection.go b/pkg/util/leaderelection.go
@@ -22,14 +22,16 @@ func GetLeaderElectionConfig(restcfg *rest.Config, enabled bool) configv1.Leader
 		"", "",
 	)
 
-	if enabled {
-		if infra, err := clusterstatus.GetClusterInfraStatus(context.TODO(), restcfg); err == nil && infra != nil {
-			if infra.ControlPlaneTopology == configv1.SingleReplicaTopologyMode {
-				return leaderelection.LeaderElectionSNOConfig(defaultLeaderElection)
-			}
-		} else {
-			klog.Warningf("unable to get cluster infrastructure status, using HA cluster values for leader election: %v", err)
+	if !enabled {
+		return defaultLeaderElection
+	}
+
+	if infra, err := clusterstatus.GetClusterInfraStatus(context.TODO(), restcfg); err == nil && infra != nil {
+		if infra.ControlPlaneTopology == configv1.SingleReplicaTopologyMode {
+			return leaderelection.LeaderElectionSNOConfig(defaultLeaderElection)
 		}
+	} else {
+		klog.Warningf("unable to get cluster infrastructure status, using HA cluster values for leader election: %v", err)
 	}
 
 	return defaultLeaderElection