Move cri-o default package to 1.22 (#8258)

roles/container-engine/cri-o/defaults/main.yml

@@ -45,7 +45,7 @@ crio_stream_port: "10010"
 crio_required_version: "{{ kube_version | regex_replace('^v(?P<major>\\d+).(?P<minor>\\d+).(?P<patch>\\d+)$', '\\g<major>.\\g<minor>') }}"
 
 crio_kubernetes_version_matrix:
-  "1.22": "1.21"
+  "1.22": "1.22"
   "1.21": "1.21"
   "1.20": "1.20"
 

roles/container-engine/cri-o/molecule/default/molecule.yml

@@ -26,7 +26,7 @@ platforms:
     groups:
       - kube_control_plane
   - name: fedora
-    box: fedora/34-cloud-base
+    box: fedora/35-cloud-base
     cpus: 2
     memory: 1024
     groups:

roles/container-engine/cri-o/vars/amazon.yml

@@ -3,6 +3,8 @@
 crio_storage_driver: "overlay"
 
 crio_versioned_pkg:
+  "1.22":
+    - "cri-o-1.22.*"
   "1.21":
     - "cri-o-1.21.*"
   "1.20":

roles/container-engine/cri-o/vars/centos-7.yml

@@ -1,5 +1,7 @@
 ---
 crio_versioned_pkg:
+  "1.22":
+    - "cri-o-1.22.*"
   "1.21":
     - "cri-o-1.21.*"
   "1.20":

roles/container-engine/cri-o/vars/centos-8.yml

@@ -1,5 +1,7 @@
 ---
 crio_versioned_pkg:
+  "1.22":
+    - "cri-o-1.22.*"
   "1.21":
     - "cri-o-1.21.*"
   "1.20":

roles/container-engine/cri-o/vars/debian.yml

@@ -1,5 +1,8 @@
 ---
 crio_versioned_pkg:
+  "1.22":
+    - "cri-o=1.22*"
+    - cri-o-runc
   "1.21":
     - "cri-o=1.21*"
     - cri-o-runc

roles/container-engine/cri-o/vars/fedora.yml

@@ -3,8 +3,8 @@ crio_packages:
   - cri-o
   - cri-tools
 
-# Fedora doesn't have cri-o 1.21 packages
 crio_kubernetes_version_matrix:
-  "1.21": "1.20"
+  "1.22": "1.22"
+  "1.21": "1.21"
   "1.20": "1.20"
 crio_version: "{{ crio_kubernetes_version_matrix[crio_required_version] | default('1.20') }}"

roles/container-engine/cri-o/vars/ubuntu.yml

@@ -1,5 +1,8 @@
 ---
 crio_versioned_pkg:
+  "1.22":
+    - "cri-o=1.22*"
+    - cri-o-runc
   "1.21":
     - "cri-o=1.21*"
     - cri-o-runc