From 2677a5fa9183e5445d40158910a826e3cfb3ff55 Mon Sep 17 00:00:00 2001 From: Julio Montes Date: Mon, 27 Aug 2018 10:29:47 -0500 Subject: [PATCH] virtcontainers: Apply memory constraints Apply all supported memory constraints to the contrainer inside the virtual machine. fixes #653 Signed-off-by: Julio Montes --- virtcontainers/kata_agent.go | 1 - virtcontainers/kata_agent_test.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/virtcontainers/kata_agent.go b/virtcontainers/kata_agent.go index 4c90ebcea..ee0bebf2f 100644 --- a/virtcontainers/kata_agent.go +++ b/virtcontainers/kata_agent.go @@ -670,7 +670,6 @@ func constraintGRPCSpec(grpcSpec *grpc.Spec) { // Issue: https://github.com/kata-containers/runtime/issues/158 // Issue: https://github.com/kata-containers/runtime/issues/204 grpcSpec.Linux.Resources.Devices = nil - grpcSpec.Linux.Resources.Memory = nil grpcSpec.Linux.Resources.Pids = nil grpcSpec.Linux.Resources.BlockIO = nil grpcSpec.Linux.Resources.HugepageLimits = nil diff --git a/virtcontainers/kata_agent_test.go b/virtcontainers/kata_agent_test.go index 3f21d6df2..e4892f7fc 100644 --- a/virtcontainers/kata_agent_test.go +++ b/virtcontainers/kata_agent_test.go @@ -451,7 +451,7 @@ func TestConstraintGRPCSpec(t *testing.T) { assert.Nil(g.Hooks) assert.Nil(g.Linux.Seccomp) assert.Nil(g.Linux.Resources.Devices) - assert.Nil(g.Linux.Resources.Memory) + assert.NotNil(g.Linux.Resources.Memory) assert.Nil(g.Linux.Resources.Pids) assert.Nil(g.Linux.Resources.BlockIO) assert.Nil(g.Linux.Resources.HugepageLimits)