Merge "Revert "Update containerd version and tarball URL"" into stable/ussuri
This commit is contained in:
commit
9c9a84f669
|
@ -10,7 +10,7 @@ ssh_cmd="ssh -F /srv/magnum/.ssh/config root@localhost"
|
||||||
if [ "${CONTAINER_RUNTIME}" = "containerd" ] ; then
|
if [ "${CONTAINER_RUNTIME}" = "containerd" ] ; then
|
||||||
$ssh_cmd systemctl disable docker
|
$ssh_cmd systemctl disable docker
|
||||||
if [ -z "${CONTAINERD_TARBALL_URL}" ] ; then
|
if [ -z "${CONTAINERD_TARBALL_URL}" ] ; then
|
||||||
CONTAINERD_TARBALL_URL="https://github.com/containerd/containerd/releases/download/v${CONTAINERD_VERSION}/containerd-${CONTAINERD_VERSION}-linux-amd64.tar.gz"
|
CONTAINERD_TARBALL_URL="https://storage.googleapis.com/cri-containerd-release/cri-containerd-${CONTAINERD_VERSION}.linux-amd64.tar.gz"
|
||||||
fi
|
fi
|
||||||
i=0
|
i=0
|
||||||
until curl -o /srv/magnum/cri-containerd.tar.gz -L "${CONTAINERD_TARBALL_URL}"
|
until curl -o /srv/magnum/cri-containerd.tar.gz -L "${CONTAINERD_TARBALL_URL}"
|
||||||
|
|
|
@ -901,7 +901,7 @@ parameters:
|
||||||
containerd_version:
|
containerd_version:
|
||||||
type: string
|
type: string
|
||||||
description: The containerd version to download from https://storage.googleapis.com/cri-containerd-release/
|
description: The containerd version to download from https://storage.googleapis.com/cri-containerd-release/
|
||||||
default: '1.4.3'
|
default: '1.2.8'
|
||||||
|
|
||||||
containerd_tarball_url:
|
containerd_tarball_url:
|
||||||
type: string
|
type: string
|
||||||
|
@ -911,7 +911,7 @@ parameters:
|
||||||
containerd_tarball_sha256:
|
containerd_tarball_sha256:
|
||||||
type: string
|
type: string
|
||||||
description: sha256 of the target containerd tarball.
|
description: sha256 of the target containerd tarball.
|
||||||
default: '34a161e3f459fd337b03141a339eeb1a56c5c811922fe72012d2dac9fa5542f1'
|
default: '1f2f0fb928179df90492a83c326a194b8e9d992538498efb44cbb6ef15465627'
|
||||||
|
|
||||||
post_install_manifest_url:
|
post_install_manifest_url:
|
||||||
type: string
|
type: string
|
||||||
|
|
|
@ -1,4 +0,0 @@
|
||||||
---
|
|
||||||
upgrade:
|
|
||||||
- |
|
|
||||||
The default containerd version is updated with 1.4.3.
|
|
Loading…
Reference in New Issue