Skip to content

Commit dd7930f

Browse files
committed
sync configure-upgrade-etc kubeadm-certs verify-signed-artifacts
1 parent 9d88e75 commit dd7930f

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

content/zh-cn/docs/tasks/administer-cluster/configure-upgrade-etcd.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,17 @@ weight: 270
2121

2222
{{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
2323

24+
<!--
25+
You need to have a Kubernetes cluster, and the kubectl command-line tool must
26+
be configured to communicate with your cluster. It is recommended to run this
27+
task on a cluster with at least two nodes that are not acting as control plane
28+
nodes . If you do not already have a cluster, you can create one by using
29+
[minikube](https://minikube.sigs.k8s.io/docs/tutorials/multi_node/).
30+
-->
31+
你需要有一个 Kubernetes 集群,并且必须配置 kubectl 命令行工具以与你的集群通信。
32+
建议在至少有两个不充当控制平面的节点上运行此任务。如果你还没有集群,
33+
你可以使用 [minikube](https://minikube.sigs.k8s.io/docs/tutorials/multi_node/) 创建一个。
34+
2435
<!-- steps -->
2536

2637
<!--

content/zh-cn/docs/tasks/administer-cluster/kubeadm/kubeadm-certs.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -607,13 +607,14 @@ IP 或域名请求服务证书。
607607
During cluster creation, kubeadm signs the certificate in the `admin.conf` to have
608608
`Subject: O = system:masters, CN = kubernetes-admin`.
609609
[`system:masters`](/docs/reference/access-authn-authz/rbac/#user-facing-roles)
610-
is a break-glass, super user group that bypasses the authorization layer (e.g. RBAC).
610+
is a break-glass, super user group that bypasses the authorization layer (for example,
611+
[RBAC](/docs/reference/access-authn-authz/rbac/)).
611612
Sharing the `admin.conf` with additional users is **not recommended**!
612613
-->
613614
在集群创建过程中,kubeadm 对 `admin.conf` 中的证书进行签名时,将其配置为
614615
`Subject: O = system:masters, CN = kubernetes-admin`。
615616
[`system:masters`](/zh-cn/docs/reference/access-authn-authz/rbac/#user-facing-roles)
616-
是一个例外的超级用户组,可以绕过鉴权层(例如 RBAC)。
617+
是一个例外的超级用户组,可以绕过鉴权层(例如 [RBAC](/zh-cn/docs/reference/access-authn-authz/rbac/))。
617618
强烈建议不要将 `admin.conf` 文件与任何人共享。
618619

619620
<!--

content/zh-cn/docs/tasks/administer-cluster/verify-signed-artifacts.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ You will need to have the following tools installed:
2222
2323
- `cosign` ([install guide](https://docs.sigstore.dev/cosign/installation/))
2424
- `curl` (often provided by your operating system)
25-
- `jq` ([download jq](https://stedolan.github.io/jq/download/))
25+
- `jq` ([download jq](https://jqlang.github.io/jq/download/))
2626
-->
2727
你需要安装以下工具:
2828

2929
- `cosign`[安装指南](https://docs.sigstore.dev/cosign/installation/)
3030
- `curl`(通常由你的操作系统提供)
31-
- `jq`[下载 jq](https://stedlan.github.io/jq/download/)
31+
- `jq`[下载 jq](https://jqlang.github.io/jq/download/)
3232

3333

3434
<!--

0 commit comments

Comments
 (0)