From 65850950b4215fce28b918ed60400e3702619be9 Mon Sep 17 00:00:00 2001 From: Shyam Jeedigunta Date: Tue, 14 Aug 2018 11:13:52 +0200 Subject: [PATCH] Add timeout to MIG wait-until-stable operation --- cluster/gce/config-default.sh | 1 + cluster/gce/config-test.sh | 1 + cluster/gce/util.sh | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 74bc1f2f5ff..e4ea6e36b48 100755 --- 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}} diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index d48177a70c0..7e8a1a42a81 100755 --- 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}} diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index 6bc22de9bbe..69d487f60dc 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -2359,7 +2359,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 }