Merge pull request #89097 from jpbetz/patch-1

Fix unbound variable error in gce/configure.sh
This commit is contained in:
Kubernetes Prow Robot 2020-03-12 20:48:38 -07:00 committed by GitHub
commit 3524a5a32a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -498,7 +498,7 @@ function ensure-container-runtime {
docker version
elif [[ "${container_runtime}" == "containerd" ]]; then
# Install containerd/runc if requested
if [[ ! -z "${UBUNTU_INSTALL_CONTAINERD_VERSION:-}" || ! -z "${UBUNTU_INSTALL_RUNC_VERSION}" ]]; then
if [[ ! -z "${UBUNTU_INSTALL_CONTAINERD_VERSION:-}" || ! -z "${UBUNTU_INSTALL_RUNC_VERSION:-}" ]]; then
install-containerd-ubuntu
fi
# Verify presence and print versions of ctr, containerd, runc