C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bump crio to default 1.21

Browse source
This commit is contained in:
Florian Ruynat 2021-05-26 22:10:33 +02:00 committed by Kubernetes Prow Robot
parent a754c0d476
commit 79fdee3979
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -134,7 +134,7 @@ Note: Upstart/SysV init based OS types are not supported.
- [etcd](https://github.com/coreos/etcd) v3.4.13 - [etcd](https://github.com/coreos/etcd) v3.4.13
- [docker](https://www.docker.com/) v19.03 (see note) - [docker](https://www.docker.com/) v19.03 (see note)
- [containerd](https://containerd.io/) v1.4.4 - [containerd](https://containerd.io/) v1.4.4
- [cri-o](http://cri-o.io/) v1.20 (experimental: see [CRI-O Note](docs/cri-o.md). Only on fedora, ubuntu and centos based OS) - [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)
- Network Plugin - Network Plugin
- [cni-plugins](https://github.com/containernetworking/plugins) v0.9.1 - [cni-plugins](https://github.com/containernetworking/plugins) v0.9.1
- [calico](https://github.com/projectcalico/calico) v3.17.4 - [calico](https://github.com/projectcalico/calico) v3.17.4

2
roles/container-engine/cri-o/defaults/main.yml
View file

@ -43,7 +43,7 @@ crio_kubernetes_version_matrix:
"1.20": "1.20" "1.20": "1.20"
"1.19": "1.19" "1.19": "1.19"
crio_version: "{{ crio_kubernetes_version_matrix[crio_required_version] | default('1.20') }}" crio_version: "{{ crio_kubernetes_version_matrix[crio_required_version] | default('1.21') }}"
# The crio_runtimes variable defines a list of OCI compatible runtimes. # The crio_runtimes variable defines a list of OCI compatible runtimes.
crio_runtimes: crio_runtimes:

7
roles/container-engine/cri-o/vars/fedora.yml
View file

@ -4,3 +4,10 @@ crio_packages:
- cri-tools - cri-tools
crio_conmon: /usr/libexec/crio/conmon crio_conmon: /usr/libexec/crio/conmon
# Fedora doesn't have cri-o 1.21 packages
crio_kubernetes_version_matrix:
"1.21": "1.20"
"1.20": "1.20"
"1.19": "1.19"
crio_version: "{{ crio_kubernetes_version_matrix[crio_required_version] | default('1.20') }}"