From a90d47da60e1698233e059a5f8c797fff74ff8fc Mon Sep 17 00:00:00 2001 From: Dawn Chen Date: Fri, 5 Jun 2015 18:12:05 -0700 Subject: [PATCH 1/3] 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 f714020a7a04621270480f773f7bee3d4d02cb47) --- pkg/kubelet/dockertools/manager.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/dockertools/manager.go b/pkg/kubelet/dockertools/manager.go index 5ce43aded11..9b3a11e4edd 100644 --- a/pkg/kubelet/dockertools/manager.go +++ b/pkg/kubelet/dockertools/manager.go @@ -584,6 +584,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, @@ -634,8 +635,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 From 1f12b893876ad6c41396222693e37061f6e80fe1 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Mon, 8 Jun 2015 13:08:10 -0700 Subject: [PATCH 2/3] Kubernetes version v0.18.2 --- pkg/version/base.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/version/base.go b/pkg/version/base.go index 11f57fbdc03..4e1c1bc24ae 100644 --- a/pkg/version/base.go +++ b/pkg/version/base.go @@ -36,8 +36,8 @@ package version var ( // TODO: Deprecate gitMajor and gitMinor, use only gitVersion instead. gitMajor string = "0" // major version, always numeric - gitMinor string = "18.1+" // minor version, numeric possibly followed by "+" - gitVersion string = "v0.18.1-dev" // version from git, output of $(git describe) + gitMinor string = "18.2" // minor version, numeric possibly followed by "+" + gitVersion string = "v0.18.2" // version from git, output of $(git describe) gitCommit string = "" // sha1 from git, output of $(git rev-parse HEAD) gitTreeState string = "not a git tree" // state of git tree, either "clean" or "dirty" ) From 56134d57e433f811ed24f77befee202330966859 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Mon, 8 Jun 2015 13:08:53 -0700 Subject: [PATCH 3/3] Kubernetes version v0.18.2-dev --- pkg/version/base.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/version/base.go b/pkg/version/base.go index 4e1c1bc24ae..051e0182cfa 100644 --- a/pkg/version/base.go +++ b/pkg/version/base.go @@ -36,8 +36,8 @@ package version var ( // TODO: Deprecate gitMajor and gitMinor, use only gitVersion instead. gitMajor string = "0" // major version, always numeric - gitMinor string = "18.2" // minor version, numeric possibly followed by "+" - gitVersion string = "v0.18.2" // version from git, output of $(git describe) + gitMinor string = "18.2+" // minor version, numeric possibly followed by "+" + gitVersion string = "v0.18.2-dev" // version from git, output of $(git describe) gitCommit string = "" // sha1 from git, output of $(git rev-parse HEAD) gitTreeState string = "not a git tree" // state of git tree, either "clean" or "dirty" )