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

* add support crio version for various k8s vers

* regexp in pkg versions
pull/6966/head
Sergey 2020-12-09 12:22:50 +03:00 committed by GitHub
parent dbe02d398a
commit 85982dc8e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 43 additions and 10 deletions

View File

@ -1,5 +1,12 @@
--- ---
default_crio_packages: crio_versioned_pkg:
- cri-o-1.19.0 "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] }}"
crio_packages: "{{ centos_crio_packages | default(default_crio_packages) }}" crio_packages: "{{ centos_crio_packages | default(default_crio_packages) }}"

View File

@ -1,5 +1,12 @@
--- ---
default_crio_packages: crio_versioned_pkg:
- cri-o-1.19.0 "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] }}"
crio_packages: "{{ centos_crio_packages | default(default_crio_packages) }}" crio_packages: "{{ centos_crio_packages | default(default_crio_packages) }}"

View File

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

View File

@ -1,7 +1,16 @@
--- ---
default_crio_packages: crio_versioned_pkg:
- "cri-o=1.19.0~0" "1.19":
- "cri-o-runc=1.0.0-6" - "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] }}"
crio_packages: "{{ ubuntu_crio_packages | default(default_crio_packages) }}" crio_packages: "{{ ubuntu_crio_packages | default(default_crio_packages) }}"