From 82d44320e647c43d8470938b85f2efd3c64005b3 Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Fri, 7 Jul 2023 14:06:37 +0100 Subject: [PATCH] kata-deploy: Remove remote annotation logic Remove the logic that made the kata-remote containerd config not support io.katacontainers annotations Fixes: #7265 Signed-off-by: stevenhorsman --- tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh b/tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh index e266c61f74..20959ab669 100755 --- a/tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh +++ b/tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh @@ -212,10 +212,8 @@ function configure_containerd_runtime() { local runtime_table="plugins.${pluginid}.containerd.runtimes.$runtime" local runtime_type="io.containerd.$runtime.v2" local cri_handler_value="cc" - local pod_annotations='["io.katacontainers.*"]' if [ "$runtime" == "kata-remote" ]; then cri_handler_value="" - pod_annotations='[]' fi local options_table="$runtime_table.options" local config_path="/opt/confidential-containers/share/defaults/kata-containers/$configuration.toml" @@ -228,7 +226,7 @@ function configure_containerd_runtime() { cri_handler = "${cri_handler_value}" runtime_type = "${runtime_type}" privileged_without_host_devices = true - pod_annotations = ${pod_annotations} + pod_annotations = ["io.katacontainers.*"] EOF fi