From 6b319d18aef112056dcaa5c705fc9effeee8e6b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Doktor?= Date: Wed, 21 Aug 2024 16:27:09 +0200 Subject: [PATCH] pre-install: Use crio container_engine for cri-o runtime MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit the cri-o runtime naming is inconsistent and for service uses "crio.service" name (without the "-"). To be consistent with kata-containers override the container_engine variable to "crio" and update all places where it's being used. Related to: #418 Signed-off-by: Lukáš Doktor --- install/pre-install-payload/scripts/reqs-deploy.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/install/pre-install-payload/scripts/reqs-deploy.sh b/install/pre-install-payload/scripts/reqs-deploy.sh index 8ae05f00..ae4e6673 100755 --- a/install/pre-install-payload/scripts/reqs-deploy.sh +++ b/install/pre-install-payload/scripts/reqs-deploy.sh @@ -42,6 +42,9 @@ function set_container_engine() { # Those are intentionally not set as local container_engine=$(get_container_engine) + if [ "$container_engine" == "cri-o" ]; then + container_engine="crio" + fi } function install_containerd_artefacts() { @@ -87,7 +90,7 @@ function install_nydus_snapshotter_artefacts() { function install_artifacts() { # There shouldn't be installed additional artifacts for CRI-O - [ "${container_engine}" = "cri-o" ] && return + [ "${container_engine}" = "crio" ] && return if [ "${INSTALL_COCO_CONTAINERD}" = "true" ]; then install_coco_containerd_artefacts @@ -154,7 +157,7 @@ function uninstall_nydus_snapshotter_artefacts() { function uninstall_artifacts() { # It didn't install additional artifacts for CRI-O, so return - [ "${container_engine}" = "cri-o" ] && return + [ "${container_engine}" = "crio" ] && return if [ "${INSTALL_NYDUS_SNAPSHOTTER}" = "true" ]; then uninstall_nydus_snapshotter_artefacts