Skip to content

Commit 21f2282

Browse files
authored
Merge pull request #33777 from TinySong/update-en-manage-resources-doc-en
update manage-resources documentation
2 parents 67bd932 + 4126cca commit 21f2282

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

content/en/docs/tasks/administer-cluster/manage-resources/cpu-constraint-namespace.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ in the namespace.
2727

2828
You must have access to create namespaces in your cluster.
2929

30-
Your cluster must have at least 1.0 CPU available for use to run the task examples.
30+
Each node in your cluster must have at least 1.0 CPU available for Pods.
3131
See [meaning of CPU](/docs/concepts/configuration/manage-resources-containers/#meaning-of-cpu)
3232
to learn what Kubernetes means by “1 CPU”.
3333

@@ -45,7 +45,7 @@ kubectl create namespace constraints-cpu-example
4545

4646
## Create a LimitRange and a Pod
4747

48-
Here's an example manifest for a LimitRange:
48+
Here's a manifest for an example {{< glossary_tooltip text="LimitRange" term_id="limitrange" >}}:
4949

5050
{{< codenew file="admin/resource/cpu-constraints.yaml" >}}
5151

@@ -96,7 +96,7 @@ on these resources, the two values must be the same.
9696

9797
Here's a manifest for a Pod that has one container. The container manifest
9898
specifies a CPU request of 500 millicpu and a CPU limit of 800 millicpu. These satisfy the
99-
minimum and maximum CPU constraints imposed by the LimitRange.
99+
minimum and maximum CPU constraints imposed by the LimitRange for this namespace.
100100

101101
{{< codenew file="admin/resource/cpu-constraints-pod.yaml" >}}
102102

@@ -214,7 +214,10 @@ applied the
214214
[default CPU request and limit](/docs/tasks/administer-cluster/manage-resources/cpu-default-namespace/)
215215
from the LimitRange for this namespace.
216216

217-
At this point, your Pod might be running or it might not be running. Recall that a prerequisite for this task is that your cluster must have at least 1 CPU available for use. If each of your Nodes has only 1 CPU, then there might not be enough allocatable CPU on any Node to accommodate a request of 800 millicpu. If you happen to be using Nodes with 2 CPU, then you probably have enough CPU to accommodate the 800 millicpu request.
217+
At this point, your Pod may or may not be running. Recall that a prerequisite for
218+
this task is that your Nodes must have at least 1 CPU available for use. If each of your Nodes has only 1 CPU,
219+
then there might not be enough allocatable CPU on any Node to accommodate a request of 800 millicpu.
220+
If you happen to be using Nodes with 2 CPU, then you probably have enough CPU to accommodate the 800 millicpu request.
218221

219222
Delete your Pod:
220223

content/en/docs/tasks/administer-cluster/manage-resources/memory-constraint-namespace.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ description: >-
1111
<!-- overview -->
1212

1313
This page shows how to set minimum and maximum values for memory used by containers
14-
running in a namespace. You specify minimum and maximum memory values in a
15-
[LimitRange](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#limitrange-v1-core)
14+
running in a {{< glossary_tooltip text="namespace" term_id="namespace" >}}.
15+
You specify minimum and maximum memory values in a
16+
[LimitRange](/docs/reference/kubernetes-api/policy-resources/limit-range-v1/)
1617
object. If a Pod does not meet the constraints imposed by the LimitRange,
1718
it cannot be created in the namespace.
1819

@@ -76,8 +77,8 @@ file for the LimitRange, they were created automatically.
7677
Now whenever you define a Pod within the constraints-mem-example namespace, Kubernetes
7778
performs these steps:
7879

79-
* If any container in that Pod does not specify its own memory request and limit, assign
80-
the default memory request and limit to that container.
80+
* If any container in that Pod does not specify its own memory request and limit,
81+
the control plane assigns the default memory request and limit to that container.
8182

8283
* Verify that every container in that Pod requests at least 500 MiB of memory.
8384

0 commit comments

Comments
 (0)