scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-10-30 01:42:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set MemorySwapLimitInBytes for CRI when NodeSwapEnabled

Browse Source
This commit is contained in:
Elana Hashman
2021-06-16 16:27:50 -07:00
parent 7342acb0b8
commit 0deef4610e
4 changed files with 109 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/kubelet/kuberuntime/kuberuntime_container_linux.go
View File

@@ -89,6 +89,20 @@ func (m *kubeGenericRuntimeManager) generateLinuxContainerConfig(container *v1.C
lc.Resources.HugepageLimits = GetHugepageLimitsFromResources(container.Resources)
if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.NodeSwapEnabled) {
// NOTE(ehashman): Behaviour is defined in the opencontainers runtime spec:
// https://github.com/opencontainers/runtime-spec/blob/1c3f411f041711bbeecf35ff7e93461ea6789220/config-linux.md#memory
switch m.memorySwapBehavior {
case "UnlimitedSwap":
// -1 = unlimited swap
lc.Resources.MemorySwapLimitInBytes = -1
default:
// memorySwapLimit = total permitted memory+swap; if equal to memory limit, => 0 swap
// Note that if memory limit is 0, memory swap limit is ignored.
lc.Resources.MemorySwapLimitInBytes = lc.Resources.MemoryLimitInBytes
}
}
return lc
}