Skip to content

K
k3s
Commit ecc13c8d authored by ohmystack's avatar ohmystack
Browse files
Options

dockertools: disable MemorySwap on Linux

According to docker docs, setting MemorySwap equals to Memory can prevent docker containers from using any swap, instead of setting MemorySwap to zero.
parent 6775a325
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
pkg/kubelet/dockershim/helpers_linux.go
View file @ ecc13c8d
...@@ -104,8 +104,9 @@ func (ds *dockerService) updateCreateConfig( ...@@ -104,8 +104,9 @@ func (ds *dockerService) updateCreateConfig(
rOpts := lc.GetResources() rOpts := lc.GetResources()
if rOpts != nil { if rOpts != nil {
createConfig.HostConfig.Resources = dockercontainer.Resources{ createConfig.HostConfig.Resources = dockercontainer.Resources{
// Memory and MemorySwap are set to the same value, this prevents containers from using any swap.
Memory: rOpts.MemoryLimitInBytes, Memory: rOpts.MemoryLimitInBytes,
MemorySwap: DefaultMemorySwap(), MemorySwap: rOpts.MemoryLimitInBytes,
CPUShares: rOpts.CpuShares, CPUShares: rOpts.CpuShares,
CPUQuota: rOpts.CpuQuota, CPUQuota: rOpts.CpuQuota,
CPUPeriod: rOpts.CpuPeriod, CPUPeriod: rOpts.CpuPeriod,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment