Skip to content

Commit a560c8d

Browse files
committed
node_e2e_installer: use runc/crun from PATH
Signed-off-by: Peter Hunt <[email protected]>
1 parent e3cef0a commit a560c8d

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

scripts/node_e2e_installer

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,17 @@ install_crio() {
3030
# Setup log level
3131
echo "CONTAINER_LOG_LEVEL=debug" >>/etc/sysconfig/crio
3232

33-
# Setup secondary runtime
34-
cat <<EOF >/etc/crio/crio.conf.d/20-runc.conf
33+
cat <<EOF >/etc/crio/crio.conf.d/10-crun.conf
3534
[crio.runtime]
36-
default_runtime = "runc"
3735
[crio.runtime.runtimes]
38-
[crio.runtime.runtimes.runc]
39-
runtime_path="/usr/local/bin/runc"
36+
[crio.runtime.runtimes.test-handler]
4037
EOF
4138

42-
cat <<EOF >/etc/crio/crio.conf.d/10-crun.conf
39+
cat <<EOF >/etc/crio/crio.conf.d/20-runc.conf
4340
[crio.runtime]
41+
default_runtime = "runc"
4442
[crio.runtime.runtimes]
45-
[crio.runtime.runtimes.test-handler]
46-
runtime_path="/usr/local/bin/crun"
43+
[crio.runtime.runtimes.runc]
4744
EOF
4845

4946
cat <<EOF >/etc/crio/crio.conf.d/30-infra-container.conf

0 commit comments

Comments
 (0)