From ffbdbbc082415f68696628a2fd9006bfe0f5f438 Mon Sep 17 00:00:00 2001
From: Bharat Kunwar <bharat@stackhpc.com>
Date: Tue, 6 Apr 2021 15:53:30 +0000
Subject: [PATCH] Revert "Update containerd version and tarball URL"

This reverts commit 6696b057eb02472e33a90f042a591a322e35c65c.

Reason for revert: breaks URL to 1.2.8 release

Change-Id: I81cf8cd6abac9e085ea3d861c4533142930c74e7
---
 .../common/templates/kubernetes/fragments/install-cri.sh      | 2 +-
 .../drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml   | 4 ++--
 .../notes/update-containerd-version-url-c095c0ee3c1a538b.yaml | 4 ----
 3 files changed, 3 insertions(+), 7 deletions(-)
 delete mode 100644 releasenotes/notes/update-containerd-version-url-c095c0ee3c1a538b.yaml

diff --git a/magnum/drivers/common/templates/kubernetes/fragments/install-cri.sh b/magnum/drivers/common/templates/kubernetes/fragments/install-cri.sh
index f71cd80736..6d1df38036 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/install-cri.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/install-cri.sh
@@ -12,7 +12,7 @@ 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://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
     i=0
     until curl -o /srv/magnum/cri-containerd.tar.gz -L "${CONTAINERD_TARBALL_URL}"
diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
index ac04ab8087..c97c12ad42 100644
--- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
+++ b/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.4.3'
+    default: '1.2.8'
 
   containerd_tarball_url:
     type: string
@@ -911,7 +911,7 @@ parameters:
   containerd_tarball_sha256:
     type: string
     description: sha256 of the target containerd tarball.
-    default: '34a161e3f459fd337b03141a339eeb1a56c5c811922fe72012d2dac9fa5542f1'
+    default: '1f2f0fb928179df90492a83c326a194b8e9d992538498efb44cbb6ef15465627'
 
   post_install_manifest_url:
     type: string
diff --git a/releasenotes/notes/update-containerd-version-url-c095c0ee3c1a538b.yaml b/releasenotes/notes/update-containerd-version-url-c095c0ee3c1a538b.yaml
deleted file mode 100644
index f5b21bab12..0000000000
--- a/releasenotes/notes/update-containerd-version-url-c095c0ee3c1a538b.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-upgrade:
-  - |
-    The default containerd version is updated with 1.4.3.