summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2019-04-05 09:24:42 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2019-04-05 09:34:22 +0200
commit990bf271c2776c3ee0905ae4713b2b72711357f4 (patch)
tree3ffac6ee5e3bb4d44eb8e006e993f2a91709a72c /cmd/podman
parentbda28c61dbab1796035d79aad91a0c52458b3dd8 (diff)
downloadpodman-990bf271c2776c3ee0905ae4713b2b72711357f4.tar.gz
podman-990bf271c2776c3ee0905ae4713b2b72711357f4.tar.bz2
podman-990bf271c2776c3ee0905ae4713b2b72711357f4.zip
kube: correctly set the default for MemorySwappiness
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/play_kube.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/cmd/podman/play_kube.go b/cmd/podman/play_kube.go
index b468a7a89..7a2b4100b 100644
--- a/cmd/podman/play_kube.go
+++ b/cmd/podman/play_kube.go
@@ -243,6 +243,9 @@ func kubeContainerToCreateConfig(ctx context.Context, containerYAML v1.Container
envs map[string]string
)
+ // The default for MemorySwappiness is -1, not 0
+ containerConfig.Resources.MemorySwappiness = -1
+
containerConfig.Runtime = runtime
containerConfig.Image = containerYAML.Image
containerConfig.ImageID = newImage.ID()