[2.14] Backport: 6758, 6853 and 7003 to fix CRI-O pkg (#7209)

* cherry-pick bump crio version to 1.19 (#6758)

cherry-pick modifications:
* keep default to 1.17 as release 2.14 came with
* don't change readme with newer versions

* bump crio version to 1.19

* crio package name has changed for debian/ubuntu
* crio upgrade does not work, see #6757

* update crio info in docs

* Install cri-o with package version (#6853)

and thereby support upgrade from e.g. 1.18.x to 1.19.y

Included OSes:
- Centos7/8
- Ubuntu18/20

New variables for overriding by default installed packages:
- centos_crio_packages
- ubuntu_crio_packages

* add support crio version for varios k8s vers (#7003)

* add support crio version for various k8s vers

* regexp in pkg versions

Co-authored-by: Hans Feldt <2808287+hafe@users.noreply.github.com>
Co-authored-by: Sergey <s.bondarev@southbridge.ru>
This commit is contained in:
Rick Haan
2021-01-26 16:18:34 +01:00
committed by GitHub
parent c267d427ce
commit 11b72e2408
8 changed files with 67 additions and 17 deletions

View File

@@ -1,5 +1,12 @@
---
crio_versioned_pkg:
"1.19":
- "cri-o-1.19.*"
"1.18":
- "cri-o-1.18.*"
"1.17":
- "cri-o-1.17.*"
crio_packages:
- cri-o
- oci-systemd-hook
default_crio_packages: "{{ crio_versioned_pkg[crio_version] }}"
crio_packages: "{{ centos_crio_packages | default(default_crio_packages) }}"

View File

@@ -1,4 +1,12 @@
---
crio_versioned_pkg:
"1.19":
- "cri-o-1.19.*"
"1.18":
- "cri-o-1.18.*"
"1.17":
- "cri-o-1.17.*"
crio_packages:
- cri-o
default_crio_packages: "{{ crio_versioned_pkg[crio_version] }}"
crio_packages: "{{ centos_crio_packages | default(default_crio_packages) }}"

View File

@@ -1,7 +1,17 @@
---
# 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_packages:
- "cri-o-{{ crio_version }}"
- runc
crio_versioned_pkg:
"1.19":
- "cri-o=1.19*"
- cri-o-runc
default_crio_packages: "{{ crio_versioned_pkg[crio_version] }}"
crio_packages: "{{ debian_crio_packages | default(default_crio_packages) }}"
crio_runc_path: /usr/sbin/runc

View File

@@ -4,3 +4,10 @@ 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') }}"

View File

@@ -1,7 +1,18 @@
---
crio_versioned_pkg:
"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
crio_packages:
- "cri-o-{{ crio_version }}"
default_crio_packages: "{{ crio_versioned_pkg[crio_version] }}"
crio_packages: "{{ ubuntu_crio_packages | default(default_crio_packages) }}"
crio_runc_path: /usr/sbin/runc