From 386a523a05b3baeaedaa2815e2bb6badcc0967a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fabiano.fidencio@intel.com>
Date: Fri, 8 Jul 2022 12:33:30 +0200
Subject: [PATCH 1/2] kata-deploy: Pass the config path to CRI-O
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As we're already doing for containerd, let's also pass the configuration
path to CRI-O, as all the supported CRI-O versions do support this
configuration option.

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
---
 tools/packaging/kata-deploy/scripts/kata-deploy.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/packaging/kata-deploy/scripts/kata-deploy.sh b/tools/packaging/kata-deploy/scripts/kata-deploy.sh
index 1bd51f4e2..9bb0275f9 100755
--- a/tools/packaging/kata-deploy/scripts/kata-deploy.sh
+++ b/tools/packaging/kata-deploy/scripts/kata-deploy.sh
@@ -129,12 +129,15 @@ function cleanup_different_shims_base() {
 
 function configure_crio_runtime() {
 	local runtime="kata"
+	local configuration="configuration"
 	if [ -n "${1-}" ]; then
 		runtime+="-$1"
+		configuration+="-$1"
 	fi
 
 	local kata_path="/usr/local/bin/containerd-shim-${runtime}-v2"
 	local kata_conf="crio.runtime.runtimes.${runtime}"
+	local kata_config_path="/opt/kata/share/defaults/kata-containers/$configuration.toml"
 
 	cat <<EOF | tee -a "$crio_drop_in_conf_file"
 
@@ -143,6 +146,7 @@ function configure_crio_runtime() {
 	runtime_path = "${kata_path}"
 	runtime_type = "vm"
 	runtime_root = "/run/vc"
+	runtime_config_path = "${kata_config_path}"
 	privileged_without_host_devices = true
 EOF
 }

From f7ccf92dc82e9264fafd0ccf565f6dd014786e3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fabiano.fidencio@intel.com>
Date: Fri, 8 Jul 2022 12:44:43 +0200
Subject: [PATCH 2/2] kata-deploy: Rely on the configured config path
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Instead of passing a `KATA_CONF_FILE` environament variable, let's rely
on the configured (in the container engine) config path, as both
containerd and CRI-O support it, and we're using this for both of them.

Fixes: #4608

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
---
 tools/packaging/kata-deploy/scripts/kata-deploy.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tools/packaging/kata-deploy/scripts/kata-deploy.sh b/tools/packaging/kata-deploy/scripts/kata-deploy.sh
index 9bb0275f9..4345f2403 100755
--- a/tools/packaging/kata-deploy/scripts/kata-deploy.sh
+++ b/tools/packaging/kata-deploy/scripts/kata-deploy.sh
@@ -98,10 +98,7 @@ function configure_different_shims_base() {
 			fi
 		fi
 
-		cat << EOF | tee "$shim_file"
-#!/usr/bin/env bash
-KATA_CONF_FILE=/opt/kata/share/defaults/kata-containers/configuration-${shim}.toml /opt/kata/bin/containerd-shim-kata-v2 "\$@"
-EOF
+		ln -sf /opt/kata/bin/containerd-shim-kata-v2 "${shim_file}"
 		chmod +x "$shim_file"
 
 		if [ "${shim}" == "${default_shim}" ]; then