github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-28 20:41:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #657 from devimc/topic/applyConstraints

Browse Source 
virtcontainers: apply devices constraints
This commit is contained in:
James O. D. Hunt 2018-08-30 14:57:58 +01:00 committed by GitHub
commit 7d14aea067
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
virtcontainers/kata_agent.go
View File

@ -669,7 +669,6 @@ func constraintGRPCSpec(grpcSpec *grpc.Spec) {
// By now only CPU constraints are supported // By now only CPU constraints are supported
// Issue: https://github.com/kata-containers/runtime/issues/158 // Issue: https://github.com/kata-containers/runtime/issues/158
// Issue: https://github.com/kata-containers/runtime/issues/204 // Issue: https://github.com/kata-containers/runtime/issues/204
grpcSpec.Linux.Resources.Devices = nil
grpcSpec.Linux.Resources.Pids = nil grpcSpec.Linux.Resources.Pids = nil
grpcSpec.Linux.Resources.BlockIO = nil grpcSpec.Linux.Resources.BlockIO = nil
grpcSpec.Linux.Resources.HugepageLimits = nil grpcSpec.Linux.Resources.HugepageLimits = nil

2
virtcontainers/kata_agent_test.go
View File

@ -450,7 +450,7 @@ func TestConstraintGRPCSpec(t *testing.T) {
// check nil fields // check nil fields
assert.Nil(g.Hooks) assert.Nil(g.Hooks)
assert.Nil(g.Linux.Seccomp) assert.Nil(g.Linux.Seccomp)
assert.Nil(g.Linux.Resources.Devices) assert.NotNil(g.Linux.Resources.Devices)
assert.NotNil(g.Linux.Resources.Memory) assert.NotNil(g.Linux.Resources.Memory)
assert.Nil(g.Linux.Resources.Pids) assert.Nil(g.Linux.Resources.Pids)
assert.Nil(g.Linux.Resources.BlockIO) assert.Nil(g.Linux.Resources.BlockIO)