Skip to content

Commit

Permalink
Move cri-o default package to 1.22 (kubernetes-sigs#8258)
Browse files Browse the repository at this point in the history
  • Loading branch information
floryut authored and LuckySB committed Jun 28, 2023
1 parent ed65b82 commit b974c14
Show file tree
Hide file tree
Showing 12 changed files with 34 additions and 6 deletions.
5 changes: 5 additions & 0 deletions .gitlab-ci/packet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,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
Expand Down
2 changes: 1 addition & 1 deletion docs/ci.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ debian10 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
debian11 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
debian9 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
fedora34 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
fedora35 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
fedora35 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
opensuse | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
oracle7 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
ubuntu16 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
Expand Down
2 changes: 1 addition & 1 deletion roles/container-engine/cri-o/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion roles/container-engine/cri-o/molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions roles/container-engine/cri-o/vars/amazon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down
2 changes: 2 additions & 0 deletions roles/container-engine/cri-o/vars/centos-7.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
---
crio_versioned_pkg:
"1.22":
- "cri-o-1.22.*"
"1.21":
- "cri-o-1.21.*"
"1.20":
Expand Down
2 changes: 2 additions & 0 deletions roles/container-engine/cri-o/vars/centos-8.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
---
crio_versioned_pkg:
"1.22":
- "cri-o-1.22.*"
"1.21":
- "cri-o-1.21.*"
"1.20":
Expand Down
3 changes: 3 additions & 0 deletions roles/container-engine/cri-o/vars/debian.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/container-engine/cri-o/vars/fedora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}"
3 changes: 3 additions & 0 deletions roles/container-engine/cri-o/vars/ubuntu.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
11 changes: 11 additions & 0 deletions tests/files/packet_fedora35-crio.yml
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit b974c14

Please sign in to comment.