feat: make wait-for-cluster more robust (#676)

The status is PROVISIONING at the beginning, thus the original logic will always exit and say "Cluster is ready!". If we wait for the RUNNING status, we will know for sure the cluster is up. Co-authored-by: Bharath KKB <bharathkrishnakb@gmail.com>
terraform-google-modules · Sep 19, 2020 · dffb047 · dffb047
1 parent 9f84cec
commit dffb047
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/autogen/main/scripts/wait-for-cluster.sh b/autogen/main/scripts/wait-for-cluster.sh
@@ -27,7 +27,7 @@ echo "Waiting for cluster $CLUSTER_NAME in project $PROJECT to reconcile..."
 
 while
   current_status=$(gcloud container clusters list --project="$PROJECT" --filter=name:"$CLUSTER_NAME" --format="value(status)")
-  [[ "${current_status}" == "RECONCILING" ]]
+  [[ "${current_status}" != "RUNNING" ]]
 do printf ".";sleep 5; done
 
 echo "Cluster is ready!"
diff --git a/modules/beta-private-cluster-update-variant/scripts/wait-for-cluster.sh b/modules/beta-private-cluster-update-variant/scripts/wait-for-cluster.sh
@@ -27,7 +27,7 @@ echo "Waiting for cluster $CLUSTER_NAME in project $PROJECT to reconcile..."
 
 while
   current_status=$(gcloud container clusters list --project="$PROJECT" --filter=name:"$CLUSTER_NAME" --format="value(status)")
-  [[ "${current_status}" == "RECONCILING" ]]
+  [[ "${current_status}" != "RUNNING" ]]
 do printf ".";sleep 5; done
 
 echo "Cluster is ready!"
diff --git a/modules/beta-private-cluster/scripts/wait-for-cluster.sh b/modules/beta-private-cluster/scripts/wait-for-cluster.sh
@@ -27,7 +27,7 @@ echo "Waiting for cluster $CLUSTER_NAME in project $PROJECT to reconcile..."
 
 while
   current_status=$(gcloud container clusters list --project="$PROJECT" --filter=name:"$CLUSTER_NAME" --format="value(status)")
-  [[ "${current_status}" == "RECONCILING" ]]
+  [[ "${current_status}" != "RUNNING" ]]
 do printf ".";sleep 5; done
 
 echo "Cluster is ready!"
diff --git a/modules/beta-public-cluster-update-variant/scripts/wait-for-cluster.sh b/modules/beta-public-cluster-update-variant/scripts/wait-for-cluster.sh
@@ -27,7 +27,7 @@ echo "Waiting for cluster $CLUSTER_NAME in project $PROJECT to reconcile..."
 
 while
   current_status=$(gcloud container clusters list --project="$PROJECT" --filter=name:"$CLUSTER_NAME" --format="value(status)")
-  [[ "${current_status}" == "RECONCILING" ]]
+  [[ "${current_status}" != "RUNNING" ]]
 do printf ".";sleep 5; done
 
 echo "Cluster is ready!"
diff --git a/modules/beta-public-cluster/scripts/wait-for-cluster.sh b/modules/beta-public-cluster/scripts/wait-for-cluster.sh
@@ -27,7 +27,7 @@ echo "Waiting for cluster $CLUSTER_NAME in project $PROJECT to reconcile..."
 
 while
   current_status=$(gcloud container clusters list --project="$PROJECT" --filter=name:"$CLUSTER_NAME" --format="value(status)")
-  [[ "${current_status}" == "RECONCILING" ]]
+  [[ "${current_status}" != "RUNNING" ]]
 do printf ".";sleep 5; done
 
 echo "Cluster is ready!"
diff --git a/modules/private-cluster-update-variant/scripts/wait-for-cluster.sh b/modules/private-cluster-update-variant/scripts/wait-for-cluster.sh
@@ -27,7 +27,7 @@ echo "Waiting for cluster $CLUSTER_NAME in project $PROJECT to reconcile..."
 
 while
   current_status=$(gcloud container clusters list --project="$PROJECT" --filter=name:"$CLUSTER_NAME" --format="value(status)")
-  [[ "${current_status}" == "RECONCILING" ]]
+  [[ "${current_status}" != "RUNNING" ]]
 do printf ".";sleep 5; done
 
 echo "Cluster is ready!"
diff --git a/modules/private-cluster/scripts/wait-for-cluster.sh b/modules/private-cluster/scripts/wait-for-cluster.sh
@@ -27,7 +27,7 @@ echo "Waiting for cluster $CLUSTER_NAME in project $PROJECT to reconcile..."
 
 while
   current_status=$(gcloud container clusters list --project="$PROJECT" --filter=name:"$CLUSTER_NAME" --format="value(status)")
-  [[ "${current_status}" == "RECONCILING" ]]
+  [[ "${current_status}" != "RUNNING" ]]
 do printf ".";sleep 5; done
 
 echo "Cluster is ready!"
diff --git a/scripts/wait-for-cluster.sh b/scripts/wait-for-cluster.sh
@@ -27,7 +27,7 @@ echo "Waiting for cluster $CLUSTER_NAME in project $PROJECT to reconcile..."
 
 while
   current_status=$(gcloud container clusters list --project="$PROJECT" --filter=name:"$CLUSTER_NAME" --format="value(status)")
-  [[ "${current_status}" == "RECONCILING" ]]
+  [[ "${current_status}" != "RUNNING" ]]
 do printf ".";sleep 5; done
 
 echo "Cluster is ready!"