From 7c86734d2e0bd2fc21b9acfcb4ec6b952aab23f3 Mon Sep 17 00:00:00 2001
From: Florian Ruynat <16313165+floryut@users.noreply.github.com>
Date: Mon, 26 Apr 2021 18:21:16 +0200
Subject: [PATCH] Add cri-o 1.20/1.21 (#7544)

---
 roles/container-engine/cri-o/vars/amazon.yml   |  8 ++++----
 roles/container-engine/cri-o/vars/centos-7.yml |  8 ++++----
 roles/container-engine/cri-o/vars/centos-8.yml |  8 ++++----
 roles/container-engine/cri-o/vars/debian.yml   | 12 ++++++------
 roles/container-engine/cri-o/vars/fedora.yml   |  7 -------
 roles/container-engine/cri-o/vars/ubuntu.yml   | 12 ++++++------
 roles/download/tasks/download_container.yml    |  2 +-
 7 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/roles/container-engine/cri-o/vars/amazon.yml b/roles/container-engine/cri-o/vars/amazon.yml
index ed966bbe6..29aad1616 100644
--- a/roles/container-engine/cri-o/vars/amazon.yml
+++ b/roles/container-engine/cri-o/vars/amazon.yml
@@ -3,12 +3,12 @@
 crio_storage_driver: "overlay"
 
 crio_versioned_pkg:
+  "1.21":
+    - "cri-o-1.21.*"
+  "1.20":
+    - "cri-o-1.20.*"
   "1.19":
     - "cri-o-1.19.*"
-  "1.18":
-    - "cri-o-1.18.*"
-  "1.17":
-    - "cri-o-1.17.*"
 
 default_crio_packages: "{{ crio_versioned_pkg[crio_version] }}"
 
diff --git a/roles/container-engine/cri-o/vars/centos-7.yml b/roles/container-engine/cri-o/vars/centos-7.yml
index f2548560d..e5e4e43b6 100644
--- a/roles/container-engine/cri-o/vars/centos-7.yml
+++ b/roles/container-engine/cri-o/vars/centos-7.yml
@@ -1,11 +1,11 @@
 ---
 crio_versioned_pkg:
+  "1.21":
+    - "cri-o-1.21.*"
+  "1.20":
+    - "cri-o-1.20.*"
   "1.19":
     - "cri-o-1.19.*"
-  "1.18":
-    - "cri-o-1.18.*"
-  "1.17":
-    - "cri-o-1.17.*"
 
 default_crio_packages: "{{ crio_versioned_pkg[crio_version] }}"
 
diff --git a/roles/container-engine/cri-o/vars/centos-8.yml b/roles/container-engine/cri-o/vars/centos-8.yml
index f2548560d..e5e4e43b6 100644
--- a/roles/container-engine/cri-o/vars/centos-8.yml
+++ b/roles/container-engine/cri-o/vars/centos-8.yml
@@ -1,11 +1,11 @@
 ---
 crio_versioned_pkg:
+  "1.21":
+    - "cri-o-1.21.*"
+  "1.20":
+    - "cri-o-1.20.*"
   "1.19":
     - "cri-o-1.19.*"
-  "1.18":
-    - "cri-o-1.18.*"
-  "1.17":
-    - "cri-o-1.17.*"
 
 default_crio_packages: "{{ crio_versioned_pkg[crio_version] }}"
 
diff --git a/roles/container-engine/cri-o/vars/debian.yml b/roles/container-engine/cri-o/vars/debian.yml
index 1e478aa82..defdb88be 100644
--- a/roles/container-engine/cri-o/vars/debian.yml
+++ b/roles/container-engine/cri-o/vars/debian.yml
@@ -1,11 +1,11 @@
 ---
-# Debian-10 has pkg only for cri-o 1.19
-crio_kubernetes_version_matrix:
-  "1.19": "1.19"
-  "1.18": "1.19"
-  "1.17": "1.19"
-
 crio_versioned_pkg:
+  "1.21":
+    - "cri-o=1.21*"
+    - cri-o-runc
+  "1.20":
+    - "cri-o=1.20*"
+    - cri-o-runc
   "1.19":
     - "cri-o=1.19*"
     - cri-o-runc
diff --git a/roles/container-engine/cri-o/vars/fedora.yml b/roles/container-engine/cri-o/vars/fedora.yml
index fab1a5e9c..e8efe8ac8 100644
--- a/roles/container-engine/cri-o/vars/fedora.yml
+++ b/roles/container-engine/cri-o/vars/fedora.yml
@@ -4,10 +4,3 @@ crio_packages:
   - cri-tools
 
 crio_conmon: /usr/libexec/crio/conmon
-
-# TODO: remove crio_kubernetes_version_matrix and crio_version once Fedora supports 1.19
-crio_kubernetes_version_matrix:
-  "1.18": "1.18"
-  "1.17": "1.17"
-
-crio_version: "{{ crio_kubernetes_version_matrix[crio_required_version] | default('1.17') }}"
diff --git a/roles/container-engine/cri-o/vars/ubuntu.yml b/roles/container-engine/cri-o/vars/ubuntu.yml
index 8ce90eb40..524a12582 100644
--- a/roles/container-engine/cri-o/vars/ubuntu.yml
+++ b/roles/container-engine/cri-o/vars/ubuntu.yml
@@ -1,14 +1,14 @@
 ---
 crio_versioned_pkg:
+  "1.21":
+    - "cri-o=1.21*"
+    - cri-o-runc
+  "1.20":
+    - "cri-o=1.20*"
+    - cri-o-runc
   "1.19":
     - "cri-o=1.19*"
     - cri-o-runc
-  "1.18":
-    - "cri-o=1.18*"
-    - cri-o-runc
-  "1.17":
-    - "cri-o=1.17*"
-    - cri-o-runc
 
 default_crio_packages: "{{ crio_versioned_pkg[crio_version] }}"
 
diff --git a/roles/download/tasks/download_container.yml b/roles/download/tasks/download_container.yml
index d2bea776d..21b3cbd22 100644
--- a/roles/download/tasks/download_container.yml
+++ b/roles/download/tasks/download_container.yml
@@ -106,7 +106,7 @@
         - pull_required
         - download_force_cache
 
-    - name: download_container | Load image into docker
+    - name: download_container | Load image into the local container registry
       shell: "{{ image_load_command }}"  # noqa 305 image_load_command uses pipes, therefore requires shell
       register: container_load_status
       failed_when: container_load_status is failed