Skip to content

Commit e30a9c7

Browse files
committed
[zh-cn] sync some en docs
Signed-off-by: xin.li <[email protected]>
1 parent 93d6e08 commit e30a9c7

File tree

7 files changed

+66
-36
lines changed

7 files changed

+66
-36
lines changed

content/zh-cn/docs/concepts/overview/working-with-objects/owners-dependents.md

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,37 @@ weight: 60
1111

1212
<!-- overview -->
1313

14-
<!--
15-
In Kubernetes, some objects are *owners* of other objects. For example, a
16-
{{<glossary_tooltip text="ReplicaSet" term_id="replica-set">}} is the owner of a set of Pods. These owned objects are *dependents*
17-
of their owner.
14+
<!--
15+
In Kubernetes, some {{< glossary_tooltip text="objects" term_id="Object" >}} are *owners* of other objects. For example, a
16+
{{<glossary_tooltip text="ReplicaSet" term_id="replica-set">}} is the owner of a set of {{<glossary_tooltip text="Pods" term_id="pod">}}. These owned objects are *dependents*
1817
-->
1918

20-
在 Kubernetes 中,一些对象是其他对象的“属主(Owner)”。
19+
在 Kubernetes 中,一些{{< glossary_tooltip text="对象" term_id="Object" >}}是其他对象的“属主(Owner)”。
2120
例如,{{<glossary_tooltip text="ReplicaSet" term_id="replica-set">}} 是一组 Pod 的属主。
2221
具有属主的对象是属主的“附属(Dependent)”。
2322

2423
<!--
2524
Ownership is different from the [labels and selectors](/docs/concepts/overview/working-with-objects/labels/)
2625
mechanism that some resources also use. For example, consider a Service that
27-
creates `EndpointSlice` objects. The Service uses labels to allow the control plane to
26+
creates `EndpointSlice` objects. The Service uses {{<glossary_tooltip text="labels" term_id="label">}} to allow the control plane to
2827
determine which `EndpointSlice` objects are used for that Service. In addition
2928
to the labels, each `EndpointSlice` that is managed on behalf of a Service has
3029
an owner reference. Owner references help different parts of Kubernetes avoid
3130
interfering with objects they don’t control.
3231
-->
3332
属主关系不同于一些资源使用的[标签和选择算符](/zh-cn/docs/concepts/overview/working-with-objects/labels/)机制。
3433
例如,有一个创建 `EndpointSlice` 对象的 Service,
35-
该 Service 使用标签来让控制平面确定,哪些 `EndpointSlice` 对象属于该 Service。
36-
除开标签,每个代表 Service 所管理的 `EndpointSlice` 都有一个属主引用。
37-
属主引用避免 Kubernetes 的不同部分干扰到不受它们控制的对象。
34+
该 Service 使用{{<glossary_tooltip text="标签" term_id="label">}}来让控制平面确定哪些
35+
`EndpointSlice` 对象属于该 Service。除开标签,每个代表 Service 所管理的
36+
`EndpointSlice` 都有一个属主引用。属主引用避免 Kubernetes
37+
的不同部分干扰到不受它们控制的对象。
3838

3939
<!--
4040
## Owner references in object specifications
4141
4242
Dependent objects have a `metadata.ownerReferences` field that references their
43-
owner object. A valid owner reference consists of the object name and a UID
44-
within the same namespace as the dependent object. Kubernetes sets the value of
43+
owner object. A valid owner reference consists of the object name and a {{<glossary_tooltip text="UID" term_id="uid">}}
44+
within the same {{<glossary_tooltip text="namespace" term_id="namespace">}} as the dependent object. Kubernetes sets the value of
4545
this field automatically for objects that are dependents of other objects like
4646
ReplicaSets, DaemonSets, Deployments, Jobs and CronJobs, and ReplicationControllers.
4747
You can also configure these relationships manually by changing the value of
@@ -50,8 +50,9 @@ automatically manage the relationships.
5050
-->
5151
## 对象规约中的属主引用 {#owner-references-in-object-specifications}
5252

53-
附属对象有一个 `metadata.ownerReferences` 字段,用于引用其属主对象。
54-
一个有效的属主引用,包含与附属对象同在一个命名空间下的对象名称和一个 UID。
53+
附属对象有一个 `metadata.ownerReferences` 字段,用于引用其属主对象。一个有效的属主引用,
54+
包含与附属对象同在一个{{<glossary_tooltip text="命名空间" term_id="namespace">}}下的对象名称和一个
55+
{{<glossary_tooltip text="UID" term_id="uid">}}。
5556
Kubernetes 自动为一些对象的附属资源设置属主引用的值,
5657
这些对象包含 ReplicaSet、DaemonSet、Deployment、Job、CronJob、ReplicationController 等。
5758
你也可以通过改变这个字段的值,来手动配置这些关系。
@@ -124,10 +125,10 @@ When you tell Kubernetes to delete a resource, the API server allows the
124125
managing controller to process any [finalizer rules](/docs/concepts/overview/working-with-objects/finalizers/)
125126
for the resource. {{<glossary_tooltip text="Finalizers" term_id="finalizer">}}
126127
prevent accidental deletion of resources your cluster may still need to function
127-
correctly. For example, if you try to delete a `PersistentVolume` that is still
128+
correctly. For example, if you try to delete a [PersistentVolume](/docs/concepts/storage/persistent-volumes/) that is still
128129
in use by a Pod, the deletion does not happen immediately because the
129130
`PersistentVolume` has the `kubernetes.io/pv-protection` finalizer on it.
130-
Instead, the volume remains in the `Terminating` status until Kubernetes clears
131+
Instead, the [volume](/docs/concepts/storage/volumes/) remains in the `Terminating` status until Kubernetes clears
131132
the finalizer, which only happens after the `PersistentVolume` is no longer
132133
bound to a Pod.
133134
-->
@@ -138,9 +139,11 @@ bound to a Pod.
138139
{{<glossary_tooltip text="Finalizer" term_id="finalizer">}}
139140
防止意外删除你的集群所依赖的、用于正常运作的资源。
140141
例如,如果你试图删除一个仍被 Pod 使用的 `PersistentVolume`,该资源不会被立即删除,
141-
因为 `PersistentVolume``kubernetes.io/pv-protection` Finalizer。
142-
相反,它将进入 `Terminating` 状态,直到 Kubernetes 清除这个 Finalizer,
143-
而这种情况只会发生在 `PersistentVolume` 不再被挂载到 Pod 上时。
142+
因为 [PersistentVolume](/zh-cn/docs/concepts/storage/persistent-volumes/)
143+
`kubernetes.io/pv-protection` Finalizer。
144+
相反,[数据卷](/zh-cn/docs/concepts/storage/volumes/)将进入 `Terminating` 状态,
145+
直到 Kubernetes 清除这个 Finalizer,而这种情况只会发生在 `PersistentVolume`
146+
不再被挂载到 Pod 上时。
144147

145148
<!--
146149
Kubernetes also adds finalizers to an owner resource when you use either

content/zh-cn/docs/concepts/windows/intro.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -167,13 +167,6 @@ Kubernetes 关键组件在 Windows 上的工作方式与在 Linux 上相同。
167167

168168
`.spec.os.name` 字段应设置为 `windows` 以表明当前 Pod 使用 Windows 容器。
169169

170-
{{< note >}}
171-
<!--
172-
Starting from 1.25, the `IdentifyPodOS` feature gate is in GA stage and defaults to be enabled.
173-
-->
174-
从 1.25 开始,`IdentifyPodOS` 特性门控进入 GA 阶段,默认启用。
175-
{{< /note >}}
176-
177170
<!--
178171
If you set the `.spec.os.name` field to `windows`,
179172
you must not set the following fields in the `.spec` of that Pod:

content/zh-cn/docs/concepts/windows/user-guide.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -266,13 +266,6 @@ to `windows`.
266266
对于运行 Linux 容器的 Pod,将 `.spec.os.name` 设置为 `linux`
267267
对于运行 Windows 容器的 Pod,将 `.spec.os.name` 设置为 `windows`
268268

