OCPBUGS-25766: manifests/0000_31_cluster-baremetal-operator_06_deployment: Enable leader election

config/cluster-baremetal-operator/cluster-baremetal-operator.yaml

@@ -12,6 +12,8 @@ spec:
   selector:
     matchLabels:
       k8s-app: cluster-baremetal-operator
+  strategy:
+    type: Recreate
   template:
     metadata:
       annotations:
@@ -26,6 +28,8 @@ spec:
         image: registry.ci.openshift.org/openshift:cluster-baremetal-operator
         command:
         - "/usr/bin/cluster-baremetal-operator"
+        args:
+        - --enable-leader-election
         env:
         - name: RELEASE_VERSION
           value: "0.0.1-snapshot"

config/rbac/kustomization.yaml

@@ -6,11 +6,17 @@ commonAnnotations:
 resources:
 - role.yaml
 - role_binding.yaml
-#- leader_election_role.yaml
-#- leader_election_role_binding.yaml
 # Comment the following 3 lines if you want to disable
 # the auth proxy (https://github.com/brancz/kube-rbac-proxy)
 # which protects your /metrics endpoint.
 #- auth_proxy_service.yaml
 #- auth_proxy_role.yaml
 #- auth_proxy_role_binding.yaml
+
+patchesJson6902:
+- target:
+    group: rbac.authorization.k8s.io
+    version: v1
+    kind: Role
+    name: cluster-baremetal-operator
+  path: patches/leader_election_role.yaml

config/rbac/patches/leader_election_role.yaml

@@ -0,0 +1,16 @@
+# The following patch enables Lease management for leader election.
+- op: add
+  path: /rules/-
+  value:
+    apiGroups:
+    - coordination.k8s.io
+    resources:
+    - leases
+    verbs:
+    - create
+    - delete
+    - get
+    - list
+    - patch
+    - update
+    - watch

controllers/provisioning_controller.go

@@ -593,25 +593,8 @@ func (r *ProvisioningReconciler) updateProvisioningMacAddresses(ctx context.Cont
 // SetupWithManager configures the manager to run the controller
 func (r *ProvisioningReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	ctx := context.Background()
-	err := r.ensureClusterOperator()
-	if err != nil {
-		return errors.Wrap(err, "unable to set get baremetal ClusterOperator")
-	}
-
-	// Check the Platform Type to determine the state of the CO
-	enabled := IsEnabled(r.EnabledFeatures)
-
-	// If Platform is BareMetal, we could still be missing the Provisioning CR
-	if enabled {
-		baremetalConfig, err := r.readProvisioningCR(context.Background())
-		if err != nil || baremetalConfig == nil {
-			err = r.updateCOStatus(ReasonProvisioningCRNotFound, "Waiting for Provisioning CR on BareMetal Platform", "")
-			if err != nil {
-				return fmt.Errorf("unable to put %q ClusterOperator in Available state: %w", clusterOperatorName, err)
-			}
-		}
-	}
 
+	var err error
 	r.NetworkStack, err = r.networkStackFromServiceNetwork(ctx)
 	if err != nil {
 		return fmt.Errorf("unable to determine network stack from service network: %w", err)

main.go

@@ -98,7 +98,9 @@ func main() {
 		}),
 		NewCache: cache.MultiNamespacedCacheBuilder(
 			[]string{controllers.ComponentNamespace, provisioning.OpenshiftConfigNamespace}),
-		LeaderElection: enableLeaderElection,
+		LeaderElection:          enableLeaderElection,
+		LeaderElectionID:        "cluster-baremetal-operator",
+		LeaderElectionNamespace: controllers.ComponentNamespace,
 	})
 	if err != nil {
 		klog.ErrorS(err, "unable to start manager")

manifests/0000_31_cluster-baremetal-operator_05_rbac.yaml

@@ -60,6 +60,18 @@ rules:
   - securitycontextconstraints
   verbs:
   - use
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

manifests/0000_31_cluster-baremetal-operator_06_deployment.yaml

@@ -15,6 +15,8 @@ spec:
   selector:
     matchLabels:
       k8s-app: cluster-baremetal-operator
+  strategy:
+    type: Recreate
   template:
     metadata:
       annotations:
@@ -26,7 +28,9 @@ spec:
         k8s-app: cluster-baremetal-operator
     spec:
       containers:
-      - command:
+      - args:
+        - --enable-leader-election
+        command:
         - /usr/bin/cluster-baremetal-operator
         env:
         - name: RELEASE_VERSION