From f67da3090f4e3632f5bf162d21ec832a9211ff1b Mon Sep 17 00:00:00 2001 From: Todd Malsbary Date: Thu, 2 Dec 2021 10:30:16 -0800 Subject: [PATCH] Increase robustness of control plane wait Signed-off-by: Todd Malsbary Change-Id: Ifa5c051aa2435f27b3dc9a8d934b510118ed070c --- deploy/site/vm/vm.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/deploy/site/vm/vm.sh b/deploy/site/vm/vm.sh index 0d79743..8dcc359 100755 --- a/deploy/site/vm/vm.sh +++ b/deploy/site/vm/vm.sh @@ -41,7 +41,11 @@ function is_cluster_ready { } function is_control_plane_ready { - [[ $(kubectl --kubeconfig=${BUILDDIR}/e2etest-admin.conf get nodes -l node-role.kubernetes.io/control-plane -o jsonpath='{range .items[*]}{.status.conditions[?(@.type=="Ready")].status}{"\n"}{end}' | grep -c -v True) == 0 ]] + # Checking the Cluster resource status is not sufficient, it + # reports the control plane as ready before the nodes forming the + # control plane are ready + local -r replicas=$(kubectl -n metal3 get kubeadmcontrolplane e2etest -o jsonpath='{.spec.replicas}') + [[ $(kubectl --kubeconfig=${BUILDDIR}/e2etest-admin.conf get nodes -l node-role.kubernetes.io/control-plane -o jsonpath='{range .items[*]}{.status.conditions[?(@.type=="Ready")].status}{"\n"}{end}' | grep -c True) == ${replicas} ]] } function wait_for_all_ready { -- 2.16.6