github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-23 02:06:47 +00:00
Code Issues Projects Releases Wiki Activity

kata-deploy: Remove remote annotation logic

Browse Source 
Remove the logic that made the kata-remote containerd config not support
io.katacontainers annotations

Fixes: #7265
Signed-off-by: stevenhorsman <steven@uk.ibm.com>
This commit is contained in:
stevenhorsman 2023-07-07 14:06:37 +01:00
parent 61f3e58abf
commit 82d44320e6
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh
View File

@ -212,10 +212,8 @@ function configure_containerd_runtime() {
local runtime_table="plugins.${pluginid}.containerd.runtimes.$runtime" local runtime_table="plugins.${pluginid}.containerd.runtimes.$runtime"
local runtime_type="io.containerd.$runtime.v2" local runtime_type="io.containerd.$runtime.v2"
local cri_handler_value="cc" local cri_handler_value="cc"
local pod_annotations='["io.katacontainers.*"]'
if [ "$runtime" == "kata-remote" ]; then if [ "$runtime" == "kata-remote" ]; then
cri_handler_value="" cri_handler_value=""
pod_annotations='[]'
fi fi
local options_table="$runtime_table.options" local options_table="$runtime_table.options"
local config_path="/opt/confidential-containers/share/defaults/kata-containers/$configuration.toml" 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}" cri_handler = "${cri_handler_value}"
runtime_type = "${runtime_type}" runtime_type = "${runtime_type}"
privileged_without_host_devices = true privileged_without_host_devices = true
pod_annotations = ${pod_annotations} pod_annotations = ["io.katacontainers.*"]
EOF EOF
fi fi