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

kata-deploy-cc: Ignore annotations in kata-remote

Browse Source 
Pod annotations (io.katacontainers.*) are not meaningful
for the remote hypervisor. This patch disables pod annotations
in the kata-remote settings of the containerd configuration.

Fixes: #6345
Signed-off-by: Yohei Ueda <yohei@jp.ibm.com>
This commit is contained in:
Yohei Ueda 2023-05-26 17:04:21 +09:00
parent 4ab93e662c
commit 5cb8221977
No known key found for this signature in database
GPG Key ID: 1C7EADC530DC4597
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,9 +211,11 @@ function configure_containerd_runtime() {
fi fi
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="" local cri_handler_value="cc"
if echo "${runtime_type}" | grep -q -v -e "kata-remote\.v2" -e "kata\.v2"; then local pod_annotations='["io.katacontainers.*"]'
cri_handler_value="cc" if [ "$runtime" == "kata-remote" ]; then
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"
@ -226,7 +228,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 = ["io.katacontainers.*"] pod_annotations = ${pod_annotations}
EOF EOF
fi fi