github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-15 22:08:47 +00:00
Code Issues Projects Releases Wiki Activity

runtime: Enable init_data annotation

Browse Source 
In #11693 the cc_init_data annotation was changes to be hypervisor
scoped, so each hypervisor needs to explicitly allow it in order to
use it now, so add this to both the go and rust runtime's remote
configurations

Signed-off-by: stevenhorsman <steven@uk.ibm.com>
This commit is contained in:
stevenhorsman
2025-08-21 19:26:10 +01:00
parent 014ab2fce6
commit 081823b388
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/runtime-rs/config/configuration-remote.toml.in
View File

@@ -29,7 +29,7 @@ remote_hypervisor_timeout = 600
# #
# Known limitations: # Known limitations:
# * Does not work by design: # * Does not work by design:
# - CPU Hotplug # - CPU Hotplug
# - Memory Hotplug # - Memory Hotplug
# - NVDIMM devices # - NVDIMM devices
# #
@@ -41,7 +41,7 @@ remote_hypervisor_timeout = 600
# Each member of the list is a regular expression, which is the base name # Each member of the list is a regular expression, which is the base name
# of the annotation, e.g. "path" for io.katacontainers.config.hypervisor.path" # of the annotation, e.g. "path" for io.katacontainers.config.hypervisor.path"
# Note: Remote hypervisor is only handling the following annotations # Note: Remote hypervisor is only handling the following annotations
enable_annotations = ["machine_type", "default_memory", "default_vcpus", "default_gpus", "default_gpu_model"] enable_annotations = ["machine_type", "default_memory", "default_vcpus", "default_gpus", "default_gpu_model", "cc_init_data"]
# Optional space-separated list of options to pass to the guest kernel. # Optional space-separated list of options to pass to the guest kernel.
# For example, use `kernel_params = "vsyscall=emulate"` if you are having # For example, use `kernel_params = "vsyscall=emulate"` if you are having
@@ -251,7 +251,7 @@ disable_guest_seccomp=true
# with `internetworking_model=none`. The tap device will be in the host network namespace and can connect to a bridge # with `internetworking_model=none`. The tap device will be in the host network namespace and can connect to a bridge
# (like OVS) directly. # (like OVS) directly.
# (default: false) # (default: false)
# Note: The remote hypervisor has a different networking model, which requires true # Note: The remote hypervisor has a different networking model, which requires true
disable_new_netns = false disable_new_netns = false
# if enabled, the runtime will add all the kata processes inside one dedicated cgroup. # if enabled, the runtime will add all the kata processes inside one dedicated cgroup.

12
src/runtime/config/configuration-remote.toml.in
View File

@@ -26,7 +26,7 @@ remote_hypervisor_timeout = 600
# #
# Known limitations: # Known limitations:
# * Does not work by design: # * Does not work by design:
# - CPU Hotplug # - CPU Hotplug
# - Memory Hotplug # - Memory Hotplug
# - NVDIMM devices # - NVDIMM devices
# #
@@ -38,7 +38,7 @@ remote_hypervisor_timeout = 600
# Each member of the list is a regular expression, which is the base name # Each member of the list is a regular expression, which is the base name
# of the annotation, e.g. "path" for io.katacontainers.config.hypervisor.path" # of the annotation, e.g. "path" for io.katacontainers.config.hypervisor.path"
# Note: Remote hypervisor is only handling the following annotations # Note: Remote hypervisor is only handling the following annotations
enable_annotations = ["machine_type", "default_memory", "default_vcpus", "image", "default_gpus", "gpu_model"] enable_annotations = ["machine_type", "default_memory", "default_vcpus", "image", "default_gpus", "gpu_model", "cc_init_data"]
# Optional space-separated list of options to pass to the guest kernel. # Optional space-separated list of options to pass to the guest kernel.
# For example, use `kernel_params = "vsyscall=emulate"` if you are having # For example, use `kernel_params = "vsyscall=emulate"` if you are having
@@ -231,7 +231,7 @@ disable_guest_seccomp=true
# with `internetworking_model=none`. The tap device will be in the host network namespace and can connect to a bridge # with `internetworking_model=none`. The tap device will be in the host network namespace and can connect to a bridge
# (like OVS) directly. # (like OVS) directly.
# (default: false) # (default: false)
# Note: The remote hypervisor has a different networking model, which requires true # Note: The remote hypervisor has a different networking model, which requires true
disable_new_netns = true disable_new_netns = true
# if enabled, the runtime will add all the kata processes inside one dedicated cgroup. # if enabled, the runtime will add all the kata processes inside one dedicated cgroup.
@@ -291,9 +291,9 @@ experimental=@DEFAULTEXPFEATURES@
# Indicates the CreateContainer request timeout needed for the workload(s) # Indicates the CreateContainer request timeout needed for the workload(s)
# It using guest_pull this includes the time to pull the image inside the guest # It using guest_pull this includes the time to pull the image inside the guest
# Defaults to @DEFCREATECONTAINERTIMEOUT@ second(s) # Defaults to @DEFCREATECONTAINERTIMEOUT@ second(s)
# Note: The effective timeout is determined by the lesser of two values: runtime-request-timeout from kubelet config # Note: The effective timeout is determined by the lesser of two values: runtime-request-timeout from kubelet config
# (https://kubernetes.io/docs/reference/command-line-tools-reference/kubelet/#:~:text=runtime%2Drequest%2Dtimeout) and create_container_timeout. # (https://kubernetes.io/docs/reference/command-line-tools-reference/kubelet/#:~:text=runtime%2Drequest%2Dtimeout) and create_container_timeout.
# In essence, the timeout used for guest pull=runtime-request-timeout<create_container_timeout?runtime-request-timeout:create_container_timeout. # In essence, the timeout used for guest pull=runtime-request-timeout<create_container_timeout?runtime-request-timeout:create_container_timeout.
create_container_timeout = @DEFCREATECONTAINERTIMEOUT@ create_container_timeout = @DEFCREATECONTAINERTIMEOUT@