mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-08-15 06:34:03 +00:00
runtime: Use static_sandbox_resource_mgmt=true for TEEs
When this option is enabled the runtime will attempt to determine the appropriate sandbox size (memory, CPU) before booting the virtual machine. As TEEs do not support memory and CPU hotplug, this approach must be used. Fixes: #6818 Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
parent
851b97fa51
commit
ca1531fe9d
@ -242,6 +242,7 @@ DEFVFIOMODE := guest-kernel
|
|||||||
DEFSANDBOXCGROUPONLY ?= false
|
DEFSANDBOXCGROUPONLY ?= false
|
||||||
|
|
||||||
DEFSTATICRESOURCEMGMT ?= false
|
DEFSTATICRESOURCEMGMT ?= false
|
||||||
|
DEFSTATICRESOURCEMGMT_TEE = true
|
||||||
|
|
||||||
DEFBINDMOUNTS := []
|
DEFBINDMOUNTS := []
|
||||||
|
|
||||||
@ -599,6 +600,7 @@ USER_VARS += DEFVALIDENTROPYSOURCES
|
|||||||
USER_VARS += DEFSANDBOXCGROUPONLY
|
USER_VARS += DEFSANDBOXCGROUPONLY
|
||||||
USER_VARS += DEFSTATICRESOURCEMGMT
|
USER_VARS += DEFSTATICRESOURCEMGMT
|
||||||
USER_VARS += DEFSTATICRESOURCEMGMT_FC
|
USER_VARS += DEFSTATICRESOURCEMGMT_FC
|
||||||
|
USER_VARS += DEFSTATICRESOURCEMGMT_TEE
|
||||||
USER_VARS += DEFBINDMOUNTS
|
USER_VARS += DEFBINDMOUNTS
|
||||||
USER_VARS += DEFSERVICEOFFLOAD
|
USER_VARS += DEFSERVICEOFFLOAD
|
||||||
USER_VARS += DEFVFIOMODE
|
USER_VARS += DEFVFIOMODE
|
||||||
|
@ -578,7 +578,7 @@ sandbox_cgroup_only=@DEFSANDBOXCGROUPONLY@
|
|||||||
# - When running with pods, sandbox sizing information will only be available if using Kubernetes >= 1.23 and containerd >= 1.6. CRI-O
|
# - When running with pods, sandbox sizing information will only be available if using Kubernetes >= 1.23 and containerd >= 1.6. CRI-O
|
||||||
# does not yet support sandbox sizing annotations.
|
# does not yet support sandbox sizing annotations.
|
||||||
# - When running single containers using a tool like ctr, container sizing information will be available.
|
# - When running single containers using a tool like ctr, container sizing information will be available.
|
||||||
static_sandbox_resource_mgmt=@DEFSTATICRESOURCEMGMT@
|
static_sandbox_resource_mgmt=@DEFSTATICRESOURCEMGMT_TEE@
|
||||||
|
|
||||||
# If specified, sandbox_bind_mounts identifieds host paths to be mounted (ro) into the sandboxes shared path.
|
# If specified, sandbox_bind_mounts identifieds host paths to be mounted (ro) into the sandboxes shared path.
|
||||||
# This is only valid if filesystem sharing is utilized. The provided path(s) will be bindmounted into the shared fs directory.
|
# This is only valid if filesystem sharing is utilized. The provided path(s) will be bindmounted into the shared fs directory.
|
||||||
|
@ -618,7 +618,7 @@ sandbox_cgroup_only=@DEFSANDBOXCGROUPONLY@
|
|||||||
# - When running with pods, sandbox sizing information will only be available if using Kubernetes >= 1.23 and containerd >= 1.6. CRI-O
|
# - When running with pods, sandbox sizing information will only be available if using Kubernetes >= 1.23 and containerd >= 1.6. CRI-O
|
||||||
# does not yet support sandbox sizing annotations.
|
# does not yet support sandbox sizing annotations.
|
||||||
# - When running single containers using a tool like ctr, container sizing information will be available.
|
# - When running single containers using a tool like ctr, container sizing information will be available.
|
||||||
static_sandbox_resource_mgmt=@DEFSTATICRESOURCEMGMT@
|
static_sandbox_resource_mgmt=@DEFSTATICRESOURCEMGMT_TEE@
|
||||||
|
|
||||||
# If specified, sandbox_bind_mounts identifieds host paths to be mounted (ro) into the sandboxes shared path.
|
# If specified, sandbox_bind_mounts identifieds host paths to be mounted (ro) into the sandboxes shared path.
|
||||||
# This is only valid if filesystem sharing is utilized. The provided path(s) will be bindmounted into the shared fs directory.
|
# This is only valid if filesystem sharing is utilized. The provided path(s) will be bindmounted into the shared fs directory.
|
||||||
|
@ -614,7 +614,7 @@ sandbox_cgroup_only=@DEFSANDBOXCGROUPONLY@
|
|||||||
# - When running with pods, sandbox sizing information will only be available if using Kubernetes >= 1.23 and containerd >= 1.6. CRI-O
|
# - When running with pods, sandbox sizing information will only be available if using Kubernetes >= 1.23 and containerd >= 1.6. CRI-O
|
||||||
# does not yet support sandbox sizing annotations.
|
# does not yet support sandbox sizing annotations.
|
||||||
# - When running single containers using a tool like ctr, container sizing information will be available.
|
# - When running single containers using a tool like ctr, container sizing information will be available.
|
||||||
static_sandbox_resource_mgmt=@DEFSTATICRESOURCEMGMT@
|
static_sandbox_resource_mgmt=@DEFSTATICRESOURCEMGMT_TEE@
|
||||||
|
|
||||||
# If specified, sandbox_bind_mounts identifieds host paths to be mounted (ro) into the sandboxes shared path.
|
# If specified, sandbox_bind_mounts identifieds host paths to be mounted (ro) into the sandboxes shared path.
|
||||||
# This is only valid if filesystem sharing is utilized. The provided path(s) will be bindmounted into the shared fs directory.
|
# This is only valid if filesystem sharing is utilized. The provided path(s) will be bindmounted into the shared fs directory.
|
||||||
|
Loading…
Reference in New Issue
Block a user