kata-deploy: Use (kata with) qemu as the default shim-v2 binary

When using kata-deploy, no `containerd-shim-kata-v2` binary is deployed,
but we do deploy a `kata` runtime class, which seems very much
incosistent.

As the default configuration for kata-containers points to QEMU, let's
also use kata with QEMU as the default shim-v2 binary.

Fixes: #3228, #3734

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
Fabiano Fidêncio 2022-02-21 09:59:23 +01:00
parent a671b455a2
commit 11220f052f

View File

@ -19,6 +19,8 @@ shims=(
"clh"
)
default_shim="qemu"
# If we fail for any reason a message will be displayed
die() {
msg="$*"
@ -97,6 +99,11 @@ function configure_different_shims_base() {
KATA_CONF_FILE=/opt/kata/share/defaults/kata-containers/configuration-${shim}.toml /opt/kata/bin/containerd-shim-kata-v2 "\$@"
EOT
chmod +x "$shim_file"
if [ "${shim}" == "${default_shim}" ]; then
echo "Creating the default shim-v2 binary"
ln -sf "${shim_file}" /usr/local/bin/containerd-shim-kata-v2
fi
done
}
@ -112,6 +119,8 @@ function cleanup_different_shims_base() {
mv "$shim_backup" "$shim_file"
fi
done
rm /usr/local/bin/containerd-shim-kata-v2
}
function configure_crio_runtime() {