From 8de2f914ab2045f7d2ccc2bca0c460e79f6fbf13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
Date: Fri, 30 Apr 2021 10:36:24 +0200
Subject: [PATCH 1/2] kata-deploy: Rely on CRIO default's values for
 manage_ns_lifecycle
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

manage_ns_lifecycle (previously known as manage_network_ns_lifecycle)
has its default value as `true` for all CRI-O versions that should be
used with the kubernetes versions that are still supported / didn't
reach their EOL.

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

diff --git a/tools/packaging/kata-deploy/scripts/kata-deploy.sh b/tools/packaging/kata-deploy/scripts/kata-deploy.sh
index 9903495c93..debe12e234 100755
--- a/tools/packaging/kata-deploy/scripts/kata-deploy.sh
+++ b/tools/packaging/kata-deploy/scripts/kata-deploy.sh
@@ -149,11 +149,6 @@ function configure_crio() {
 	for shim in "${shims[@]}"; do
 		configure_crio_runtime $shim
 	done
-
-	# Replace if exists, insert otherwise
-	grep -Fq 'manage_network_ns_lifecycle =' $crio_conf_file \
-		&& sed -i '/manage_network_ns_lifecycle =/c manage_network_ns_lifecycle = true' $crio_conf_file \
-		|| sed -i '/\[crio.runtime\]/a manage_network_ns_lifecycle = true' $crio_conf_file
 }
 
 function configure_containerd_runtime() {

From 2047f26fa380779f7d6a2d2dd96e0b025a0882af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
Date: Fri, 30 Apr 2021 10:44:59 +0200
Subject: [PATCH 2/2] kata-deploy: Adapt CRI-O config to use drop-in files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

By using drop-in file it simplifies the deployment and maintenance of
the CRI-O configurations by a lot, and all versions of CRI-O that should
be used together with the currently supported versions of kubenertes
support the drop-in configuration file.

Depends-on: github.com/kata-containers/kata-containers#1689
Fixes #1781

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
---
 .../kata-deploy/scripts/kata-deploy.sh        | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/tools/packaging/kata-deploy/scripts/kata-deploy.sh b/tools/packaging/kata-deploy/scripts/kata-deploy.sh
index debe12e234..abdfc6777b 100755
--- a/tools/packaging/kata-deploy/scripts/kata-deploy.sh
+++ b/tools/packaging/kata-deploy/scripts/kata-deploy.sh
@@ -8,8 +8,8 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
-crio_conf_file="/etc/crio/crio.conf"
-crio_conf_file_backup="${crio_conf_file}.bak"
+crio_drop_in_conf_dir="/etc/crio/crio.conf.d/"
+crio_drop_in_conf_file="${crio_drop_in_conf_dir}/99-kata-deploy"
 containerd_conf_file="/etc/containerd/config.toml"
 containerd_conf_file_backup="${containerd_conf_file}.bak"
 
@@ -123,12 +123,7 @@ function configure_crio_runtime() {
 	local kata_path="/usr/local/bin/containerd-shim-${runtime}-v2"
 	local kata_conf="crio.runtime.runtimes.${runtime}"
 
-	if grep -qEe "^\[$kata_conf\]" $crio_conf_file; then
-		echo "Configuration exists $kata_conf, overwriting"
-		sed -i "/\[$kata_conf\]/\[$kata_conf-original\]/" $crio_conf_file
-	fi
-
-	cat <<EOT | tee -a "$crio_conf_file"
+	cat <<EOT | tee -a "$crio_drop_in_conf_file"
 
 # Path to the Kata Containers runtime binary that uses the $1
 [$kata_conf]
@@ -143,8 +138,12 @@ function configure_crio() {
 	# Configure crio to use Kata:
 	echo "Add Kata Containers as a supported runtime for CRIO:"
 
-	# backup the CRIO.conf only if a backup doesn't already exist (don't override original)
-	cp -n "$crio_conf_file" "$crio_conf_file_backup"
+	# As we don't touch the original configuration file in any way,
+	# let's just ensure we remove any exist configuration from a
+	# previous deployment.
+	mkdir -p "$crio_drop_in_conf_dir"
+	rm -f "$crio_drop_in_conf_file"
+	touch "$crio_drop_in_conf_file"
 
 	for shim in "${shims[@]}"; do
 		configure_crio_runtime $shim
@@ -228,9 +227,7 @@ function cleanup_cri_runtime() {
 }
 
 function cleanup_crio() {
-	if [ -f "$crio_conf_file_backup" ]; then
-		cp "$crio_conf_file_backup" "$crio_conf_file"
-	fi
+	rm $crio_drop_in_conf_file
 }
 
 function cleanup_containerd() {