From 990ca38d212e49e49eda1cc40ad7dc1963c4e887 Mon Sep 17 00:00:00 2001
From: Cristian Calin <6627509+cristicalin@users.noreply.github.com>
Date: Tue, 7 Dec 2021 18:18:08 +0200
Subject: [PATCH] Kata-Containers: add 2.3.0 (#8276)
* Kata-Containers: add checksums for 2.3.0
* Kata-Containers: version 2.3.0 requires kubernetes 1.22.0+
---
roles/download/defaults/main.yml | 3 +++
roles/kubernetes/preinstall/tasks/0020-verify-settings.yml | 6 ++++++
2 files changed, 9 insertions(+)
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index df49f82c8..8a915b7b4 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -496,15 +496,18 @@ kata_containers_binary_checksums:
2.0.4: 0
2.1.1: 0
2.2.2: 0
+ 2.3.0: 0
amd64:
2.0.4: 022a60c2d92a5ab9a5eb83d5a95154a2d06fdc2206b2a473d902ccc86766371a
2.1.1: a83591d968cd0f1adfb5025d7aa33ca1385d4b1165ff10d74602302fc3c0373f
2.2.2: 2e3ac77b8abd4d839cf16780b57aee8f3d6e1f19489edd7d6d8069ea3cc3c18a
2.2.3: e207ab5c8128b50fe61f4f6f98fd34af0fa5ebc0793862be6d13a2674321774f
+ 2.3.0: 430fa55b387b3bafbbabb7e59aa8c809927a22f8d836732a0719fd2e1d131b31
arm64:
2.0.4: 0
2.1.1: 0
2.2.2: 0
+ 2.3.0: 0
gvisor_runsc_binary_checksums:
arm:
diff --git a/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml b/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml
index 3f453bac6..1d68f7e0b 100644
--- a/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml
+++ b/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml
@@ -306,6 +306,12 @@
msg: "kata_containers_enabled support only for containerd and crio-o. See https://github.com/kata-containers/documentation/blob/1.11.4/how-to/run-kata-with-k8s.md#install-a-cri-implementation for details"
when: kata_containers_enabled
+- name: Stop if kata_containers_version is >= 2.3.0 and kube_version < 1.22.0
+ assert:
+ that: kube_version is version('v1.22.0', '>')
+ msg: "Kata containers version 2.3.0 is compatible with Kubernetes 1.22.0+"
+ when: kata_containers_version is version ('2.3.0', '>=')
+
- name: Stop if gvisor_enabled is enabled when container_manager is not containerd
assert:
that: container_manager == 'containerd'
--
GitLab