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

Conversation

ldoktor
Copy link
Contributor

@ldoktor ldoktor commented Aug 21, 2024

the cri-o runtime uses "crio.service" service name (tested on OCP 4.14)

Related to: #418

Copy link
Member

@bpradipt bpradipt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

Copy link
Member

@beraldoleal beraldoleal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My only concern was that in some systems, cri-o service would be called 'cri-o' instead of 'crio'. Because I remember testing crio + ubuntu before. But I just tested with ubuntu2204, and both will work, so this LGTM, thanks @ldoktor

service_name="${container_engine}"
fi
echo "Restarting ${service_name}"
host_systemctl restart "${service_name}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

@fidencio fidencio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Requesting changes, as I'd rather have this more aligned with what we do in Kata Containers.

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]>
@ldoktor
Copy link
Contributor Author

ldoktor commented Sep 2, 2024

@fidencio makes sense to me (although personally I'd move it even directly to get_container_runtime). I tried addressing all the places (except one that uses the local container_runtime and which should contain the cri-o).

Copy link
Member

@fidencio fidencio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, thanks @ldoktor!

@fidencio fidencio merged commit f875faf into confidential-containers:main Sep 4, 2024
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants