From: Todd Malsbary <todd.malsbary@intel.com>
Date: Thu, 2 Dec 2021 18:30:16 +0000 (-0800)
Subject: Increase robustness of control plane wait
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=f67da3090f4e3632f5bf162d21ec832a9211ff1b;hp=7f5b95aaf15bca22ac6506ac5e1b5db0d0437222;p=icn.git

Increase robustness of control plane wait

Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Change-Id: Ifa5c051aa2435f27b3dc9a8d934b510118ed070c
---

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 {