Merge pull request #8391 from honza/leader-election

OCPBUGS-33493: Enable leader election for baremetal operator

Author: openshift-merge-bot[bot]

data/data/bootstrap/baremetal/files/etc/containers/systemd/metal3-baremetal-operator.container

@@ -8,7 +8,7 @@ After=network-online.target ironic-volume.service build-ironic-env.service image
 [Container]
 ContainerName=baremetal-operator
 Image=$METAL3_BAREMETAL_OPERATOR_IMAGE
-Exec=/baremetal-operator -build-preprov-image -webhook-port 0
+Exec=/baremetal-operator -build-preprov-image -webhook-port 0 -enable-leader-election -namespace openshift-machine-api
 Network=host
 Volume=${AUTH_DIR}:/auth:z,ro
 Volume=/opt/openshift:/opt/openshift:z,ro
@@ -19,6 +19,9 @@ Environment="IRONIC_KERNEL_PARAMS=${IRONIC_KERNEL_PARAMS}"
 Environment="HTTP_PORT=${HTTP_PORT}"
 Environment="IRONIC_ENDPOINT=${IRONIC_ENDPOINT}"
 Environment="IRONIC_EXTERNAL_URL_V6=${IRONIC_EXTERNAL_URL_V6}"
+Environment="LEASE_DURATION_SECONDS=137"
+Environment="RENEW_DEADLINE_SECONDS=107"
+Environment="RETRY_PERIOD_SECONDS=26"
 
 [Service]
 EnvironmentFile=/etc/metal3.env

data/data/bootstrap/baremetal/files/usr/local/bin/master-bmh-update.sh

@@ -25,12 +25,6 @@ while systemctl is-active metal3-baremetal-operator.service; do
     sleep 10
 done
 
-echo "Unpause provisioning"
-while ! oc annotate --overwrite provisioning provisioning-configuration "provisioning.metal3.io/paused-" ; do
-    sleep 5
-    echo "Unpause failed, retrying"
-done
-
 echo "Unpause all baremetal hosts"
 while ! oc annotate --overwrite -n openshift-machine-api baremetalhosts --all "baremetalhost.metal3.io/paused-" ; do
     sleep 5

data/data/manifests/openshift/baremetal-provisioning-config.yaml.template

@@ -2,10 +2,6 @@ apiVersion: metal3.io/v1alpha1
 kind: Provisioning
 metadata:
   name: provisioning-configuration
-  annotations:
-    # We want to pause the metal3 provisioning services until we can be sure
-    # that all control plane nodes are ready.
-    provisioning.metal3.io/paused: "true"
 spec:
   provisioningInterface: "{{.Baremetal.ProvisioningNetworkInterface}}"
   provisioningIP: "{{.Baremetal.ClusterProvisioningIP}}"