Browse Source

Enable crio 1.18 (#6197)

pull/6206/head
spaced 5 years ago
committed by GitHub
parent
commit
1be15a0864
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 7 deletions
  1. 2
      roles/container-engine/cri-o/defaults/main.yml
  2. 12
      roles/container-engine/cri-o/molecule/default/molecule.yml
  3. 5
      roles/container-engine/cri-o/vars/ubuntu.yml

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

@ -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_kubernetes_version_matrix:
"1.18": "1.17"
"1.18": "1.18"
"1.17": "1.17"
"1.16": "1.16"

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

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

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

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