From f83e1741d79e18c0e2605a8c68b1a556e032e212 Mon Sep 17 00:00:00 2001 From: Sam Ghods Date: Fri, 22 Apr 2016 01:04:55 -0700 Subject: [PATCH 1/3] Update compute-resources.md Just some small suggestions. --- docs/user-guide/compute-resources.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/user-guide/compute-resources.md b/docs/user-guide/compute-resources.md index 37ade2ec02..31ae7d9e98 100644 --- a/docs/user-guide/compute-resources.md +++ b/docs/user-guide/compute-resources.md @@ -22,13 +22,16 @@ server. ## Resource Requests and Limits of Pod and Container -Each container of a Pod can optionally specify `spec.container[].resources.limits.cpu` and/or -`spec.container[].resources.limits.memory` and/or `spec.container[].resources.requests.cpu` -and/or `spec.container[].resources.requests.memory`. +Each container of a pod can optionally specify one or more of the following: + +* `spec.container[].resources.limits.cpu` +* `spec.container[].resources.limits.memory` +* `spec.container[].resources.requests.cpu` +* `spec.container[].resources.requests.memory`. Specifying resource requests and/or limits is optional. In some clusters, unset limits or requests may be replaced with default values when a pod is created or updated. The default value depends on -how the cluster is configured. If value of requests is not specified, they are set to be equal +how the cluster is configured. If the `requests` values are not specified, they are set to be equal to limits by default. Please note that resource limits must be greater than or equal to resource requests. From d0081d3c6e0d8f5ea684dc80b09c4e81ce1e5aa2 Mon Sep 17 00:00:00 2001 From: Sam Ghods Date: Fri, 22 Apr 2016 01:05:56 -0700 Subject: [PATCH 2/3] Update compute-resources.md --- docs/user-guide/compute-resources.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/user-guide/compute-resources.md b/docs/user-guide/compute-resources.md index 31ae7d9e98..dd1828d803 100644 --- a/docs/user-guide/compute-resources.md +++ b/docs/user-guide/compute-resources.md @@ -31,9 +31,8 @@ Each container of a pod can optionally specify one or more of the following: Specifying resource requests and/or limits is optional. In some clusters, unset limits or requests may be replaced with default values when a pod is created or updated. The default value depends on -how the cluster is configured. If the `requests` values are not specified, they are set to be equal -to limits by default. Please note that resource limits must be greater than or equal to resource -requests. +how the cluster is configured. If the requests values are not specified, they are set to be equal +to limits by default. Please note that limits must always be greater than or equal to requests. Although requests/limits can only be specified on individual containers, it is convenient to talk about pod resource requests/limits. A *pod resource request/limit* for a particular resource From 8ea462be4dac2a722c0c1a8cb428532429494a56 Mon Sep 17 00:00:00 2001 From: Sam Ghods Date: Fri, 22 Apr 2016 01:06:50 -0700 Subject: [PATCH 3/3] Update compute-resources.md --- docs/user-guide/compute-resources.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/user-guide/compute-resources.md b/docs/user-guide/compute-resources.md index dd1828d803..0d90e117e2 100644 --- a/docs/user-guide/compute-resources.md +++ b/docs/user-guide/compute-resources.md @@ -32,7 +32,8 @@ Each container of a pod can optionally specify one or more of the following: Specifying resource requests and/or limits is optional. In some clusters, unset limits or requests may be replaced with default values when a pod is created or updated. The default value depends on how the cluster is configured. If the requests values are not specified, they are set to be equal -to limits by default. Please note that limits must always be greater than or equal to requests. +to the limits values by default. Please note that limits must always be greater than or equal to +requests. Although requests/limits can only be specified on individual containers, it is convenient to talk about pod resource requests/limits. A *pod resource request/limit* for a particular resource