Skip to content

Commit dd965c3

Browse files
authored
Merge pull request #42506 from asa3311/sync-zh-47
[zh-cn] sync cpu-constraint-namespace memory-default-namespace quota-memory-cpu-namespace quota-pod-namespace
2 parents df8ef69 + 0636fe7 commit dd965c3

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Here's a manifest for an example {{< glossary_tooltip text="LimitRange" term_id=
7474

7575
以下为 {{< glossary_tooltip text="LimitRange" term_id="limitrange" >}} 的示例清单:
7676

77-
{{% codenew file="admin/resource/cpu-constraints.yaml" %}}
77+
{{% code file="admin/resource/cpu-constraints.yaml" %}}
7878

7979
<!--
8080
Create the LimitRange:
@@ -155,7 +155,7 @@ minimum and maximum CPU constraints imposed by the LimitRange for this namespace
155155
该容器声明了 CPU 请求 500 millicpu 和 CPU 限制 800 millicpu。
156156
这些参数满足了 LimitRange 对象为此名字空间规定的 CPU 最小和最大限制。
157157

158-
{{% codenew file="admin/resource/cpu-constraints-pod.yaml" %}}
158+
{{% code file="admin/resource/cpu-constraints-pod.yaml" %}}
159159

160160
<!--
161161
Create the Pod:
@@ -219,7 +219,7 @@ CPU request of 500 millicpu and a cpu limit of 1.5 cpu.
219219
这里给出了包含一个容器的 Pod 清单。容器声明了 500 millicpu 的 CPU
220220
请求和 1.5 CPU 的 CPU 限制。
221221

222-
{{% codenew file="admin/resource/cpu-constraints-pod-2.yaml" %}}
222+
{{% code file="admin/resource/cpu-constraints-pod-2.yaml" %}}
223223

224224
<!--
225225
Attempt to create the Pod:
@@ -252,7 +252,7 @@ CPU request of 100 millicpu and a CPU limit of 800 millicpu.
252252
253253
以下为某个只有一个容器的 Pod 的清单。该容器声明了 CPU 请求 100 millicpu 和 CPU 限制 800 millicpu。
254254
255-
{{% codenew file="admin/resource/cpu-constraints-pod-3.yaml" %}}
255+
{{% code file="admin/resource/cpu-constraints-pod-3.yaml" %}}
256256
257257
<!--
258258
Attempt to create the Pod:
@@ -286,7 +286,7 @@ specify a CPU request, nor does it specify a CPU limit.
286286

287287
以下为一个只有一个容器的 Pod 的清单。该容器没有声明 CPU 请求,也没有声明 CPU 限制。
288288

289-
{{% codenew file="admin/resource/cpu-constraints-pod-4.yaml" %}}
289+
{{% code file="admin/resource/cpu-constraints-pod-4.yaml" %}}
290290

291291
<!--
292292
Create the Pod:

content/zh-cn/docs/tasks/administer-cluster/manage-resources/memory-default-namespace.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ request and a default memory limit.
8181
以下为 {{< glossary_tooltip text="LimitRange" term_id="limitrange" >}} 的示例清单。
8282
清单中声明了默认的内存请求和默认的内存限制。
8383

84-
{{% codenew file="admin/resource/memory-defaults.yaml" %}}
84+
{{% code file="admin/resource/memory-defaults.yaml" %}}
8585

8686
<!--
8787
Create the LimitRange in the default-mem-example namespace:
@@ -108,7 +108,7 @@ does not specify a memory request and limit.
108108

109109
以下为只包含一个容器的 Pod 的清单。该容器没有声明内存请求和限制。
110110

111-
{{% codenew file="admin/resource/memory-defaults-pod.yaml" %}}
111+
{{% code file="admin/resource/memory-defaults-pod.yaml" %}}
112112

113113
<!--
114114
Create the Pod.
@@ -166,7 +166,7 @@ specifies a memory limit, but not a request:
166166

167167
以下为只包含一个容器的 Pod 的清单。该容器声明了内存限制,而没有声明内存请求。
168168

169-
{{% codenew file="admin/resource/memory-defaults-pod-2.yaml" %}}
169+
{{% code file="admin/resource/memory-defaults-pod-2.yaml" %}}
170170

171171
<!--
172172
Create the Pod:
@@ -211,7 +211,7 @@ specifies a memory request, but not a limit:
211211
-->
212212
以下为只包含一个容器的 Pod 的清单。该容器声明了内存请求,但没有内存限制:
213213

214-
{{% codenew file="admin/resource/memory-defaults-pod-3.yaml" %}}
214+
{{% code file="admin/resource/memory-defaults-pod-3.yaml" %}}
215215

216216
<!--
217217
Create the Pod:

content/zh-cn/docs/tasks/administer-cluster/manage-resources/quota-memory-cpu-namespace.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Here is a manifest for an example ResourceQuota:
6565

6666
下面是 ResourceQuota 的示例清单:
6767

68-
{{% codenew file="admin/resource/quota-mem-cpu.yaml" %}}
68+
{{% code file="admin/resource/quota-mem-cpu.yaml" %}}
6969

7070
<!--
7171
Create the ResourceQuota:
@@ -116,7 +116,7 @@ Here is a manifest for an example Pod:
116116

117117
以下是 Pod 的示例清单:
118118

119-
{{% codenew file="admin/resource/quota-mem-cpu-pod.yaml" %}}
119+
{{% code file="admin/resource/quota-mem-cpu-pod.yaml" %}}
120120

121121
<!--
122122
Create the Pod:
@@ -186,7 +186,7 @@ Here is a manifest for a second Pod:
186186

187187
以下为第二个 Pod 的清单:
188188

189-
{{% codenew file="admin/resource/quota-mem-cpu-pod-2.yaml" %}}
189+
{{% code file="admin/resource/quota-mem-cpu-pod-2.yaml" %}}
190190

191191
<!--
192192
In the manifest, you can see that the Pod has a memory request of 700 MiB.

content/zh-cn/docs/tasks/administer-cluster/manage-resources/quota-pod-namespace.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Here is an example manifest for a ResourceQuota:
6161

6262
下面是 ResourceQuota 的示例清单:
6363

64-
{{% codenew file="admin/resource/quota-pod.yaml" %}}
64+
{{% code file="admin/resource/quota-pod.yaml" %}}
6565

6666
<!--
6767
Create the ResourceQuota:
@@ -104,7 +104,7 @@ Here is an example manifest for a {{< glossary_tooltip term_id="deployment" >}}:
104104
-->
105105
下面是一个 {{< glossary_tooltip term_id="deployment" >}} 的示例清单:
106106
107-
{{% codenew file="admin/resource/quota-pod-deployment.yaml" %}}
107+
{{% code file="admin/resource/quota-pod-deployment.yaml" %}}
108108
109109
<!--
110110
In that manifest, `replicas: 3` tells Kubernetes to attempt to create three new Pods, all

0 commit comments

Comments
 (0)