diff options
| author | Kubernetes Submit Queue <k8s-merge-robot@users.noreply.github.com> | 2017-11-07 19:55:36 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-07 19:55:36 -0800 |
| commit | 98ddee45f093bc32fe14582fa43f4f2160afb580 (patch) | |
| tree | 86b3774f0d8cad3760bec3b153c2140227f36c81 | |
| parent | 0975f2e3927952f16826f6ee7f55e7d6c34db134 (diff) | |
| parent | aa1ee55f74812f9bf5f8cf6b39effe5c40049fa7 (diff) | |
Merge pull request #1304 from charrywanganthony/quota-link
Automatic merge from submit-queue.
Update ResourceQuota design doc
**What this PR does:**
1. Update the admission_control_resource_quota.md according to @derekwaynecarr 's PR [Ability to do object count quota for all namespaced resources #54320](https://github.com/kubernetes/kubernetes/pull/54320)
2. fix two nil links
| -rw-r--r-- | contributors/design-proposals/resource-management/admission_control_resource_quota.md | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/contributors/design-proposals/resource-management/admission_control_resource_quota.md b/contributors/design-proposals/resource-management/admission_control_resource_quota.md index 575db9a8..7f9f49b2 100644 --- a/contributors/design-proposals/resource-management/admission_control_resource_quota.md +++ b/contributors/design-proposals/resource-management/admission_control_resource_quota.md @@ -206,9 +206,27 @@ secrets 1 10 services 0 5 ``` +Simple object count quotas supported on all standard resources using`count/<resource>.<group>` syntax. + +For example: +```console +$ kubectl create quota test --hard=count/deployments.extensions=2,count/replicasets.extensions=4,count/pods=3,count/secrets=4 +resourcequota "test" created +$ kubectl run nginx --image=nginx --replicas=2 +$ kubectl describe quota +Name: test +Namespace: default +Resource Used Hard +-------- ---- ---- +count/deployments.extensions 1 2 +count/pods 2 3 +count/replicasets.extensions 1 4 +count/secrets 1 4 +``` + ## More information -See [resource quota document](../admin/resource-quota.md) and the [example of Resource Quota](../admin/resourcequota/) for more information. +See [resource quota document](https://kubernetes.io/docs/concepts/policy/resource-quotas/) and the [example of Resource Quota](https://kubernetes.io/docs/tasks/administer-cluster/quota-api-object/) for more information. <!-- BEGIN MUNGE: GENERATED_ANALYTICS --> []() |