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: kata-containers#3228, kata-containers#3734 Signed-off-by: Fabiano Fidêncio <[email protected]>
microsoft · Feb 21, 2022 · 11220f0 · 11220f0
1 parent a671b45
commit 11220f0
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/tools/packaging/kata-deploy/scripts/kata-deploy.sh b/tools/packaging/kata-deploy/scripts/kata-deploy.sh
@@ -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() {