diff options
| author | dinghaiyang <dinghaiyang@huawei.com> | 2015-09-04 18:44:56 +0800 |
|---|---|---|
| committer | dinghaiyang <dinghaiyang@huawei.com> | 2015-09-09 15:38:34 +0800 |
| commit | 1a62ae0c98bf9f280d27f4ab59d88c03f8d3f3dc (patch) | |
| tree | 7079b1eaa7245a60598332e0b72d366c0ce508c7 | |
| parent | 4ad8a68e14a047e5cf7be93b222b00198315882c (diff) | |
Replace limits with request where appropriate
| -rw-r--r-- | resources.md | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/resources.md b/resources.md index fe6f0ec7..f9bbc8db 100644 --- a/resources.md +++ b/resources.md @@ -33,8 +33,8 @@ Documentation for other releases can be found at **Note: this is a design doc, which describes features that have not been completely implemented. User documentation of the current state is [here](../user-guide/compute-resources.md). The tracking issue for implementation of this model is -[#168](http://issue.k8s.io/168). Currently, only memory and -cpu limits on containers (not pods) are supported. "memory" is in bytes and "cpu" is in +[#168](http://issue.k8s.io/168). Currently, both limits and requests of memory and +cpu on containers (not pods) are supported. "memory" is in bytes and "cpu" is in milli-cores.** # The Kubernetes resource model @@ -123,7 +123,6 @@ Where: * Internally, the Kubernetes master can decide the defaulting behavior and the kubelet implementation may expected an absolute specification. For example, if the master decided that "the default is unbounded" it would pass 2^64 to the kubelet. - ## Kubernetes-defined resource types The following resource types are predefined ("reserved") by Kubernetes in the `kubernetes.io` namespace, and so cannot be used for user-defined resources. Note that the syntax of all resource types in the resource spec is deliberately similar, but some resource types (e.g., CPU) may receive significantly more support than simply tracking quantities in the schedulers and/or the Kubelet. |