Merge pull request #17 from AbsaOSS/14-waitfunc

kuritka · web-flow · commit dc55e5ace95f · 2021-02-26T15:42:46.000+01:00
Wait until agents are ready
diff --git a/.github/workflows/multi-cluster-config.yaml b/.github/workflows/multi-cluster-config.yaml
@@ -28,10 +28,8 @@ jobs:
           echo
           kubectl cluster-info --context k3d-test-cluster-1 && kubectl cluster-info --context k3d-test-cluster-2
       - name: Nodes
-        # hack, wait until all agents are ready.
         run: |
           docker ps -a
-          sleep 5
           kubectl config use-context k3d-test-cluster-1
           kubectl get nodes -o wide
           kubectl config use-context k3d-test-cluster-2
diff --git a/.github/workflows/multi-cluster-on-isolated-networks.yaml b/.github/workflows/multi-cluster-on-isolated-networks.yaml
@@ -45,10 +45,8 @@ jobs:
           echo
           kubectl cluster-info --context k3d-test-cluster-1 && kubectl cluster-info --context k3d-test-cluster-2
       - name: Nodes
-        # hack, wait until all agents are ready.
         run: |
           docker ps -a
-          sleep 5
           kubectl config use-context k3d-test-cluster-1
           kubectl get nodes -o wide
           kubectl config use-context k3d-test-cluster-2
diff --git a/.github/workflows/multi-cluster-registry.yaml b/.github/workflows/multi-cluster-registry.yaml
@@ -36,10 +36,8 @@ jobs:
           echo
           kubectl cluster-info --context k3d-test-cluster-1 && kubectl cluster-info --context k3d-test-cluster-2
       - name: Nodes
-        # hack, wait until all agents are ready.
         run: |
           docker ps -a
-          sleep 5
           kubectl config use-context k3d-test-cluster-1
           kubectl get nodes -o wide
           kubectl config use-context k3d-test-cluster-2
diff --git a/.github/workflows/multi-cluster-two-piars-registry-config.yaml b/.github/workflows/multi-cluster-two-piars-registry-config.yaml
@@ -72,10 +72,8 @@ jobs:
           kubectl cluster-info --context k3d-test-cluster-2-b
 
       - name: Nodes
-        # hack, wait until all agents are ready.
         run: |
           docker ps -a
-          sleep 5
           kubectl config use-context k3d-test-cluster-1-a
           kubectl get nodes -o wide
           kubectl config use-context k3d-test-cluster-1-b
diff --git a/.github/workflows/multi-cluster-two-piars-registry-shared.yaml b/.github/workflows/multi-cluster-two-piars-registry-shared.yaml
@@ -69,10 +69,8 @@ jobs:
           kubectl cluster-info --context k3d-test-cluster-2-b
 
       - name: Nodes
-        # hack, wait until all agents are ready.
         run: |
           docker ps -a
-          sleep 5
           kubectl config use-context k3d-test-cluster-1-a
           kubectl get nodes -o wide
           kubectl config use-context k3d-test-cluster-1-b
diff --git a/.github/workflows/multi-cluster-two-piars-registry.yaml b/.github/workflows/multi-cluster-two-piars-registry.yaml
@@ -76,10 +76,8 @@ jobs:
           kubectl cluster-info --context k3d-test-cluster-2-b
 
       - name: Nodes
-        # hack, wait until all agents are ready.
         run: |
           docker ps -a
-          sleep 5
           kubectl config use-context k3d-test-cluster-1-a
           kubectl get nodes -o wide
           kubectl config use-context k3d-test-cluster-1-b
diff --git a/.github/workflows/multi-cluster-two-piars.yaml b/.github/workflows/multi-cluster-two-piars.yaml
@@ -68,10 +68,8 @@ jobs:
           kubectl cluster-info --context k3d-test-cluster-2-b
 
       - name: Nodes
-        # hack, wait until all agents are ready.
         run: |
           docker ps -a
-          sleep 5
           kubectl config use-context k3d-test-cluster-1-a
           kubectl get nodes -o wide
           kubectl config use-context k3d-test-cluster-1-b
diff --git a/.github/workflows/multi-cluster.yaml b/.github/workflows/multi-cluster.yaml
@@ -40,10 +40,8 @@ jobs:
           echo
           kubectl cluster-info --context k3d-test-cluster-1 && kubectl cluster-info --context k3d-test-cluster-2
       - name: Nodes
-        # hack, wait until all agents are ready.
         run: |
           docker ps -a
-          sleep 5
           kubectl config use-context k3d-test-cluster-1
           kubectl get nodes -o wide
           kubectl config use-context k3d-test-cluster-2
diff --git a/.github/workflows/single-cluster-config.yaml b/.github/workflows/single-cluster-config.yaml
@@ -22,10 +22,8 @@ jobs:
           echo
           kubectl cluster-info --context k3d-test-cluster-1
       - name: Nodes
-        # hack, wait until agents are ready...
         run: |
           docker ps -a
-          sleep 10
           kubectl config use-context k3d-test-cluster-1
           kubectl get nodes -o wide
       - name: Network
diff --git a/.github/workflows/single-cluster-registry.yaml b/.github/workflows/single-cluster-registry.yaml
@@ -25,10 +25,8 @@ jobs:
           echo
           kubectl cluster-info --context k3d-test-cluster-1
       - name: Nodes
-        # hack, wait until agents are ready...
         run: |
           docker ps -a
-          sleep 10
           kubectl config use-context k3d-test-cluster-1
           kubectl get nodes -o wide
       - name: Network
diff --git a/.github/workflows/single-cluster.yaml b/.github/workflows/single-cluster.yaml
@@ -26,10 +26,8 @@ jobs:
           echo
           kubectl cluster-info --context k3d-test-cluster-1
       - name: Nodes
-        # hack, wait until agents are ready...
         run: |
           docker ps -a
-          sleep 10
           kubectl config use-context k3d-test-cluster-1
           kubectl get nodes -o wide
       - name: Network
diff --git a/run.sh b/run.sh
@@ -117,6 +117,7 @@ deploy(){
 
     echo -e "\existing_network${YELLOW}Deploy cluster ${CYAN}$name ${NC}"
     eval "k3d cluster create $name --wait $arguments --image ${K3S_VERSION} --network $network $registryArg"
+    wait_for_nodes
 }
 
 # see: https://rancher.com/docs/k3s/latest/en/installation/private-registry/#mirrors
@@ -172,6 +173,31 @@ init_registry(){
     fi
 }
 
+# waits until all nodes are ready
+wait_for_nodes(){
+  echo -e "${YELLOW}wait until all agents are ready${NC}"
+  while :
+  do
+    readyNodes=1
+    statusList=$(kubectl get nodes --no-headers | awk '{ print $2}')
+    # shellcheck disable=SC2162
+    while read status
+    do
+      if [[ "$status" == "NotReady" ]]
+      then
+        readyNodes=0
+        break
+      fi
+    done <<< "$(echo -e  "$statusList")"
+
+    # all nodes are ready; exit
+    if [[ $readyNodes == 1 ]]
+    then
+      break
+    fi
+    sleep 1
+  done
+}
 #######################
 #
 #     GUARDS SECTION