269-
{{< note >}}
270-
<!--
271-
Starting from 1.25, the `IdentifyPodOS` feature is in GA stage and defaults to be enabled.
272-
-->
273-
从 1.25 开始,`IdentifyPodOS` 特性处于 GA 阶段,默认启用。
274-
{{< /note >}}
275-
276269
<!--
277270
The scheduler does not use the value of `.spec.os.name` when assigning Pods to nodes. You should
278271
use normal Kubernetes mechanisms for

content/zh-cn/docs/reference/kubernetes-api/workload-resources/controller-revision-v1.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,15 @@ GET /apis/apps/v1/namespaces/{namespace}/controllerrevisions
378378
379379
<a href="{{< ref "../common-parameters/common-parameters#resourceVersionMatch" >}}">resourceVersionMatch</a>
380380
381+
<!--
382+
- **sendInitialEvents** (*in query*): boolean
383+
384+
<a href="{{< ref "../common-parameters/common-parameters#sendInitialEvents" >}}">sendInitialEvents</a>
385+
-->
386+
- **sendInitialEvents** (**查询参数**): boolean
387+
388+
<a href="{{< ref "../common-parameters/common-parameters#sendInitialEvents" >}}">sendInitialEvents</a>
389+
381390
<!--
382391
- **timeoutSeconds** (*in query*): integer
383392
@@ -500,6 +509,15 @@ GET /apis/apps/v1/controllerrevisions
500509
501510
<a href="{{< ref "../common-parameters/common-parameters#resourceVersionMatch" >}}">resourceVersionMatch</a>
502511
512+
<!--
513+
- **sendInitialEvents** (*in query*): boolean
514+
515+
<a href="{{< ref "../common-parameters/common-parameters#sendInitialEvents" >}}">sendInitialEvents</a>
516+
-->
517+
- **sendInitialEvents** (**查询参数**): boolean
518+
519+
<a href="{{< ref "../common-parameters/common-parameters#sendInitialEvents" >}}">sendInitialEvents</a>
520+
503521
<!--
504522
- **timeoutSeconds** (*in query*): integer
505523
@@ -1039,6 +1057,15 @@ DELETE /apis/apps/v1/namespaces/{namespace}/controllerrevisions
10391057
10401058
<a href="{{< ref "../common-parameters/common-parameters#resourceVersionMatch" >}}">resourceVersionMatch</a>
10411059
1060+
<!--
1061+
- **sendInitialEvents** (*in query*): boolean
1062+
1063+
<a href="{{< ref "../common-parameters/common-parameters#sendInitialEvents" >}}">sendInitialEvents</a>
1064+
-->
1065+
- **sendInitialEvents** (**查询参数**): boolean
1066+
1067+
<a href="{{< ref "../common-parameters/common-parameters#sendInitialEvents" >}}">sendInitialEvents</a>
1068+
10421069
<!--
10431070
- **timeoutSeconds** (*in query*): integer
10441071

