github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-28 12:31:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge f47d643b82 into 9379a18c8a

Browse Source
This commit is contained in:
Lukáš Doktor 2025-08-12 09:06:05 +02:00 committed by GitHub
commit 76456d5453
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -606,14 +606,14 @@ function configure_containerd_runtime() {
local runtime="kata-${adjusted_shim_to_multi_install}" local runtime="kata-${adjusted_shim_to_multi_install}"
local configuration="configuration-${shim}" local configuration="configuration-${shim}"
local pluginid=cri local pluginid=cri
local configuration_file="${containerd_conf_file}" local configuration_file="$3"
# Properly set the configuration file in case drop-in files are supported # Properly set the configuration file in case drop-in files are supported
if [ $use_containerd_drop_in_conf_file = "true" ]; then if [ $use_containerd_drop_in_conf_file = "true" ]; then
configuration_file="/host${containerd_drop_in_conf_file}" configuration_file="/host${containerd_drop_in_conf_file}"
fi fi
local containerd_root_conf_file="$containerd_conf_file" local containerd_root_conf_file="$configuration_file"
if [[ "$1" =~ ^(k0s-worker|k0s-controller)$ ]]; then if [[ "$1" =~ ^(k0s-worker|k0s-controller)$ ]]; then
containerd_root_conf_file="/etc/containerd/containerd.toml" containerd_root_conf_file="/etc/containerd/containerd.toml"
fi fi
@ -663,19 +663,38 @@ function configure_containerd() {
mkdir -p /etc/containerd/ mkdir -p /etc/containerd/
# To avoid problems when this pod gets re-created let's be a bit paranoiac
# and try to configure/backup the most recent configuration more-less
# atomically. This shouldn't be that needed for drop-in configuration
# but shouldn't harm either.
local tmp_config_file=$(mktemp)
( for i in {1..10}; do
local pre_config="$(cat "$containerd_conf_file")"
echo "$pre_config" > "$tmp_config_file"
for shim in "${shims[@]}"; do
configure_containerd_runtime "$1" "$shim" "$tmp_config_file"
done
if [ "$(cat "$containerd_conf_file")" == "$pre_config" ]; then
# Nobody modified the containerd file, write our changes in
# least dangerous way (no atomicity of this section...)
if [ $use_containerd_drop_in_conf_file = "false" ] && [ -f "$containerd_conf_file" ]; then if [ $use_containerd_drop_in_conf_file = "false" ] && [ -f "$containerd_conf_file" ]; then
# only backup in case drop-in files are not supported, and when doing the backup # only backup in case drop-in files are not supported, and when doing the backup
# only do it if a backup doesn't already exist (don't override original) # only do it if a backup doesn't already exist (don't override original)
cp -n "$containerd_conf_file" "$containerd_conf_file_backup" cp -n "$containerd_conf_file" "$containerd_conf_file_backup"
fi fi
mv -f "$tmp_config_file" "$containerd_conf_file"
exit 0
fi
sleep $(($RANDOM / 1000))
done ) || die "Failed to configure containerd in 10 iterations, is someone else modifying ${containerd_conf_file}?"
rm -f "$tmp_config_file"
if [ $use_containerd_drop_in_conf_file = "true" ]; then if [ $use_containerd_drop_in_conf_file = "true" ]; then
tomlq -i -t $(printf '.imports|=.+["%s"]' ${containerd_drop_in_conf_file}) ${containerd_conf_file} tomlq -i -t $(printf '.imports|=.+["%s"]' ${containerd_drop_in_conf_file}) ${containerd_conf_file}
fi fi
for shim in "${shims[@]}"; do
configure_containerd_runtime "$1" $shim
done
} }
function remove_artifacts() { function remove_artifacts() {
@ -734,9 +753,10 @@ function cleanup_containerd() {
return return
fi fi
rm -f $containerd_conf_file
if [ -f "$containerd_conf_file_backup" ]; then if [ -f "$containerd_conf_file_backup" ]; then
mv "$containerd_conf_file_backup" "$containerd_conf_file" mv -f "$containerd_conf_file_backup" "$containerd_conf_file"
else
rm -f $containerd_conf_file
fi fi
} }