From dd9f5b07b9243ca152c3d7fe9df472e2f31eb103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fabiano.fidencio@intel.com>
Date: Tue, 12 Dec 2023 12:08:37 +0100
Subject: [PATCH] kata-deploy: Use tomlq to configure containerd
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This save us a lot of trouble on properly sed'ing content that may or
may not be in the containerd configuration file.

Fixes: #8638

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

diff --git a/tools/packaging/kata-deploy/scripts/kata-deploy.sh b/tools/packaging/kata-deploy/scripts/kata-deploy.sh
index 9785fce67f..0bc76258db 100755
--- a/tools/packaging/kata-deploy/scripts/kata-deploy.sh
+++ b/tools/packaging/kata-deploy/scripts/kata-deploy.sh
@@ -357,42 +357,18 @@ function configure_containerd_runtime() {
 	if grep -q "version = 2\>" $containerd_conf_file || [ "$1" == "k0s-worker" ] || [ "$1" == "k0s-controller" ]; then
 		pluginid=\"io.containerd.grpc.v1.cri\"
 	fi
-	local runtime_table="plugins.${pluginid}.containerd.runtimes.$runtime"
-	local runtime_type="io.containerd.$runtime.v2"
-	local options_table="$runtime_table.options"
-	local config_path="$(get_kata_containers_config_path "$2")/$configuration.toml"
-	if grep -q "\[$runtime_table\]" $containerd_conf_file; then
-		echo "Configuration exists for $runtime_table, overwriting"
-		sed -i "/\[$runtime_table\]/,+1s#runtime_type.*#runtime_type = \"${runtime_type}\"#" $containerd_conf_file
-	else
-		cat <<EOF | tee -a "$containerd_conf_file"
-[$runtime_table]
-  runtime_type = "${runtime_type}"
-  privileged_without_host_devices = true
-  pod_annotations = ["io.katacontainers.*"]
-EOF
-	fi
-
-	if grep -q "\[$options_table\]" $containerd_conf_file; then
-		echo "Configuration exists for $options_table, overwriting"
-		sed -i "/\[$options_table\]/,+1s#ConfigPath.*#ConfigPath = \"${config_path}\"#" $containerd_conf_file
-	else
-		cat <<EOF | tee -a "$containerd_conf_file"
-  [$options_table]
-    ConfigPath = "${config_path}"
-EOF
-	fi
-
+	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\"
+	
+	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}
+	tomlq -i -t $(printf '%s.pod_annotations=["io.katacontainers.*"]' ${runtime_table}) ${containerd_conf_file}
+	tomlq -i -t $(printf '%s.ConfigPath=%s' ${runtime_options_table} ${runtime_config_path}) ${containerd_conf_file}
+	
 	if [ "${DEBUG}" == "true" ]; then
-		if grep -q "\[debug\]" $containerd_conf_file; then
-			sed -i 's/level.*/level = \"debug\"/' $containerd_conf_file
-		else
-			cat <<EOF | tee -a "$containerd_conf_file"
-[debug]
-  level = "debug"
-EOF
-		fi
-
+		tomlq -i -t '.debug.level = "debug"' ${containerd_conf_file}
 	fi
 }