Skip to content

Commit 687b32d

Browse files
committed
OCPBUGS-6265: When installing SNO with bootstrap in place it takes CVO 6 minutes to acquire the leader lease
This is a workaround for the above issue, this code delete the cvo lease that was created during bootstrapping, allowing cvo to start faster without waiting for the lease to end.
1 parent 9231442 commit 687b32d

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

data/data/bootstrap/bootstrap-in-place/files/opt/openshift/bootstrap-in-place/bootstrap-in-place-post-reboot.sh

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,23 @@ function signal_bootstrap_complete {
2424
done
2525
}
2626

27+
function release_cvo_lease {
28+
if [ ! -f /opt/openshift/release_cvo_lease.done ]
29+
then
30+
until [ "$(oc get leases -n openshift-cluster-version version | grep -c "version")" -eq 0 ];
31+
do
32+
echo "Deleting openshift-cluster-version version lease"
33+
oc delete leases -n openshift-cluster-version version || sleep 5
34+
done
35+
until [ "$(oc get cm -n openshift-cluster-version version | grep -c "version")" -eq 0 ];
36+
do
37+
echo "Deleting openshift-cluster-version version cm"
38+
oc delete cm -n openshift-cluster-version version || sleep 5
39+
done
40+
touch /opt/openshift/expedite_bootstrapping.done
41+
fi
42+
}
43+
2744
function restart_kubelet {
2845
echo "Waiting for kube-apiserver-operator"
2946
until [ "$(oc get pod -n openshift-kube-apiserver-operator --selector='app=kube-apiserver-operator' -o jsonpath='{.items[*].status.conditions[?(@.type=="Ready")].status}' | grep -c "True")" -eq 1 ];
@@ -98,6 +115,7 @@ function clean {
98115

99116
wait_for_api
100117
signal_bootstrap_complete
118+
release_cvo_lease
101119
restore_cvo_overrides
102120
approve_csr
103121
restart_kubelet

0 commit comments

Comments
 (0)