github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-03 02:07:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #13615 from HaiyangDING/update_doc_limit_request

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-09-15 02:16:15 -07:00
parent b8e938b795 d57263b94b
commit c9570e34d0
4 changed files with 51 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/design/resources.md
View File

@@ -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.