Merge pull request #55331 from Random-Liu/fix-gke-failure

Automatic merge from submit-queue (batch tested with PRs 55331, 55272, 55228, 49763, 55242). 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>. Fix GKE failure, set default in configure.sh. Fixes #55189. Signed-off-by: Lantao Liu <lantaol@google.com> **Release note**: ```release-note none ```

Merge pull request #55331 from Random-Liu/fix-gke-failure
ff9574af · Kubernetes Submit Queue · GitHub · 77e5e2f9 · 45b33013 · ff9574af
Unverified Commit ff9574af authored Nov 08, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 08, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

configure.sh cluster/gce/gci/configure.sh +1 -1

No files found.
--- a/cluster/gce/gci/configure.sh
+++ b/cluster/gce/gci/configure.sh
@@ -241,7 +241,7 @@ function try-load-docker-image {
  set +e
  local -r max_attempts=5
  local -i attempt_num=1
-  until timeout 30 ${LOAD_IMAGE_COMMAND} "${img}"; do
+  until timeout 30 ${LOAD_IMAGE_COMMAND:-docker load -i} "${img}"; do
    if [[ "${attempt_num}" == "${max_attempts}" ]]; then
      echo "Fail to load docker image file ${img} after ${max_attempts} retries. Exit!!"
      exit 1