From f9132b2b56db83e171049ddcf8eb253d33ae84f5 Mon Sep 17 00:00:00 2001
From: Todd Malsbary <todd.malsbary@intel.com>
Date: Mon, 15 Nov 2021 15:54:21 -0800
Subject: [PATCH] Replace flux wait with control plane wait

The flux wait was unreliable and once the control plane is ready,
requests can be succesfully submitted to the cluster.

Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Change-Id: I2cdaf150d76dc6753055136f16b4e518dbd84f49
---
 deploy/site/vm/vm.sh | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/deploy/site/vm/vm.sh b/deploy/site/vm/vm.sh
index 14f9319..2d89d17 100755
--- a/deploy/site/vm/vm.sh
+++ b/deploy/site/vm/vm.sh
@@ -30,12 +30,8 @@ function is_cluster_ready {
     [[ $(kubectl -n metal3 get cluster e2etest -o jsonpath='{.status.conditions[?(@.type=="Ready")].status}') == "True" ]]
 }
 
-function are_kustomizations_ready {
-    [[ $(kubectl --kubeconfig=${BUILDDIR}/e2etest-admin.conf get Kustomization -n flux-system -o jsonpath='{range .items[*]}{.status.conditions[?(@.type=="Ready")].status}{"\n"}{end}' | grep -c -v True) == 0 ]]
-}
-
-function are_helmreleases_ready {
-    [[ $(kubectl --kubeconfig=${BUILDDIR}/e2etest-admin.conf get HelmRelease -n flux-system -o jsonpath='{range .items[*]}{.status.conditions[?(@.type=="Ready")].status}{"\n"}{end}' | grep -c -v True) == 0 ]]
+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 ]]
 }
 
 function wait_for_all_ready {
@@ -43,12 +39,7 @@ function wait_for_all_ready {
     wait_for is_cluster_ready
     clusterctl -n metal3 get kubeconfig e2etest >${BUILDDIR}/e2etest-admin.conf
     chmod 600 ${BUILDDIR}/e2etest-admin.conf
-    # TODO The following checks are not ideal: resources created by
-    # operators aren't detected here, but this is the best that can be
-    # currently done
-    WAIT_FOR_INTERVAL=30s
-    wait_for are_kustomizations_ready
-    wait_for are_helmreleases_ready
+    wait_for is_control_plane_ready
 }
 
 case $1 in
-- 
2.16.6