Skip to content

Commit 94021d6

Browse files
authored
Merge pull request #51546 from windsonsea/admller
[zh] Sync admission-controllers.md
2 parents b2f8b9d + 958d5fc commit 94021d6

File tree

2 files changed

+77
-34
lines changed

2 files changed

+77
-34
lines changed

content/zh-cn/docs/reference/access-authn-authz/admission-control-phases.svg

Lines changed: 74 additions & 31 deletions
Loading

content/zh-cn/docs/reference/access-authn-authz/admission-controllers.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -509,15 +509,15 @@ PodTopologyLabels 准入控制器变更所有绑定到节点的 pod 的 `pods/bi
509509
[topology.kubernetes.io/region](/zh-cn/docs/reference/labels-annotations-taints/#topologykubernetesioregion)
510510
[topology.kubernetes.io/zone](/zh-cn/docs/reference/labels-annotations-taints/#topologykubernetesiozone) 标签。
511511

512-
{{ <note> }}
512+
{{< note >}}
513513
<!--
514514
If any mutating admission webhook adds or modifies labels of the `pods/binding` subresource,
515515
these changes will propagate to pod labels as a result of this controller,
516516
overwriting labels with conflicting keys.
517517
-->
518518
如果有任何变更的准入 Webhook 添加或修改了 `pods/binding` 子资源的标签,
519519
这些变更将由于此控制器传播到 Pod 标签,覆盖具有冲突键的标签。
520-
{{ </note> }}
520+
{{< /note >}}
521521

522522
<!--
523523
This admission controller is enabled when the `PodTopologyLabelsAdmission` feature gate is enabled.
@@ -1099,7 +1099,7 @@ and enforces kubelet modification of labels under the `kubernetes.io/` or `k8s.i
10991099
* **Allows** kubelets to add/remove/update these labels and label prefixes:
11001100
-->
11011101
* **禁止** kubelet 添加、删除或更新前缀为 `node-restriction.kubernetes.io/` 的标签。
1102-
这类前缀的标签时保留给管理员的,用以为 `Node` 对象设置标签以隔离工作负载,而不允许 kubelet
1102+
这类前缀的标签是保留给管理员的,用于为 `Node` 对象设置标签以隔离工作负载,而不允许 kubelet
11031103
修改带有该前缀的标签。
11041104
* **允许** kubelet 添加、删除、更新以下标签:
11051105
* `kubernetes.io/hostname`

0 commit comments

Comments
 (0)