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

Merge pull request #92444 from dims/additional-check-for-containerd-for-better-loading-images

Browse Source 
Additional test for loading images with containerd
This commit is contained in:
Kubernetes Prow Robot
2020-06-29 18:34:40 -07:00
committed by GitHub
parent a5b0e44196 2d7c47d2be
commit de491f11b1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -379,7 +379,7 @@ function try-load-docker-image {
if [[ "${CONTAINER_RUNTIME_NAME:-}" == "docker" ]]; then if [[ "${CONTAINER_RUNTIME_NAME:-}" == "docker" ]]; then
load_image_command=${LOAD_IMAGE_COMMAND:-docker load -i} load_image_command=${LOAD_IMAGE_COMMAND:-docker load -i}
elif [[ "${CONTAINER_RUNTIME_NAME:-}" == "containerd" ]]; then elif [[ "${CONTAINER_RUNTIME_NAME:-}" == "containerd" || "${CONTAINERD_TEST:-}" == "containerd" ]]; then
load_image_command=${LOAD_IMAGE_COMMAND:-ctr -n=k8s.io images import} load_image_command=${LOAD_IMAGE_COMMAND:-ctr -n=k8s.io images import}
else else
load_image_command="${LOAD_IMAGE_COMMAND:-}" load_image_command="${LOAD_IMAGE_COMMAND:-}"