Merge "Update containerd version and tarball URL"

magnum/drivers/common/templates/kubernetes/fragments/install-cri.sh

@@ -10,10 +10,10 @@ ssh_cmd="ssh -F /srv/magnum/.ssh/config root@localhost"
 if [ "${CONTAINER_RUNTIME}" = "containerd"  ] ; then
     $ssh_cmd systemctl disable docker
     if [ -z "${CONTAINERD_TARBALL_URL}"  ] ; then
-        CONTAINERD_TARBALL_URL="https://storage.googleapis.com/cri-containerd-release/cri-containerd-${CONTAINERD_VERSION}.linux-amd64.tar.gz"
+        CONTAINERD_TARBALL_URL="https://github.com/containerd/containerd/releases/download/v${CONTAINERD_VERSION}/containerd-${CONTAINERD_VERSION}-linux-amd64.tar.gz"
     fi
     i=0
-    until curl -o /srv/magnum/cri-containerd.tar.gz "${CONTAINERD_TARBALL_URL}"
+    until curl -o /srv/magnum/cri-containerd.tar.gz -L "${CONTAINERD_TARBALL_URL}"
     do
         i=$((i + 1))
         [ $i -lt 5 ] || break;

magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml

@@ -901,7 +901,7 @@ parameters:
   containerd_version:
     type: string
     description: The containerd version to download from https://storage.googleapis.com/cri-containerd-release/
-    default: '1.2.8'
+    default: '1.4.3'
 
   containerd_tarball_url:
     type: string
@@ -911,7 +911,7 @@ parameters:
   containerd_tarball_sha256:
     type: string
     description: sha256 of the target containerd tarball.
-    default: '1f2f0fb928179df90492a83c326a194b8e9d992538498efb44cbb6ef15465627'
+    default: '34a161e3f459fd337b03141a339eeb1a56c5c811922fe72012d2dac9fa5542f1'
 
   post_install_manifest_url:
     type: string

releasenotes/notes/update-containerd-version-url-c095c0ee3c1a538b.yaml

@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The default containerd version is updated with 1.4.3.