Skip to content

Commit 1334714

Browse files
authored
Merge pull request #101462 from openshift-cherrypick-robot/cherry-pick-101192-to-enterprise-4.15
[enterprise-4.15] : Swapped out extensions for apps in quotes-setting-per-…
2 parents 33dde86 + 983e878 commit 1334714

File tree

5 files changed

+12
-33
lines changed

5 files changed

+12
-33
lines changed

modules/quotas-creating-object-count-quotas.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ For example:
2828
[source,terminal]
2929
----
3030
$ oc create quota test \
31-
--hard=count/deployments.extensions=2,count/replicasets.extensions=4,count/pods=3,count/secrets=4
31+
--hard=count/deployments.apps=2,count/replicasets.apps=4,count/pods=3,count/secrets=4
3232
----
3333
+
3434
.Example output
@@ -53,8 +53,8 @@ Name: test
5353
Namespace: quota
5454
Resource Used Hard
5555
-------- ---- ----
56-
count/deployments.extensions 0 2
56+
count/deployments.apps 0 2
5757
count/pods 0 3
58-
count/replicasets.extensions 0 4
58+
count/replicasets.apps 0 4
5959
count/secrets 0 4
6060
----

modules/quotas-enforcement.adoc

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,10 @@
66
[id="quota-enforcement_{context}"]
77
= Quota enforcement
88

9-
After a resource quota for a project is first created, the project restricts the
10-
ability to create any new resources that may violate a quota constraint until it
11-
has calculated updated usage statistics.
9+
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.
1210

13-
After a quota is created and usage statistics are updated, the project accepts
14-
the creation of new content. When you create or modify resources, your quota
15-
usage is incremented immediately upon the request to create or modify the
16-
resource.
11+
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.
1712

18-
When you delete a resource, your quota use is decremented during the next full
19-
recalculation of quota statistics for the project. A configurable amount of time
20-
determines how long it takes to reduce quota usage statistics to their current
21-
observed system value.
13+
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.
2214

23-
If project modifications exceed a quota usage limit, the server denies the
24-
action, and an appropriate error message is returned to the user explaining the
25-
quota constraint violated, and what their currently observed usage statistics
26-
are in the system.
15+
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.

modules/quotas-requests-vs-limits.adoc

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@
66
[id="quotas-requests-vs-limits_{context}"]
77
= Requests versus limits
88

9-
When allocating compute resources, each container might specify a request and a
10-
limit value each for CPU, memory, and ephemeral storage. Quotas can restrict any
11-
of these values.
9+
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.
1210

13-
If the quota has a value specified for `requests.cpu` or `requests.memory`,
14-
then it requires that every incoming container make an explicit request for
15-
those resources. If the quota has a value specified for `limits.cpu` or
16-
`limits.memory`, then it requires that every incoming container specify an
17-
explicit limit for those resources.
11+
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.

modules/quotas-scopes.adoc

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,9 @@
66
[id="quotas-scopes_{context}"]
77
= Quota scopes
88

9-
Each quota can have an associated set of _scopes_. A quota only measures usage
10-
for a resource if it matches the intersection of enumerated scopes.
9+
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.
1110

12-
Adding a scope to a quota restricts the set of resources to which that quota can
13-
apply. Specifying a resource outside of the allowed set results in a validation
14-
error.
11+
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.
1512

1613
|===
1714

modules/quotas-viewing-quotas.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
[id="quota-viewing-quotas_{context}"]
77
= Viewing a quota
88

9-
You can view usage statistics related to any hard limits defined in a project's
10-
quota by navigating in the web console to the project's *Quota* page.
9+
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.
1110

1211
You can also use the CLI to view quota details.
1312

0 commit comments

Comments
 (0)