From 441399df1f473088703d91cff63161ee79c76502 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fabiano.fidencio@intel.com>
Date: Thu, 7 Jul 2022 10:57:11 +0200
Subject: [PATCH] kata-deploy: Get back to the original kata-deploy.sh
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Instead of hacking the original `kata-deploy.sh` script, let's add a
totally new folder where we'll be adding content that's CC related.

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
---
 .../packaging/kata-deploy/scripts/kata-deploy.sh | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)
 mode change 100755 => 100644 tools/packaging/kata-deploy/scripts/kata-deploy.sh

diff --git a/tools/packaging/kata-deploy/scripts/kata-deploy.sh b/tools/packaging/kata-deploy/scripts/kata-deploy.sh
old mode 100755
new mode 100644
index 4ce6f54a0c..1bd51f4e28
--- a/tools/packaging/kata-deploy/scripts/kata-deploy.sh
+++ b/tools/packaging/kata-deploy/scripts/kata-deploy.sh
@@ -18,7 +18,6 @@ shims=(
 	"qemu"
 	"clh"
 )
-[ "${CONFIGURE_CC:-}" == "yes" ] && shims+=("cc")
 
 default_shim="qemu"
 
@@ -185,8 +184,7 @@ function configure_containerd_runtime() {
 	else
 		cat <<EOF | tee -a "$containerd_conf_file"
 [$runtime_table]
-  runtime_type = "${runtime_type}" \
-$([ "$runtime" == "kata-cc" ] && printf '\n  cri_handler = "cc"')
+  runtime_type = "${runtime_type}"
   privileged_without_host_devices = true
   pod_annotations = ["io.katacontainers.*"]
 EOF
@@ -222,17 +220,6 @@ function configure_containerd() {
 	done
 }
 
-function configure_kata() {
-	if [ "${CONFIGURE_CC:-}" == "yes" ]; then
-		sed -E \
-			-e 's#^image = .+#initrd = "/opt/kata/share/kata-containers/kata-containers-initrd.img"#' \
-			-e 's#^(kernel_params = .+)"#\1 agent.config_file=/etc/kata-containers/agent.toml"#' \
-			-e 's#.*service_offload = .+#service_offload = true#' \
-			"/opt/kata/share/defaults/kata-containers/configuration-qemu.toml" > \
-			"/opt/kata/share/defaults/kata-containers/configuration-cc.toml"
-	fi
-}
-
 function remove_artifacts() {
 	echo "deleting kata artifacts"
 	rm -rf /opt/kata/
@@ -313,7 +300,6 @@ function main() {
 		install)
 			install_artifacts
 			configure_cri_runtime "$runtime"
-			configure_kata
 			kubectl label node "$NODE_NAME" --overwrite katacontainers.io/kata-runtime=true
 			;;
 		cleanup)