Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pre-install: Fix service name for cri-o runtime #424

Merged
merged 1 commit into from
Sep 4, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading