Merge pull request #6448 from kazegusuri/fix-resourcequota-doc

fix broken tables in docs/resouce_quota_admin.md
This commit is contained in:
Rohit Jnagal
2015-04-06 08:57:52 -07:00

View File

@@ -18,6 +18,7 @@ Resource Quota is enforced in a particular namespace when there is a
## Object Count Quota ## Object Count Quota
The number of objects of a given type can be restricted. The following types The number of objects of a given type can be restricted. The following types
are supported: are supported:
| ResourceName | Description | | ResourceName | Description |
| ------------ | ----------- | | ------------ | ----------- |
| pods | Total number of pods | | pods | Total number of pods |
@@ -36,8 +37,7 @@ are supported:
| ------------ | ----------- | | ------------ | ----------- |
| cpu | Total cpu limits of containers | | cpu | Total cpu limits of containers |
| memory | Total memory usage limits of containers | memory | Total memory usage limits of containers
| `example.com/customresource` | Total of | `example.com/customresource` | Total of `resources.limits."example.com/customresource"` of containers |
`resources.limits."example.com/customresource"` of containers |
For example, `cpu` quota sums up the `resources.limits.cpu` fields of every For example, `cpu` quota sums up the `resources.limits.cpu` fields of every
container of every pod in the namespace, and enforces a maximum on that sum. container of every pod in the namespace, and enforces a maximum on that sum.