Skip to content

K
k3s
Commit 66d2e1cb authored by krousey's avatar krousey
Browse files
Options

Merge pull request #9358 from dchen1107/podstatus

Passing memory swap limit -1 by default. Docker remote API never chec…
parents 49a6b629 f714020a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
pkg/kubelet/dockertools/manager.go
View file @ 66d2e1cb
...@@ -587,6 +587,7 @@ func (dm *DockerManager) runContainer( ...@@ -587,6 +587,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,
...@@ -637,8 +638,9 @@ func (dm *DockerManager) runContainer( ...@@ -637,8 +638,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