From 4307982fdf92c3e35fb079583045512093f37d40 Mon Sep 17 00:00:00 2001 From: Julio Montes Date: Fri, 31 Aug 2018 13:01:35 -0500 Subject: [PATCH] virtcontainers: revert apply devices constraints Due to issue https://github.com/kata-containers/runtime/issues/677 commit 137769a694136ef744fcb22ba389910fe1c1d951 must be reverted This reverts commit 137769a694136ef744fcb22ba389910fe1c1d951. fixes #685 Signed-off-by: Julio Montes --- virtcontainers/kata_agent.go | 1 + virtcontainers/kata_agent_test.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/virtcontainers/kata_agent.go b/virtcontainers/kata_agent.go index 761155dca3..717acb3449 100644 --- a/virtcontainers/kata_agent.go +++ b/virtcontainers/kata_agent.go @@ -669,6 +669,7 @@ func constraintGRPCSpec(grpcSpec *grpc.Spec) { // By now only CPU constraints are supported // 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.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 56532a3f34..e4892f7fc6 100644 --- a/virtcontainers/kata_agent_test.go +++ b/virtcontainers/kata_agent_test.go @@ -450,7 +450,7 @@ func TestConstraintGRPCSpec(t *testing.T) { // check nil fields assert.Nil(g.Hooks) assert.Nil(g.Linux.Seccomp) - assert.NotNil(g.Linux.Resources.Devices) + assert.Nil(g.Linux.Resources.Devices) assert.NotNil(g.Linux.Resources.Memory) assert.Nil(g.Linux.Resources.Pids) assert.Nil(g.Linux.Resources.BlockIO)