github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
```
This commit is contained in:
Kubernetes Submit Queue 2017-11-08 17:13:15 -08:00 committed by GitHub
commit ff9574af95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/gci/configure.sh
View File

@ -241,7 +241,7 @@ function try-load-docker-image {
set +e set +e
local -r max_attempts=5 local -r max_attempts=5
local -i attempt_num=1 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 if [[ "${attempt_num}" == "${max_attempts}" ]]; then
echo "Fail to load docker image file ${img} after ${max_attempts} retries. Exit!!" echo "Fail to load docker image file ${img} after ${max_attempts} retries. Exit!!"
exit 1 exit 1