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

Set better default commands for loading images

Browse Source 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
This commit is contained in:
Davanum Srinivas 2020-06-16 07:45:21 -04:00
parent e6214389ca
commit fbb4bb0003
No known key found for this signature in database
GPG Key ID: 80D83A796103BF59
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -376,7 +376,16 @@ 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:-docker load -i} "${img}"; do
if [[ "${CONTAINER_RUNTIME_NAME:-}" == "docker" ]]; then
load_image_command=${LOAD_IMAGE_COMMAND:-docker load -i}
elif [[ "${CONTAINER_RUNTIME_NAME:-}" == "containerd" ]]; then
load_image_command=${LOAD_IMAGE_COMMAND:-ctr -n=k8s.io images import}
else
load_image_command="${LOAD_IMAGE_COMMAND:-}"
fi
until timeout 30 ${load_image_command} "${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