Merge pull request #67377 from shyamjvs/add-mig-startup-timeout

Automatic merge from submit-queue (batch tested with PRs 67377, 67801). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Add timeout to MIG wait-until-stable operation Fixes https://github.com/kubernetes/kubernetes/issues/67374 /cc @wojtek-t @mborsz /sig cluster-lifecycle ```release-note NONE ```

Merge pull request #67377 from shyamjvs/add-mig-startup-timeout
64de381a · Kubernetes Submit Queue · GitHub · 9c4cf0a1 · 65850950 · 64de381a
Unverified Commit 64de381a authored Aug 24, 2018 by Kubernetes Submit Queue Committed by GitHub Aug 24, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

config-default.sh cluster/gce/config-default.sh +1 -0

config-test.sh cluster/gce/config-test.sh +1 -0

util.sh cluster/gce/util.sh +2 -1

No files found.
--- a/cluster/gce/config-default.sh
+++ b/cluster/gce/config-default.sh
@@ -51,6 +51,7 @@ PREEMPTIBLE_MASTER=${PREEMPTIBLE_MASTER:-false}
 KUBE_DELETE_NODES=${KUBE_DELETE_NODES:-true}
 KUBE_DELETE_NETWORK=${KUBE_DELETE_NETWORK:-} # default value calculated below
 CREATE_CUSTOM_NETWORK=${CREATE_CUSTOM_NETWORK:-false}
+MIG_WAIT_UNTIL_STABLE_TIMEOUT=${MIG_WAIT_UNTIL_STABLE_TIMEOUT:-1800}

 MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}}
 NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}}

--- a/cluster/gce/config-test.sh
+++ b/cluster/gce/config-test.sh
@@ -50,6 +50,7 @@ PREEMPTIBLE_MASTER=${PREEMPTIBLE_MASTER:-false}
 KUBE_DELETE_NODES=${KUBE_DELETE_NODES:-true}
 KUBE_DELETE_NETWORK=${KUBE_DELETE_NETWORK:-true}
 CREATE_CUSTOM_NETWORK=${CREATE_CUSTOM_NETWORK:-false}
+MIG_WAIT_UNTIL_STABLE_TIMEOUT=${MIG_WAIT_UNTIL_STABLE_TIMEOUT:-1800}

 MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}}
 NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}}

--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -2358,7 +2358,8 @@ function create-nodes() {
    gcloud compute instance-groups managed wait-until-stable \
        "${group_name}" \
        --zone "${ZONE}" \
-        --project "${PROJECT}" || true;
+        --project "${PROJECT}" \
+        --timeout "${MIG_WAIT_UNTIL_STABLE_TIMEOUT}" || true;
  done
 }