diff --git a/modules/quotas-creating-object-count-quotas.adoc b/modules/quotas-creating-object-count-quotas.adoc index 1f3456bcdbe7..3e705c6470da 100644 --- a/modules/quotas-creating-object-count-quotas.adoc +++ b/modules/quotas-creating-object-count-quotas.adoc @@ -28,7 +28,7 @@ For example: [source,terminal] ---- $ oc create quota test \ - --hard=count/deployments.extensions=2,count/replicasets.extensions=4,count/pods=3,count/secrets=4 + --hard=count/deployments.apps=2,count/replicasets.apps=4,count/pods=3,count/secrets=4 ---- + .Example output @@ -53,8 +53,8 @@ Name: test Namespace: quota Resource Used Hard -------- ---- ---- -count/deployments.extensions 0 2 +count/deployments.apps 0 2 count/pods 0 3 -count/replicasets.extensions 0 4 +count/replicasets.apps 0 4 count/secrets 0 4 ---- diff --git a/modules/quotas-enforcement.adoc b/modules/quotas-enforcement.adoc index 04d9dd079268..a00104bc114f 100644 --- a/modules/quotas-enforcement.adoc +++ b/modules/quotas-enforcement.adoc @@ -6,21 +6,10 @@ [id="quota-enforcement_{context}"] = Quota enforcement -After a resource quota for a project is first created, the project restricts the -ability to create any new resources that may violate a quota constraint until it -has calculated updated usage statistics. +After a resource quota for a project is first created, the project restricts the ability to create any new resources that may violate a quota constraint until it has calculated updated usage statistics. -After a quota is created and usage statistics are updated, the project accepts -the creation of new content. When you create or modify resources, your quota -usage is incremented immediately upon the request to create or modify the -resource. +After a quota is created and usage statistics are updated, the project accepts the creation of new content. When you create or modify resources, your quota usage is incremented immediately upon the request to create or modify the resource. -When you delete a resource, your quota use is decremented during the next full -recalculation of quota statistics for the project. A configurable amount of time -determines how long it takes to reduce quota usage statistics to their current -observed system value. +When you delete a resource, your quota use is decremented during the next full recalculation of quota statistics for the project. A configurable amount of time determines how long it takes to reduce quota usage statistics to their current observed system value. -If project modifications exceed a quota usage limit, the server denies the -action, and an appropriate error message is returned to the user explaining the -quota constraint violated, and what their currently observed usage statistics -are in the system. +If project modifications exceed a quota usage limit, the server denies the action, and an appropriate error message is returned to the user explaining the quota constraint violated, and what their currently observed usage statistics are in the system. diff --git a/modules/quotas-requests-vs-limits.adoc b/modules/quotas-requests-vs-limits.adoc index 868114f6b393..c169eff54e06 100644 --- a/modules/quotas-requests-vs-limits.adoc +++ b/modules/quotas-requests-vs-limits.adoc @@ -6,12 +6,6 @@ [id="quotas-requests-vs-limits_{context}"] = Requests versus limits -When allocating compute resources, each container might specify a request and a -limit value each for CPU, memory, and ephemeral storage. Quotas can restrict any -of these values. +When allocating compute resources, each container might specify a request and a limit value each for CPU, memory, and ephemeral storage. Quotas can restrict any of these values. -If the quota has a value specified for `requests.cpu` or `requests.memory`, -then it requires that every incoming container make an explicit request for -those resources. If the quota has a value specified for `limits.cpu` or -`limits.memory`, then it requires that every incoming container specify an -explicit limit for those resources. +If the quota has a value specified for `requests.cpu` or `requests.memory`, then it requires that every incoming container make an explicit request for those resources. If the quota has a value specified for `limits.cpu` or `limits.memory`, then it requires that every incoming container specify an explicit limit for those resources. diff --git a/modules/quotas-scopes.adoc b/modules/quotas-scopes.adoc index 52c22ccd4241..f94adbcae94d 100644 --- a/modules/quotas-scopes.adoc +++ b/modules/quotas-scopes.adoc @@ -6,12 +6,9 @@ [id="quotas-scopes_{context}"] = Quota scopes -Each quota can have an associated set of _scopes_. A quota only measures usage -for a resource if it matches the intersection of enumerated scopes. +Each quota can have an associated set of _scopes_. A quota only measures usage for a resource if it matches the intersection of enumerated scopes. -Adding a scope to a quota restricts the set of resources to which that quota can -apply. Specifying a resource outside of the allowed set results in a validation -error. +Adding a scope to a quota restricts the set of resources to which that quota can apply. Specifying a resource outside of the allowed set results in a validation error. |=== diff --git a/modules/quotas-viewing-quotas.adoc b/modules/quotas-viewing-quotas.adoc index 42ea47635a2a..02b31ef90dac 100644 --- a/modules/quotas-viewing-quotas.adoc +++ b/modules/quotas-viewing-quotas.adoc @@ -6,8 +6,7 @@ [id="quota-viewing-quotas_{context}"] = Viewing a quota -You can view usage statistics related to any hard limits defined in a project's -quota by navigating in the web console to the project's *Quota* page. +You can view usage statistics related to any hard limits defined in a quota for a project by navigating in the web console to the project's *Quota* page. You can also use the CLI to view quota details.