From aaed975b5580e0d80b5da7d0cdcbc8c2927e613d Mon Sep 17 00:00:00 2001 From: Darren Stahl Date: Mon, 8 May 2017 17:41:51 -0700 Subject: [PATCH] Remove Memory reservation on Windows Signed-off-by: Darren Stahl --- config-windows.md | 5 +---- schema/config-windows.json | 4 ---- specs-go/config.go | 2 -- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/config-windows.md b/config-windows.md index a51a4334f..0f7e8fef1 100644 --- a/config-windows.md +++ b/config-windows.md @@ -15,16 +15,13 @@ The following parameters can be specified: * **`limit`** *(uint64, OPTIONAL)* - sets limit of memory usage in bytes. -* **`reservation`** *(uint64, OPTIONAL)* - sets the guaranteed minimum amount of memory for a container in bytes. - #### Example ```json "windows": { "resources": { "memory": { - "limit": 2097152, - "reservation": 524288 + "limit": 2097152 } } } diff --git a/schema/config-windows.json b/schema/config-windows.json index bd90b5c2f..85bbd030f 100644 --- a/schema/config-windows.json +++ b/schema/config-windows.json @@ -15,10 +15,6 @@ "limit": { "id": "https://opencontainers.org/schema/bundle/windows/resources/memory/limit", "$ref": "defs.json#/definitions/uint64" - }, - "reservation": { - "id": "https://opencontainers.org/schema/bundle/windows/resources/memory/reservation", - "$ref": "defs.json#/definitions/uint64" } } }, diff --git a/specs-go/config.go b/specs-go/config.go index da9040594..3e3161259 100644 --- a/specs-go/config.go +++ b/specs-go/config.go @@ -450,8 +450,6 @@ type WindowsResources struct { type WindowsMemoryResources struct { // Memory limit in bytes. Limit *uint64 `json:"limit,omitempty"` - // Memory reservation in bytes. - Reservation *uint64 `json:"reservation,omitempty"` } // WindowsCPUResources contains CPU resource management settings.