Move cri-o default package to 1.22

kubernetes-sigs · Dec 1, 2021 · 9fbe13b · 9fbe13b
1 parent 0cdf75d
commit 9fbe13b
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 4 deletions.
diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml
@@ -69,6 +69,11 @@ packet_ubuntu18-crio:
   stage: deploy-part2
   when: manual
 
+packet_fedora35-crio:
+  extends: .packet_pr
+  stage: deploy-part2
+  when: manual
+
 packet_ubuntu16-canal-ha:
   stage: deploy-part2
   extends: .packet_periodic

diff --git a/README.md b/README.md
@@ -135,7 +135,7 @@ Note: Upstart/SysV init based OS types are not supported.
   - [etcd](https://github.com/coreos/etcd) v3.5.0
   - [docker](https://www.docker.com/) v20.10 (see note)
   - [containerd](https://containerd.io/) v1.4.9
-  - [cri-o](http://cri-o.io/) v1.21 (experimental: see [CRI-O Note](docs/cri-o.md). Only on fedora, ubuntu and centos based OS)
+  - [cri-o](http://cri-o.io/) v1.22 (experimental: see [CRI-O Note](docs/cri-o.md). Only on fedora, ubuntu and centos based OS)
 - Network Plugin
   - [cni-plugins](https://github.com/containernetworking/plugins) v0.9.1
   - [calico](https://github.com/projectcalico/calico) v3.20.3

diff --git a/roles/container-engine/cri-o/defaults/main.yml b/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"
 

diff --git a/roles/container-engine/cri-o/vars/amazon.yml b/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":

diff --git a/roles/container-engine/cri-o/vars/centos-7.yml b/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":

diff --git a/roles/container-engine/cri-o/vars/centos-8.yml b/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":

diff --git a/roles/container-engine/cri-o/vars/debian.yml b/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

diff --git a/roles/container-engine/cri-o/vars/fedora.yml b/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') }}"
diff --git a/roles/container-engine/cri-o/vars/ubuntu.yml b/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

diff --git a/tests/files/packet_fedora35-crio.yml b/tests/files/packet_fedora35-crio.yml
@@ -0,0 +1,11 @@
+---
+# Instance settings
+cloud_image: fedora-35
+mode: default
+
+# Kubespray settings
+container_manager: crio
+auto_renew_certificates: true
+
+# Test with SELinux in enforcing mode
+preinstall_selinux_state: enforcing