From 8de2f914ab2045f7d2ccc2bca0c460e79f6fbf13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Fri, 30 Apr 2021 10:36:24 +0200 Subject: [PATCH] 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 --- 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() {