From 7ad873cf29bf89c1aae87359d03e84638a0d8f7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fabiano.fidencio@intel.com>
Date: Wed, 13 Dec 2023 10:52:54 +0100
Subject: [PATCH] kata-deploy: Simplify shim configuration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We never have to add a configuration for the "default" case, as we're
already creating the runtime class pointing to what should be the
"default" handler.

This helps to simplify the logic by quite a lot.

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

diff --git a/tools/packaging/kata-deploy/scripts/kata-deploy.sh b/tools/packaging/kata-deploy/scripts/kata-deploy.sh
index 4312e675bd..7ff1b54d8a 100755
--- a/tools/packaging/kata-deploy/scripts/kata-deploy.sh
+++ b/tools/packaging/kata-deploy/scripts/kata-deploy.sh
@@ -294,14 +294,11 @@ 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 shim="${1}"
+	local runtime="kata-${shim}"
+	local configuration="configuration-${shim}"
 
-	local config_path=$(get_kata_containers_config_path "${1}")
+	local config_path=$(get_kata_containers_config_path "${shim}")
 
 	local kata_path="/usr/local/bin/containerd-shim-${runtime}-v2"
 	local kata_conf="crio.runtime.runtimes.${runtime}"
@@ -343,12 +340,9 @@ EOF
 }
 
 function configure_containerd_runtime() {
-	local runtime="kata"
-	local configuration="configuration"
-	if [ -n "${2-}" ]; then
-		runtime+="-$2"
-		configuration+="-$2"
-	fi
+	local shim="$2"
+	local runtime="kata-${shim}"
+	local configuration="configuration-${shim}"
 	local pluginid=cri
 	
 	# if we are running k0s auto containerd.toml generation, the base template is by default version 2
@@ -359,7 +353,7 @@ function configure_containerd_runtime() {
 	local runtime_table=".plugins.${pluginid}.containerd.runtimes.\"${runtime}\""
 	local runtime_options_table="${runtime_table}.options"
 	local runtime_type=\"io.containerd."${runtime}".v2\"
-	local runtime_config_path=\"$(get_kata_containers_config_path "${2-}")/${configuration}.toml\"
+	local runtime_config_path=\"$(get_kata_containers_config_path "${shim}")/${configuration}.toml\"
 	
 	tomlq -i -t $(printf '%s.runtime_type=%s' ${runtime_table} ${runtime_type}) ${containerd_conf_file}
 	tomlq -i -t $(printf '%s.privileged_without_host_devices=true' ${runtime_table}) ${containerd_conf_file}
@@ -382,9 +376,6 @@ function configure_containerd() {
 		cp -n "$containerd_conf_file" "$containerd_conf_file_backup"
 	fi
 
-	# Add default Kata runtime configuration
-	configure_containerd_runtime "$1" 
-
 	for shim in "${shims[@]}"; do
 		configure_containerd_runtime "$1" $shim
 	done