From d36b5d7d5532ba059c5b1b148b3bbf83c446ab01 Mon Sep 17 00:00:00 2001
From: Hans Feldt <2808287+hafe@users.noreply.github.com>
Date: Mon, 26 Oct 2020 16:35:02 +0100
Subject: [PATCH] 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
---
roles/container-engine/cri-o/vars/centos-7.yml | 6 +++---
roles/container-engine/cri-o/vars/centos-8.yml | 5 +++--
roles/container-engine/cri-o/vars/ubuntu.yml | 7 ++++---
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/roles/container-engine/cri-o/vars/centos-7.yml b/roles/container-engine/cri-o/vars/centos-7.yml
index 740adbc6b..60deaac4b 100644
--- a/roles/container-engine/cri-o/vars/centos-7.yml
+++ b/roles/container-engine/cri-o/vars/centos-7.yml
@@ -1,5 +1,5 @@
---
+default_crio_packages:
+ - cri-o-1.19.0
-crio_packages:
- - cri-o
- - oci-systemd-hook
+crio_packages: "{{ centos_crio_packages | default(default_crio_packages) }}"
diff --git a/roles/container-engine/cri-o/vars/centos-8.yml b/roles/container-engine/cri-o/vars/centos-8.yml
index 121180879..60deaac4b 100644
--- a/roles/container-engine/cri-o/vars/centos-8.yml
+++ b/roles/container-engine/cri-o/vars/centos-8.yml
@@ -1,4 +1,5 @@
---
+default_crio_packages:
+ - cri-o-1.19.0
-crio_packages:
- - cri-o
+crio_packages: "{{ centos_crio_packages | default(default_crio_packages) }}"
diff --git a/roles/container-engine/cri-o/vars/ubuntu.yml b/roles/container-engine/cri-o/vars/ubuntu.yml
index cc9ca8442..06343113e 100644
--- a/roles/container-engine/cri-o/vars/ubuntu.yml
+++ b/roles/container-engine/cri-o/vars/ubuntu.yml
@@ -1,8 +1,9 @@
---
+default_crio_packages:
+ - "cri-o=1.19.0~0"
+ - "cri-o-runc=1.0.0-6"
-crio_packages:
- - "cri-o"
- - "cri-o-runc"
+crio_packages: "{{ ubuntu_crio_packages | default(default_crio_packages) }}"
# The crio_runtimes variable defines a list of OCI compatible runtimes.
crio_runtimes:
--
GitLab