From f4edaf2b8c32463d6485e2c12b7fd776aef948bc Mon Sep 17 00:00:00 2001
From: Paulo Pires <pires@apprenda.com>
Date: Wed, 11 Jan 2017 10:38:01 +0000
Subject: [PATCH] dockertools: disable swap on Linux since it's unsupported.
 Refs #39005

---
 pkg/kubelet/dockertools/docker_manager_linux.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/kubelet/dockertools/docker_manager_linux.go b/pkg/kubelet/dockertools/docker_manager_linux.go
index b0d7b67a100..333ab4673b8 100644
--- a/pkg/kubelet/dockertools/docker_manager_linux.go
+++ b/pkg/kubelet/dockertools/docker_manager_linux.go
@@ -32,7 +32,7 @@ func updateHostConfig(hc *dockercontainer.HostConfig, opts *kubecontainer.RunCon
 }
 
 func DefaultMemorySwap() int64 {
-	return -1
+	return 0
 }
 
 func getContainerIP(container *dockertypes.ContainerJSON) string {