github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-18 01:13:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7985 from fidencio/topic/clh-use-static_sandbox_resource_mgmt-as-default-on-arm

Browse Source 
clh: arm: Use static_sandbox_resource_mgmt=true
This commit is contained in:
Fabiano Fidêncio 2023-09-19 09:25:34 +02:00 committed by GitHub
commit 84c0d59d23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/runtime/Makefile
View File

@ -607,6 +607,7 @@ USER_VARS += DEFENTROPYSOURCE
USER_VARS += DEFVALIDENTROPYSOURCES USER_VARS += DEFVALIDENTROPYSOURCES
USER_VARS += DEFSANDBOXCGROUPONLY USER_VARS += DEFSANDBOXCGROUPONLY
USER_VARS += DEFSTATICRESOURCEMGMT USER_VARS += DEFSTATICRESOURCEMGMT
USER_VARS += DEFSTATICRESOURCEMGMT_CLH
USER_VARS += DEFSTATICRESOURCEMGMT_FC USER_VARS += DEFSTATICRESOURCEMGMT_FC
USER_VARS += DEFSTATICRESOURCEMGMT_TEE USER_VARS += DEFSTATICRESOURCEMGMT_TEE
USER_VARS += DEFBINDMOUNTS USER_VARS += DEFBINDMOUNTS

2
src/runtime/arch/amd64-options.mk
View File

@ -26,3 +26,5 @@ ACRNCTLCMD := acrnctl
# cloud-hypervisor binary name # cloud-hypervisor binary name
CLHCMD := cloud-hypervisor CLHCMD := cloud-hypervisor
DEFSTATICRESOURCEMGMT_CLH := false

2
src/runtime/arch/arm64-options.mk
View File

@ -19,3 +19,5 @@ FCJAILERCMD := jailer
# cloud-hypervisor binary name # cloud-hypervisor binary name
CLHCMD := cloud-hypervisor CLHCMD := cloud-hypervisor
DEFSTATICRESOURCEMGMT_CLH := true

2
src/runtime/config/configuration-clh.toml.in
View File

@ -396,7 +396,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_CLH@
# 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.