Remove Memory reservation on Windows

darstahl · darstahl · commit aaed975b5580 · 2017-05-08T17:41:51.000-07:00
Signed-off-by: Darren Stahl &lt;darst@microsoft.com&gt;
diff --git 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
@@ -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
@@ -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.

Original file line number	Diff line number	Diff line change
`@@ -15,16 +15,13 @@ The following parameters can be specified:`
`15`	`15`
`16`	`16`	* `limit` (uint64, OPTIONAL) - sets limit of memory usage in bytes.
`17`	`17`
`18`		-* `reservation` (uint64, OPTIONAL) - sets the guaranteed minimum amount of memory for a container in bytes.
`19`		`-`
`20`	`18`	`#### Example`
`21`	`19`
`22`	`20`	```json
`23`	`21`	`"windows": {`
`24`	`22`	`"resources": {`
`25`	`23`	`"memory": {`
`26`		`- "limit": 2097152,`
`27`		`- "reservation": 524288`
	`24`	`+ "limit": 2097152`
`28`	`25`	`}`
`29`	`26`	`}`
`30`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,6 @@`
`15`	`15`	`"limit": {`
`16`	`16`	`"id": "https://opencontainers.org/schema/bundle/windows/resources/memory/limit",`
`17`	`17`	`"$ref": "defs.json#/definitions/uint64"`
`18`		`- },`
`19`		`- "reservation": {`
`20`		`- "id": "https://opencontainers.org/schema/bundle/windows/resources/memory/reservation",`
`21`		`- "$ref": "defs.json#/definitions/uint64"`
`22`	`18`	`}`
`23`	`19`	`}`
`24`	`20`	`},`
Original file line number	Diff line number	Diff line change
`@@ -450,8 +450,6 @@ type WindowsResources struct {`
`450`	`450`	`type WindowsMemoryResources struct {`
`451`	`451`	`// Memory limit in bytes.`
`452`	`452`	Limit *uint64 `json:"limit,omitempty"`
`453`		`- // Memory reservation in bytes.`
`454`		- Reservation *uint64 `json:"reservation,omitempty"`
`455`	`453`	`}`
`456`	`454`
`457`	`455`	`// WindowsCPUResources contains CPU resource management settings.`