From 1f21dd97cb67157da4077e270ef66f9b5224cb7a Mon Sep 17 00:00:00 2001
From: Calin Cristian Andrei <cristian.calin@outlook.com>
Date: Tue, 1 Jun 2021 08:38:24 +0000
Subject: [PATCH 1/3] Kata: add Kata 2.x checksums and adjust download urls for
 2.x

---
 roles/download/defaults/main.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index f996d212bdf..d0a64644656 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -106,7 +106,7 @@ calico_crds_download_url: "https://github.com/projectcalico/calico/archive/{{ ca
 crictl_download_url: "https://github.com/kubernetes-sigs/cri-tools/releases/download/{{ crictl_version }}/crictl-{{ crictl_version }}-{{ ansible_system | lower }}-{{ image_arch }}.tar.gz"
 helm_download_url: "https://get.helm.sh/helm-{{ helm_version }}-linux-{{ image_arch }}.tar.gz"
 crun_download_url: "https://github.com/containers/crun/releases/download/{{ crun_version }}/crun-{{ crun_version }}-linux-{{ image_arch }}"
-kata_containers_download_url: "https://github.com/kata-containers/runtime/releases/download/{{ kata_containers_version }}/kata-static-{{ kata_containers_version }}-{{ ansible_architecture }}.tar.xz"
+kata_containers_download_url: "https://github.com/kata-containers/kata-containers/releases/download/{{ kata_containers_version }}/kata-static-{{ kata_containers_version }}-{{ ansible_architecture }}.tar.xz"
 nerdctl_download_url: "https://github.com/containerd/nerdctl/releases/download/v{{ nerdctl_version }}/nerdctl-{{ nerdctl_version }}-{{ ansible_system | lower }}-{{ image_arch }}.tar.gz"
 krew_download_url: "https://github.com/kubernetes-sigs/krew/releases/download/{{ krew_version }}/krew.tar.gz"
 
@@ -393,12 +393,18 @@ kata_containers_binary_checksums:
   arm:
     1.11.3: 0
     1.12.1: 0
+    2.0.4: 0
+    2.1.0: 0
   amd64:
     1.11.3: edbee010e913de980ab104958d7a6fc8394ea069038ad8c6210db36620284364
     1.12.1: 9b9c8e061dd77a4feb4ded8e5b175ad302edbd7b6be862fc39ee448631f160e4
+    2.0.4: 022a60c2d92a5ab9a5eb83d5a95154a2d06fdc2206b2a473d902ccc86766371a
+    2.1.0: c954cdd723bad4ee20e57f107fe1064f0a00f4c349c1826b7a0f89d02f94dec0
   arm64:
     1.11.3: 0
     1.12.1: 0
+    2.0.4: 0
+    2.1.0: 0
 
 nerdctl_archive_checksums:
   arm:

From 1b19b6f3a281d56235958b83428364719aba4def Mon Sep 17 00:00:00 2001
From: Calin Cristian Andrei <cristian.calin@outlook.com>
Date: Tue, 1 Jun 2021 08:38:59 +0000
Subject: [PATCH 2/3] Kata: drop 1.x version which is no longer supported

---
 roles/download/defaults/main.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index d0a64644656..14ec01978d1 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -391,18 +391,12 @@ crun_checksums:
 
 kata_containers_binary_checksums:
   arm:
-    1.11.3: 0
-    1.12.1: 0
     2.0.4: 0
     2.1.0: 0
   amd64:
-    1.11.3: edbee010e913de980ab104958d7a6fc8394ea069038ad8c6210db36620284364
-    1.12.1: 9b9c8e061dd77a4feb4ded8e5b175ad302edbd7b6be862fc39ee448631f160e4
     2.0.4: 022a60c2d92a5ab9a5eb83d5a95154a2d06fdc2206b2a473d902ccc86766371a
     2.1.0: c954cdd723bad4ee20e57f107fe1064f0a00f4c349c1826b7a0f89d02f94dec0
   arm64:
-    1.11.3: 0
-    1.12.1: 0
     2.0.4: 0
     2.1.0: 0
 

From 7b32f85c10c9f32f0afd742ef26a79fef64553f8 Mon Sep 17 00:00:00 2001
From: Calin Cristian Andrei <cristian.calin@outlook.com>
Date: Tue, 1 Jun 2021 08:40:25 +0000
Subject: [PATCH 3/3] Kata: set default version 2.1.0

---
 roles/download/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 14ec01978d1..00851618153 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -52,7 +52,7 @@ image_arch: "{{host_architecture | default('amd64')}}"
 kubeadm_version: "{{ kube_version }}"
 etcd_version: v3.4.13
 crun_version: 0.19
-kata_containers_version: 1.12.1
+kata_containers_version: 2.1.0
 
 # gcr and kubernetes image repo define
 gcr_image_repo: "gcr.io"