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

Enable crio 1.18 (#6197)

Browse source
This commit is contained in:
spaced 2020-05-28 09:42:15 +02:00 committed by GitHub
parent 41b44739b1
commit 1be15a0864
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,7 +9,7 @@ crio_conmon: "/usr/bin/conmon"
crio_required_version: "{{ kube_version | regex_replace('^v(?P<major>\\d+).(?P<minor>\\d+).(?P<patch>\\d+)$', '\\g<major>.\\g<minor>') }}" 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: crio_kubernetes_version_matrix:
"1.18": "1.17" "1.18": "1.18"
"1.17": "1.17" "1.17": "1.17"
"1.16": "1.16" "1.16": "1.16"

12
roles/container-engine/cri-o/molecule/default/molecule.yml
View file

@ -8,12 +8,12 @@ lint:
options: options:
config-file: ../../../.yamllint config-file: ../../../.yamllint
platforms: platforms:
# - name: ubuntu1804 - name: ubuntu1804
# box: generic/ubuntu1804 box: generic/ubuntu1804
# cpus: 2 cpus: 2
# memory: 1024 memory: 1024
# groups: groups:
# - kube-master - kube-master
- name: centos7 - name: centos7
box: centos/7 box: centos/7
cpus: 2 cpus: 2

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

@ -4,3 +4,8 @@ crio_packages:
- "cri-o-{{ crio_version }}" - "cri-o-{{ crio_version }}"
crio_runc_path: /usr/sbin/runc crio_runc_path: /usr/sbin/runc
crio_kubernetes_version_matrix:
"1.18": "1.17"
"1.17": "1.17"
"1.16": "1.16"