Skip to content

Commit ae14044

Browse files
authored
Merge pull request #6752 from bmcelvee/BZ1506187
Bug 1506187 Clarify NotTerminating State
2 parents be8957c + 083ea2c commit ae14044

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

admin_guide/quota.adoc

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -339,10 +339,13 @@ spec:
339339
- NotTerminating <4>
340340
----
341341
<1> The total number of pods in a non-terminal state.
342-
<2> Across all pods in a non-terminal state, the sum of CPU limits cannot exceed this value.
343-
<3> Across all pods in a non-terminal state, the sum of memory limits cannot exceed this value.
344-
<4> Restricts the quota to only matching pods where `spec.activeDeadlineSeconds is nil`. For example,
345-
this quota would not charge for build or deployer pods.
342+
<2> Across all pods in a non-terminal state, the sum of CPU limits cannot exceed
343+
this value.
344+
<3> Across all pods in a non-terminal state, the sum of memory limits cannot exceed
345+
this value.
346+
<4> Restricts the quota to only matching pods where `spec.activeDeadlineSeconds` is
347+
set to `nil`. Build pods will fall under `NotTerminating` unless the
348+
`RestartNever` policy is applied.
346349

347350

348351
.*_compute-resources-time-bound.yaml_*

0 commit comments

Comments
 (0)