From 907f1ddb9e38cdd29475c0ce579327e1ed68af9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 26 Dec 2023 07:42:36 -0300 Subject: [PATCH] kata-deploy: Fix shim check for snapshotter configuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We want to check whether the shim is part of the "plain text" shims passed to the daemonset (meaning, checking against `$SHIMS`). Before this fix we were checking against `$shims`, which is an array of shims instead of a string, resulting on a broken check. Fixes: #8732 Signed-off-by: Fabiano FidĂȘncio --- tools/packaging/kata-deploy/scripts/kata-deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/packaging/kata-deploy/scripts/kata-deploy.sh b/tools/packaging/kata-deploy/scripts/kata-deploy.sh index 66e45a539a..70210fedeb 100755 --- a/tools/packaging/kata-deploy/scripts/kata-deploy.sh +++ b/tools/packaging/kata-deploy/scripts/kata-deploy.sh @@ -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