Increase robustness of control plane wait

[icn.git] / deploy / site / vm / vm.sh

diff --git a/deploy/site/vm/vm.sh b/deploy/site/vm/vm.sh
index 2d89d17..8dcc359 100755 (executable)
--- a/deploy/site/vm/vm.sh
+++ b/deploy/site/vm/vm.sh
@@ -13,17 +13,27 @@ function build {
     SSH_AUTHORIZED_KEY=$(cat ${HOME}/.ssh/id_rsa.pub)
     # Use ! instead of usual / to avoid escaping / in
     # SSH_AUTHORIZED_KEY
-    sed -e 's!sshAuthorizedKey: .*!sshAuthorizedKey: '"${SSH_AUTHORIZED_KEY}"'!' ${SCRIPTDIR}/clusters-values.yaml >${BUILDDIR}/clusters-values.yaml
+    sed -e 's!sshAuthorizedKey: .*!sshAuthorizedKey: '"${SSH_AUTHORIZED_KEY}"'!' ${SCRIPTDIR}/cluster-e2etest-values.yaml >${BUILDDIR}/cluster-e2etest-values.yaml
+}
+
+function release_name {
+    local -r values_path=$1
+    name=$(basename ${values_path})
+    echo ${name%-values.yaml}
 }
 
 function deploy {
-    helm -n metal3 install machines ${SCRIPTDIR}/../../machines --create-namespace -f ${BUILDDIR}/machines-values.yaml
-    helm -n metal3 install clusters ${SCRIPTDIR}/../../clusters --create-namespace -f ${BUILDDIR}/clusters-values.yaml
+    for values in build/site/vm/machine-*-values.yaml; do
+       helm -n metal3 install $(release_name ${values}) ${SCRIPTDIR}/../../machine --create-namespace -f ${values}
+    done
+    helm -n metal3 install cluster-e2etest ${SCRIPTDIR}/../../cluster --create-namespace -f ${BUILDDIR}/cluster-e2etest-values.yaml
 }
 
 function clean {
-    helm -n metal3 uninstall clusters
-    helm -n metal3 uninstall machines
+    helm -n metal3 uninstall cluster-e2etest
+    for values in build/site/vm/machine-*-values.yaml; do
+       helm -n metal3 uninstall $(release_name ${values})
+    done
 }
 
 function is_cluster_ready {
@@ -31,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 {