Skip to content

Commit

Permalink
Merge pull request #283 from microsoft/mahuber/conf-static
Browse files Browse the repository at this point in the history
runtime: Remove unused VMM options for mem alloc
  • Loading branch information
ms-mahuber authored Jan 4, 2025
2 parents 32dde44 + 3f0be3b commit 3627201
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 10 deletions.
5 changes: 0 additions & 5 deletions src/runtime/config/configuration-fc.toml.in
Original file line number Diff line number Diff line change
Expand Up @@ -353,11 +353,6 @@ sandbox_cgroup_only=@DEFSANDBOXCGROUPONLY@
# - When running single containers using a tool like ctr, container sizing information will be available.
static_sandbox_resource_mgmt=@DEFSTATICRESOURCEMGMT_FC@

# If set, the runtime will use the value as the default workload memory in MB for the sandbox when no workload memory request is passed
# down to the shim via the OCI when static sandbox resource management is enabled. With this, we ensure that workloads have a proper
# default amount of memory available within the sandbox.
static_sandbox_default_workload_mem=@DEFSTATICSANDBOXWORKLOADMEM@

# If enabled, the runtime will not create Kubernetes emptyDir mounts on the guest filesystem. Instead, emptyDir mounts will
# be created on the host and shared via virtio-fs. This is potentially slower, but allows sharing of files from host to guest.
disable_guest_empty_dir=@DEFDISABLEGUESTEMPTYDIR@
Expand Down
5 changes: 0 additions & 5 deletions src/runtime/config/configuration-qemu.toml.in
Original file line number Diff line number Diff line change
Expand Up @@ -650,11 +650,6 @@ sandbox_cgroup_only=@DEFSANDBOXCGROUPONLY@
# - When running single containers using a tool like ctr, container sizing information will be available.
static_sandbox_resource_mgmt=@DEFSTATICRESOURCEMGMT@

# If set, the runtime will use the value as the default workload memory in MB for the sandbox when no workload memory request is passed
# down to the shim via the OCI when static sandbox resource management is enabled. With this, we ensure that workloads have a proper
# default amount of memory available within the sandbox.
static_sandbox_default_workload_mem=@DEFSTATICSANDBOXWORKLOADMEM@

# 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.
# If defaults are utilized, these mounts should be available in the guest at `/run/kata-containers/shared/containers/sandbox-mounts`
Expand Down

0 comments on commit 3627201

Please sign in to comment.