content/zh-cn/docs/reference/kubernetes-api/workload-resources/replication-controller-v1.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,14 @@ ReplicationControllerSpec 表示一个副本控制器的规约。
8484
8585
- **template** (<a href="{{< ref "../workload-resources/pod-template-v1#PodTemplateSpec" >}}">PodTemplateSpec</a>)
8686
87-
Template is the object that describes the pod that will be created if insufficient replicas are detected. This takes precedence over a TemplateRef. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller#pod-template
87+
Template is the object that describes the pod that will be created if insufficient replicas are detected. This takes precedence over a TemplateRef. The only allowed template.spec.restartPolicy value is "Always". More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller#pod-template
8888
-->
8989
- **selector** (map[string]string)
9090

9191
selector 是针对 Pod 的标签查询,符合条件的 Pod 个数应与 replicas 匹配。
9292
如果 selector 为空,则默认为出现在 Pod 模板中的标签。
9393
如果置空以表示默认使用 Pod 模板中的标签,则标签的主键和取值必须匹配,以便由这个副本控制器进行控制。
94+
`template.spec.restartPolicy` 唯一被允许的值是 `Always`
9495
更多信息:
9596
https://kubernetes.io/zh-cn/docs/concepts/overview/working-with-objects/labels/#label-selectors
9697

@@ -424,6 +425,10 @@ GET /api/v1/namespaces/{namespace}/replicationcontrollers
424425

425426
<a href="{{< ref "../common-parameters/common-parameters#resourceVersionMatch" >}}">resourceVersionMatch</a>
426427

428+
- **sendInitialEvents** (*查询参数*): boolean
429+
430+
<a href="{{< ref "../common-parameters/common-parameters#sendInitialEvents" >}}">sendInitialEvents</a>
431+
427432
- **timeoutSeconds** (**查询参数**): integer
428433

429434
<a href="{{< ref "../common-parameters/common-parameters#timeoutSeconds" >}}">timeoutSeconds</a>
@@ -498,6 +503,10 @@ GET /api/v1/replicationcontrollers
498503

499504
<a href="{{< ref "../common-parameters/common-parameters#resourceVersionMatch" >}}">resourceVersionMatch</a>
500505

506+
- **sendInitialEvents** (*查询参数*): boolean
507+
508+
<a href="{{< ref "../common-parameters/common-parameters#sendInitialEvents" >}}">sendInitialEvents</a>
509+
501510
- **timeoutSeconds** (**查询参数**): integer
502511

503512
<a href="{{< ref "../common-parameters/common-parameters#timeoutSeconds" >}}">timeoutSeconds</a>
@@ -955,6 +964,10 @@ DELETE /api/v1/namespaces/{namespace}/replicationcontrollers
955964

956965
<a href="{{< ref "../common-parameters/common-parameters#resourceVersionMatch" >}}">resourceVersionMatch</a>
957966

967+
- **sendInitialEvents** (*查询参数*): boolean
968+
969+
<a href="{{< ref "../common-parameters/common-parameters#sendInitialEvents" >}}">sendInitialEvents</a>
970+
958971
- **timeoutSeconds** (**查询参数**): integer
959972

960973
<a href="{{< ref "../common-parameters/common-parameters#timeoutSeconds" >}}">timeoutSeconds</a>

content/zh-cn/docs/tutorials/hello-minikube.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,14 +131,15 @@ You can run the `dashboard` command again to create another proxy to access the
131131

132132
<!--
133133
If you don't want minikube to open a web browser for you, run the dashboard command with the
134-
`--url` flag. `minikube` outputs a URL that you can open in the browser you prefer.
134+
`--url` flag. `minikube` outputs a URL that you can open in the browser you prefer:
135135
136136
Open a **new** terminal, and run:
137137
-->
138138
如果你不想 Minikube 为你打开 Web 浏览器,可以使用 `--url` 标志运行仪表板命令。
139139
`minikube` 会输出一个 URL,你可以在你喜欢的浏览器中打开该 URL。
140140

141141
打开一个**新的**终端,然后运行:
142+
142143
```shell
143144
# 启动一个新的终端,并保持此命令运行。
144145
minikube dashboard --url

content/zh-cn/docs/tutorials/security/cluster-level-pss.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ that are most appropriate for your configuration, do the following:
102102

103103
```
104104
Creating cluster "psa-wo-cluster-pss" ...
105-
✓ Ensuring node image (kindest/node:v{{< skew currentVersion >}}.0) 🖼
105+
✓ Ensuring node image (kindest/node:v{{< skew currentPatchVersion >}}) 🖼
106106
✓ Preparing nodes 📦
107107
✓ Writing configuration 📜
108108
✓ Starting control-plane 🕹️
@@ -398,7 +398,7 @@ following:
398398

399399
```
400400
Creating cluster "psa-with-cluster-pss" ...
401-
✓ Ensuring node image (kindest/node:v{{< skew currentVersion >}}.0) 🖼
401+
✓ Ensuring node image (kindest/node:v{{< skew currentPatchVersion >}}) 🖼
402402
✓ Preparing nodes 📦
403403
✓ Writing configuration 📜
404404
✓ Starting control-plane 🕹️

0 commit comments

Comments
 (0)