Merge pull request #1213 from markturansky/branch_docs_add

Added pvc quota to docs
This commit is contained in:
devin-donnelly 2016-09-19 14:57:22 -07:00 committed by GitHub
commit eacdf9f230
1 changed files with 5 additions and 2 deletions

View File

@ -52,8 +52,10 @@ Resource Quota is enforced in a particular namespace when there is a
## Compute Resource Quota
The total sum of [compute resources](/docs/user-guide/compute-resources) requested by pods
in a namespace can be limited. The following compute resource types are supported:
You can limit the total sum of [compute resources](/docs/user-guide/compute-resources) and [storage resources](/docs/user-guide/persistent-volumes)
that can be requested in a given namespace.
The following resource types are supported:
| Resource Name | Description |
| ------------ | ----------- |
@ -63,6 +65,7 @@ in a namespace can be limited. The following compute resource types are support
| `memory` | Across all pods in a non-terminal state, the sum of memory requests cannot exceed this value. |
| `requests.cpu` | Across all pods in a non-terminal state, the sum of CPU requests cannot exceed this value. |
| `requests.memory` | Across all pods in a non-terminal state, the sum of memory requests cannot exceed this value. |
| `requests.storage` | Across all persistent volume claims, the sum of storage requests cannot exceed this value. |
## Object Count Quota