Merge pull request #55794 from porridge/patient-big-master

Automatic merge from submit-queue (batch tested with PRs 54316, 53400, 55933, 55786, 55794). 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>. Be less agressive and more patient when creating large master. **What this PR does / why we need it**: Workaround for #55777 **Release note**: ```release-note NONE ```

Merge pull request #55794 from porridge/patient-big-master
a69f9dad · Kubernetes Submit Queue · GitHub · 61792ef4 · bd76307d · a69f9dad
Unverified Commit a69f9dad authored Nov 21, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 21, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

master-helper.sh cluster/gce/gci/master-helper.sh +7 -1

No files found.
--- a/cluster/gce/gci/master-helper.sh
+++ b/cluster/gce/gci/master-helper.sh
@@ -76,6 +76,12 @@ function replicate-master-instance() {
 function create-master-instance-internal() {
  local gcloud="gcloud"
  local retries=5
+  local sleep_sec=10
+  if [[ "${MASTER_SIZE##*-}" -ge 64 ]]; then  # remove everything up to last dash (inclusive)
+    # Workaround for #55777
+    retries=30
+    sleep_sec=60
+  fi
  if [[ "${ENABLE_IP_ALIASES:-}" == 'true' ]]; then
    gcloud="gcloud beta"
  fi
@@ -130,7 +136,7 @@ function create-master-instance-internal() {
        echo "Failed to create master instance due to non-retryable error" >&2
        return 1
      fi
-      sleep 10
+      sleep $sleep_sec
    fi
  done