aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2026-01-14 20:04:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #654 from devimc/topic/applyMemConstraints

Browse Source 
virtcontainers: Apply memory constraints
This commit is contained in:
Julio Montes
2018-08-28 09:09:39 -05:00
committed by GitHub
parent dcf3229b37 2677a5fa91
commit a3038924fb
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
virtcontainers/kata_agent.go
View File

@@ -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

2
virtcontainers/kata_agent_test.go
View File

@@ -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)