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

Add cri-o 1.20/1.21 (#7544)

Browse source
This commit is contained in:
Florian Ruynat 2021-04-26 18:21:16 +02:00 committed by GitHub
parent 8665e1de87
commit 7c86734d2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 25 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
roles/container-engine/cri-o/vars/amazon.yml
View file

@ -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] }}"

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

@ -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] }}"

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

@ -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] }}"

12
roles/container-engine/cri-o/vars/debian.yml
View file

@ -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

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

@ -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') }}"

12
roles/container-engine/cri-o/vars/ubuntu.yml
View file

@ -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] }}"

2
roles/download/tasks/download_container.yml
View file

@ -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