From 1be15a0864e313b1f577d8d390cb600cac9f0da5 Mon Sep 17 00:00:00 2001
From: spaced <spaced.wombat@gmail.com>
Date: Thu, 28 May 2020 09:42:15 +0200
Subject: [PATCH] Enable crio 1.18 (#6197)
---
roles/container-engine/cri-o/defaults/main.yml | 2 +-
.../cri-o/molecule/default/molecule.yml | 12 ++++++------
roles/container-engine/cri-o/vars/ubuntu.yml | 5 +++++
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/roles/container-engine/cri-o/defaults/main.yml b/roles/container-engine/cri-o/defaults/main.yml
index 54d10aa6f..ce17424c2 100644
--- a/roles/container-engine/cri-o/defaults/main.yml
+++ b/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"
diff --git a/roles/container-engine/cri-o/molecule/default/molecule.yml b/roles/container-engine/cri-o/molecule/default/molecule.yml
index c0ab571cd..06517b625 100644
--- a/roles/container-engine/cri-o/molecule/default/molecule.yml
+++ b/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
diff --git a/roles/container-engine/cri-o/vars/ubuntu.yml b/roles/container-engine/cri-o/vars/ubuntu.yml
index 213ce5a49..5495f193a 100644
--- a/roles/container-engine/cri-o/vars/ubuntu.yml
+++ b/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"
--
GitLab