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.

Sign up for GitHub

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

Jump to bottom

kata-deploy: Fix shim check for snapshotter configuration #8733

Merged
merged 3 commits into from
Dec 27, 2023
Merged

kata-deploy: Fix shim check for snapshotter configuration #8733

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
907f1dd
kata-deploy: Fix shim check for snapshotter configuration
fidencio Dec 26, 2023
8332f3c
kata-deploy: Fix the snapshotter config placement
fidencio Dec 26, 2023
6ee7fb5
kata-deploy: Double quote the snapshotter name
fidencio Dec 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions tools/packaging/kata-deploy/scripts/kata-deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ function configure_containerd_runtime() {
fi

value="${m#*$snapshotters_delimiter}"
tomlq -i -t $(printf '%s.snapshotter=%s' ${shim} ${value}) ${containerd_conf_file}
tomlq -i -t $(printf '%s.snapshotter="%s"' ${runtime_table} ${value}) ${containerd_conf_file}
break
done
fi
Expand Down Expand Up @@ -481,7 +481,7 @@ function snapshotter_handler_mapping_validation_check() {
die "The snapshotter must follow the \"shim:snapshotter,shim:snapshotter,...\" format, but at least one snapshotter is empty"
fi

if ! grep -q " $shim " <<< " $shims "; then
if ! grep -q " $shim " <<< " $SHIMS "; then
die "\"$shim\" is not part of \"$SHIMS\""
fi

Expand Down