Skip to content

Commit 6617d63

Browse files
committed
Merge pull request kubernetes#11602 from erictune/quota
Improvements to quota doc.
2 parents b1b2f1a + 0b32762 commit 6617d63

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

docs/admin/resource-quota.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ work like this:
4242
support for making this mandatory via ACLs is planned.
4343
- Users put [compute resource limits](../user-guide/compute-resources.md) on their pods.
4444
- The administrator creates a Resource Quota for each namespace.
45-
- If users exceed the limits specified in the Resource Quota in a namespace, they are blocked
46-
from creating more pods in that namespace. The POST of the pod will fail with HTTP status
45+
- If creating a pod would cause the namespace to exceed any of the limits specified in the
46+
the Resource Quota for that namespace, then the request will fail with HTTP status
4747
code `403 FORBIDDEN`.
4848
- If quota is enabled in a namespace and the user does not specify limits on the pod for each
4949
of the resources for which quota is enabled, then the POST of the pod will fail with HTTP
@@ -56,7 +56,7 @@ Examples of policies that could be created using namespaces and quotas are:
5656
- Limit the "testing" namespace to using 1 core and 1GiB RAM. Let the "production" namespace
5757
use any amount.
5858

59-
In the case where the total capacity of the cell is less than the sum of the quotas of the namespaces,
59+
In the case where the total capacity of the cluster is less than the sum of the quotas of the namespaces,
6060
there may be contention for resources. This is handled on a first-come-first-served basis.
6161

6262
Neither contention nor changes to quota will affect already-running pods.
@@ -80,16 +80,10 @@ in a namespace can be limited. The following compute resource types are support
8080
| ------------ | ----------- |
8181
| cpu | Total cpu limits of containers |
8282
| memory | Total memory limits of containers
83-
| `example.com/customresource` | Total of `resources.limits."example.com/customresource"` of containers |
8483

8584
For example, `cpu` quota sums up the `resources.limits.cpu` fields of every
8685
container of every pod in the namespace, and enforces a maximum on that sum.
8786

88-
Any resource that is not part of core Kubernetes must follow the resource naming convention prescribed by Kubernetes.
89-
90-
This means the resource must have a fully-qualified name (i.e. mycompany.org/shinynewresource)
91-
92-
9387
## Object Count Quota
9488

9589
The number of objects of a given type can be restricted. The following types

0 commit comments

Comments
 (0)