Skip to content

Commit

Permalink
pre-install: Use crio container_engine for cri-o runtime
Browse files Browse the repository at this point in the history
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: confidential-containers#418

Signed-off-by: Lukáš Doktor <[email protected]>
  • Loading branch information
ldoktor committed Sep 2, 2024
1 parent 3cdc158 commit 6b319d1
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions install/pre-install-payload/scripts/reqs-deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 6b319d1

Please sign in to comment.