Skip to content

K
k3s
Commit a90d47da authored by Dawn Chen's avatar Dawn Chen Committed by Brendan Burns
Browse files
Options

Passing memory swap limit -1 by default. Docker remote API never check if memory

swap is enabled by kernel or not, instead by default to set the limit to memory * 2, and return API error 500 if swap is not enabled. (cherry picked from commit f714020a)
parent 3e5707be
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
pkg/kubelet/dockertools/manager.go
View file @ a90d47da
...@@ -584,6 +584,7 @@ func (dm *DockerManager) runContainer( ...@@ -584,6 +584,7 @@ func (dm *DockerManager) runContainer(
Image: container.Image, Image: container.Image,
// Memory and CPU are set here for older versions of Docker (pre-1.6). // Memory and CPU are set here for older versions of Docker (pre-1.6).
Memory: memoryLimit, Memory: memoryLimit,
MemorySwap: -1,
CPUShares: cpuShares, CPUShares: cpuShares,
WorkingDir: container.WorkingDir, WorkingDir: container.WorkingDir,
Labels: labels, Labels: labels,
...@@ -634,8 +635,9 @@ func (dm *DockerManager) runContainer( ...@@ -634,8 +635,9 @@ func (dm *DockerManager) runContainer(
NetworkMode: netMode, NetworkMode: netMode,
IpcMode: ipcMode, IpcMode: ipcMode,
// Memory and CPU are set here for newer versions of Docker (1.6+). // Memory and CPU are set here for newer versions of Docker (1.6+).
Memory: memoryLimit, Memory: memoryLimit,
CPUShares: cpuShares, MemorySwap: -1,
CPUShares: cpuShares,
} }
if len(opts.DNS) > 0 { if len(opts.DNS) > 0 {
hc.DNS = opts.DNS hc.DNS = opts.DNS
......
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