Merge pull request #92 from lgtczh/add_mem_soft_limit

fixed an issue with invalid soft memory limits
containerd · Jul 10, 2019 · d596c78 · d596c78
2 parents b589cd9 + 13a3ac4
commit d596c78
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/memory.go b/memory.go
@@ -281,6 +281,10 @@ func getMemorySettings(resources *specs.LinuxResources) []memorySettings {
 			name:  "limit_in_bytes",
 			value: mem.Limit,
 		},
+		{
+			name: "soft_limit_in_bytes",
+			value: mem.Reservation,
+		},
 		{
 			name:  "memsw.limit_in_bytes",
 			value: mem.Swap,