github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-27 20:18:57 +00:00
Code Issues Projects Releases Wiki Activity

kata-deploy: Use different shim arrays for different arches

Browse Source 
On main we will not have this problem as we can easily configure which
shims will be installed according to an environment variable passed to
the kata-deploy.yaml file.

However, on CCV0, at least for now, we better keep the list of shims
separated by architecture, as we've found out that s390x CoCo Operator
CI is breaking because we try to install a shim that's not even built
for that architecture (dragonball).

Fixes: #7422

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
Fabiano Fidêncio 2023-07-27 22:16:58 +02:00
parent e0bcb39ee7
commit b8b73939ea
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tools/packaging/kata-deploy/scripts/kata-deploy.sh
View File

@ -13,7 +13,7 @@ crio_drop_in_conf_file="${crio_drop_in_conf_dir}/99-kata-deploy"
containerd_conf_file="/etc/containerd/config.toml" containerd_conf_file="/etc/containerd/config.toml"
containerd_conf_file_backup="${containerd_conf_file}.bak" containerd_conf_file_backup="${containerd_conf_file}.bak"
shims=( shims_x86_64=(
"fc" "fc"
"qemu" "qemu"
"qemu-nvidia-gpu" "qemu-nvidia-gpu"
@ -25,12 +25,31 @@ shims=(
) )
# THOSE ARE NOT YET ON MAIN, PLEASE, MOVE THEM TO THE UPPDER LIST WHENEVER THEY MAKE THEIR WAY IN. # THOSE ARE NOT YET ON MAIN, PLEASE, MOVE THEM TO THE UPPDER LIST WHENEVER THEY MAKE THEIR WAY IN.
shims+=( shims_x86_64+=(
"remote" "remote"
"qemu-se"
"clh-tdx" "clh-tdx"
) )
shims_s390x=(
"qemu"
)
# THOSE ARE NOT YET ON MAIN, PLEASE, MOVE THEM TO THE UPPDER LIST WHENEVER THEY MAKE THEIR WAY IN.
shims_s390x+=(
"remote"
"qemu-se"
)
arch=$(uname -m)
if [[ "${arch}" == "x86_64" ]]; then
shims=${shims_x86_64[@]}
else if [[ "${arch}" == "s390x" ]]; then
shims=${shims_s390x[@]}
else
die "${arch} is a not supported architecture"
fi
default_shim="qemu" default_shim="qemu"
# If we fail for any reason a message will be displayed # If we fail for any reason a message will be displayed