Merge pull request #9358 from dchen1107/podstatus

pkg/kubelet/dockertools/manager.go

@@ -587,6 +587,7 @@ func (dm *DockerManager) runContainer(
 			Image:        container.Image,
 			// Memory and CPU are set here for older versions of Docker (pre-1.6).
 			Memory:     memoryLimit,
+			MemorySwap: -1,
 			CPUShares:  cpuShares,
 			WorkingDir: container.WorkingDir,
 			Labels:     labels,
@@ -637,8 +638,9 @@ func (dm *DockerManager) runContainer(
 		NetworkMode:  netMode,
 		IpcMode:      ipcMode,
 		// Memory and CPU are set here for newer versions of Docker (1.6+).
-		Memory:    memoryLimit,
-		CPUShares: cpuShares,
+		Memory:     memoryLimit,
+		MemorySwap: -1,
+		CPUShares:  cpuShares,
 	}
 	if len(opts.DNS) > 0 {
 		hc.DNS = opts.DNS