Skip to content

Commit 69f018c

Browse files
authored
Merge pull request #34197 from Sea-n/auth-rename
[zh] Resync links to moved pages
2 parents e63d62e + 34197de commit 69f018c

File tree

12 files changed

+58
-48
lines changed

12 files changed

+58
-48
lines changed

content/zh/docs/concepts/architecture/control-plane-node-communication.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ This document catalogs the communication paths between the control plane (apiser
2424
<!-- body -->
2525
<!--
2626
## Node to Control Plane
27-
Kubernetes has a "hub-and-spoke" API pattern. All API usage from nodes (or the pods they run) terminate at the apiserver. None of the other control plane components are designed to expose remote services. The apiserver is configured to listen for remote connections on a secure HTTPS port (typically 443) with one or more forms of client [authentication](/docs/reference/access-authn-authz/authentication/) enabled.
27+
Kubernetes has a "hub-and-spoke" API pattern. All API usage from nodes (or the pods they run) terminates at the apiserver. None of the other control plane components are designed to expose remote services. The apiserver is configured to listen for remote connections on a secure HTTPS port (typically 443) with one or more forms of client [authentication](/docs/reference/access-authn-authz/authentication/) enabled.
2828
One or more forms of [authorization](/docs/reference/access-authn-authz/authorization/) should be enabled, especially if [anonymous requests](/docs/reference/access-authn-authz/authentication/#anonymous-requests) or [service account tokens](/docs/reference/access-authn-authz/authentication/#service-account-tokens) are allowed.
2929
-->
3030
## 节点到控制面
@@ -39,11 +39,11 @@ API 服务器被配置为在一个安全的 HTTPS 端口(通常为 443)上
3939
[服务账号令牌](/zh/docs/reference/access-authn-authz/authentication/#service-account-tokens)的时候。
4040

4141
<!--
42-
Nodes should be provisioned with the public root certificate for the cluster such that they can connect securely to the apiserver along with valid client credentials. A good approach is that the client credentials provided to the kubelet are in the form of a client certificate. See [kubelet TLS bootstrapping](/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/) for automated provisioning of kubelet client certificates.
42+
Nodes should be provisioned with the public root certificate for the cluster such that they can connect securely to the apiserver along with valid client credentials. A good approach is that the client credentials provided to the kubelet are in the form of a client certificate. See [kubelet TLS bootstrapping](/docs/reference/access-authn-authz/kubelet-tls-bootstrapping/) for automated provisioning of kubelet client certificates.
4343
-->
4444
应该使用集群的公共根证书开通节点,这样它们就能够基于有效的客户端凭据安全地连接 API 服务器。
4545
一种好的方法是以客户端证书的形式将客户端凭据提供给 kubelet。
46-
请查看 [kubelet TLS 启动引导](/zh/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/)
46+
请查看 [kubelet TLS 启动引导](/zh/docs/reference/access-authn-authz/kubelet-tls-bootstrapping/)
4747
以了解如何自动提供 kubelet 客户端证书。
4848

4949
<!--
@@ -102,10 +102,10 @@ These connections terminate at the kubelet's HTTPS endpoint. By default, the api
102102
<!--
103103
To verify this connection, use the `--kubelet-certificate-authority` flag to provide the apiserver with a root certificate bundle to use to verify the kubelet's serving certificate.
104104
105-
If that is not possible, use [SSH tunneling](/docs/concepts/architecture/master-node-communication/#ssh-tunnels) between the apiserver and kubelet if required to avoid connecting over an
105+
If that is not possible, use [SSH tunneling](#ssh-tunnels) between the apiserver and kubelet if required to avoid connecting over an
106106
untrusted or public network.
107107
108-
Finally, [Kubelet authentication and/or authorization](/docs/reference/command-line-tools-reference/kubelet-authentication-authorization/) should be enabled to secure the kubelet API.
108+
Finally, [Kubelet authentication and/or authorization](/docs/reference/access-authn-authz/kubelet-authn-authz/) should be enabled to secure the kubelet API.
109109
-->
110110
为了对这个连接进行认证,使用 `--kubelet-certificate-authority` 标志给 API
111111
服务器提供一个根证书包,用于 kubelet 的服务证书。
@@ -114,13 +114,13 @@ Finally, [Kubelet authentication and/or authorization](/docs/reference/command-l
114114
kubelet 之间使用 [SSH 隧道](#ssh-tunnels)
115115

116116
最后,应该启用
117-
[kubelet 用户认证和/或鉴权](/zh/docs/reference/command-line-tools-reference/kubelet-authentication-authorization/)
117+
[kubelet 用户认证和/或鉴权](/zh/docs/reference/access-authn-authz/kubelet-authn-authz/)
118118
来保护 kubelet API。
119119

120120
<!--
121121
### apiserver to nodes, pods, and services
122122
123-
The connections from the apiserver to a node, pod, or service default to plain HTTP connections and are therefore neither authenticated nor encrypted. They can be run over a secure HTTPS connection by prefixing `https:` to the node, pod, or service name in the API URL, but they will not validate the certificate provided by the HTTPS endpoint nor provide client credentials so while the connection will be encrypted, it will not provide any guarantees of integrity. These connections **are not currently safe** to run over untrusted and/or public networks.
123+
The connections from the apiserver to a node, pod, or service default to plain HTTP connections and are therefore neither authenticated nor encrypted. They can be run over a secure HTTPS connection by prefixing `https:` to the node, pod, or service name in the API URL, but they will not validate the certificate provided by the HTTPS endpoint nor provide client credentials. So while the connection will be encrypted, it will not provide any guarantees of integrity. These connections **are not currently safe** to run over untrusted or public networks.
124124
-->
125125
### API 服务器到节点、Pod 和服务
126126

@@ -136,7 +136,7 @@ The connections from the apiserver to a node, pod, or service default to plain H
136136
Kubernetes supports SSH tunnels to protect the control plane to nodes communication paths. In this configuration, the apiserver initiates an SSH tunnel to each node in the cluster (connecting to the ssh server listening on port 22) and passes all traffic destined for a kubelet, node, pod, or service through the tunnel.
137137
This tunnel ensures that the traffic is not exposed outside of the network in which the nodes are running.
138138
139-
SSH tunnels are currently deprecated so you shouldn't opt to use them unless you know what you are doing. The Konnectivity service is a replacement for this communication channel.
139+
SSH tunnels are currently deprecated, so you shouldn't opt to use them unless you know what you are doing. The Konnectivity service is a replacement for this communication channel.
140140
-->
141141
### SSH 隧道 {#ssh-tunnels}
142142

content/zh/docs/concepts/cluster-administration/_index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,14 @@ Before choosing a guide, here are some considerations:
123123
### Securing the kubelet
124124
125125
* [Master-Node communication](/docs/concepts/architecture/master-node-communication/)
126-
* [TLS bootstrapping](/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/)
126+
* [TLS bootstrapping](/docs/reference/access-authn-authz/kubelet-tls-bootstrapping/)
127127
* [Kubelet authentication/authorization](/docs/admin/kubelet-authentication-authorization/)
128128
-->
129129
### 保护 kubelet {#securing-the-kubelet}
130130

131131
* [主控节点通信](/zh/docs/concepts/architecture/control-plane-node-communication/)
132-
* [TLS 引导](/zh/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/)
133-
* [Kubelet 认证/授权](/zh/docs/reference/command-line-tools-reference/kubelet-authentication-authorization/)
132+
* [TLS 引导](/zh/docs/reference/access-authn-authz/kubelet-tls-bootstrapping/)
133+
* [Kubelet 认证/授权](/zh/docs/reference/access-authn-authz/kubelet-authn-authz/)
134134

135135
<!--
136136
## Optional Cluster Services

content/zh/docs/reference/access-authn-authz/bootstrap-tokens.md

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ creating new clusters or joining new nodes to an existing cluster. It was built
2121
to support [kubeadm](/docs/reference/setup-tools/kubeadm/), but can be used in other contexts
2222
for users that wish to start clusters without `kubeadm`. It is also built to
2323
work, via RBAC policy, with the
24-
[Kubelet TLS Bootstrapping](/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/) system.
24+
[Kubelet TLS Bootstrapping](/docs/reference/access-authn-authz/kubelet-tls-bootstrapping/) system.
2525
-->
2626
启动引导令牌是一种简单的持有者令牌(Bearer Token),这种令牌是在新建集群
2727
或者在现有集群中添加新节点时使用的。
2828
它被设计成能够支持 [`kubeadm`](/zh/docs/reference/setup-tools/kubeadm/)
2929
但是也可以被用在其他的案例中以便用户在不使用 `kubeadm` 的情况下启动集群。
3030
它也被设计成可以通过 RBAC 策略,结合
31-
[Kubelet TLS 启动引导](/zh/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/)
31+
[Kubelet TLS 启动引导](/zh/docs/reference/access-authn-authz/kubelet-tls-bootstrapping/)
3232
系统进行工作。
3333

3434
<!-- body -->
@@ -108,20 +108,24 @@ controller on the controller manager.
108108

109109
过期的令牌可以通过启用控制器管理器中的 `tokencleaner` 控制器来删除。
110110

111+
```
112+
--controllers=*,tokencleaner
113+
```
114+
111115
<!--
112116
## Bootstrap Token Secret Format
113117
114118
Each valid token is backed by a secret in the `kube-system` namespace. You can
115119
find the full design doc
116-
[here](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/cluster-lifecycle/bootstrap-discovery.md).
120+
[here](https://github.com/kubernetes/design-proposals-archive/blob/main/cluster-lifecycle/bootstrap-discovery.md).
117121
118122
Here is what the secret looks like.
119123
-->
120124
## 启动引导令牌的 Secret 格式 {#bootstrap-token-secret-format}
121125

122126
每个合法的令牌背后对应着 `kube-system` 名字空间中的某个 Secret 对象。
123127
你可以从
124-
[这里](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/cluster-lifecycle/bootstrap-discovery.md)
128+
[这里](https://github.com/kubernetes/design-proposals-archive/blob/main/cluster-lifecycle/bootstrap-discovery.md)
125129
找到完整设计文档。
126130

127131
这是 Secret 看起来的样子。
@@ -142,10 +146,11 @@ stringData:
142146

143147
# 令牌 ID 和秘密信息,必需。
144148
token-id: 07401b
145-
token-secret: base64(f395accd246ae52d)
149+
token-secret: f395accd246ae52d
146150

147151
# 可选的过期时间字段
148-
expiration: "2017-03-10T03:22:11Z"
152+
expiration: 2017-03-10T03:22:11Z
153+
149154
# 允许的用法
150155
usage-bootstrap-authentication: "true"
151156
usage-bootstrap-signing: "true"
@@ -259,7 +264,7 @@ data:
259264
```
260265

261266
<!--
262-
The `kubeconfig` member of the ConfigMap is a config file with just the cluster
267+
The `kubeconfig` member of the ConfigMap is a config file with only the cluster
263268
information filled out. The key thing being communicated here is the
264269
`certificate-authority-data`. This may be expanded in the future.
265270
-->

content/zh/docs/reference/access-authn-authz/node.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,12 @@ have the minimal set of permissions required to operate correctly.
9090
-->
9191

9292
为了获得节点鉴权器的授权,kubelet 必须使用一个凭证以表示它在 `system:nodes` 组中,用户名为 `system:node:<nodeName>`
93-
上述的组名和用户名格式要与 [kubelet TLS 启动引导](/zh/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/)过程中为每个 kubelet 创建的标识相匹配。
93+
上述的组名和用户名格式要与 [kubelet TLS 启动引导](/zh/docs/reference/access-authn-authz/kubelet-tls-bootstrapping/)过程中为每个 kubelet 创建的标识相匹配。
9494
<!--
9595
In order to be authorized by the Node authorizer, kubelets must use a credential that identifies them as
9696
being in the `system:nodes` group, with a username of `system:node:<nodeName>`.
9797
This group and user name format match the identity created for each kubelet as part of
98-
[kubelet TLS bootstrapping](/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/).
98+
[kubelet TLS bootstrapping](/docs/reference/access-authn-authz/kubelet-tls-bootstrapping/).
9999
-->
100100

101101
要启用节点授权器,请使用 `--authorization-mode = Node` 启动 apiserver。

content/zh/docs/reference/access-authn-authz/rbac.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1550,10 +1550,10 @@ Allows full access to the kubelet API.
15501550
<td>
15511551
<!--
15521552
Allows access to the resources required to perform
1553-
<a href="/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/">Kubelet TLS bootstrapping</a>.
1553+
<a href="/docs/reference/access-authn-authz/kubelet-tls-bootstrapping/">Kubelet TLS bootstrapping</a>.
15541554
-->
15551555
允许访问执行
1556-
<a href="/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/">kubelet TLS 启动引导</a>
1556+
<a href="/zh/docs/reference/access-authn-authz/kubelet-tls-bootstrapping/">kubelet TLS 启动引导</a>
15571557
所需要的资源。
15581558
</td>
15591559
</tr>

content/zh/docs/reference/command-line-tools-reference/feature-gates.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1642,19 +1642,19 @@ For more details, check the
16421642
以了解更多细节。
16431643
<!--
16441644
- `RotateKubeletClientCertificate`: Enable the rotation of the client TLS certificate on the kubelet.
1645-
See [kubelet configuration](/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/#kubelet-configuration) for more details.
1645+
See [kubelet configuration](/docs/reference/access-authn-authz/kubelet-tls-bootstrapping/#kubelet-configuration) for more details.
16461646
- `RotateKubeletServerCertificate`: Enable the rotation of the server TLS certificate on the kubelet.
1647-
See [kubelet configuration](/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/#kubelet-configuration)
1647+
See [kubelet configuration](/docs/reference/access-authn-authz/kubelet-tls-bootstrapping/#kubelet-configuration)
16481648
for more details.
16491649
- `RunAsGroup`: Enable control over the primary group ID set on the init
16501650
processes of containers.
16511651
-->
16521652
- `RotateKubeletClientCertificate`:在 kubelet 上启用客户端 TLS 证书的轮换。
16531653
更多详细信息,请参见
1654-
[kubelet 配置](/zh/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/#kubelet-configuration)
1654+
[kubelet 配置](/zh/docs/reference/access-authn-authz/kubelet-tls-bootstrapping/#kubelet-configuration)
16551655
- `RotateKubeletServerCertificate`:在 kubelet 上启用服务器 TLS 证书的轮换。
16561656
更多详细信息,请参见
1657-
[kubelet 配置](/zh/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/#kubelet-configuration)
1657+
[kubelet 配置](/zh/docs/reference/access-authn-authz/kubelet-tls-bootstrapping/#kubelet-configuration)
16581658
- `RunAsGroup`:启用对容器初始化过程中设置的主要组 ID 的控制。
16591659
<!--
16601660
- `RuntimeClass`: Enable the [RuntimeClass](/docs/concepts/containers/runtime-class/) feature

content/zh/docs/reference/setup-tools/kubeadm/implementation-details.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -494,13 +494,13 @@ API 服务器的静态 Pod 清单会受到用户提供的以下参数的影响:
494494
<!--
495495
- `--insecure-port=0` to avoid insecure connections to the api server
496496
- `--enable-bootstrap-token-auth=true` to enable the `BootstrapTokenAuthenticator` authentication module.
497-
See [TLS Bootstrapping](/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/) for more details
497+
See [TLS Bootstrapping](/docs/reference/access-authn-authz/kubelet-tls-bootstrapping/) for more details
498498
- `--allow-privileged` to `true` (required e.g. by kube proxy)
499499
- `--requestheader-client-ca-file` to `front-proxy-ca.crt`
500500
-->
501501
- `--insecure-port=0` 禁止到 API 服务器不安全的连接
502502
- `--enable-bootstrap-token-auth=true` 启用 `BootstrapTokenAuthenticator` 身份验证模块。
503-
更多细节请参见 [TLS 引导](/zh/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/)
503+
更多细节请参见 [TLS 引导](/zh/docs/reference/access-authn-authz/kubelet-tls-bootstrapping/)
504504
- `--allow-privileged` 设为 `true`(诸如 kube-proxy 这些组件有此要求)
505505
- `--requestheader-client-ca-file` 设为 `front-proxy-ca.crt`
506506

@@ -608,7 +608,7 @@ The static Pod manifest for the controller manager is affected by following para
608608

609609
<!--
610610
- `--controllers` enabling all the default controllers plus `BootstrapSigner` and `TokenCleaner` controllers for TLS bootstrap.
611-
See [TLS Bootstrapping](/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/) for more details
611+
See [TLS Bootstrapping](/docs/reference/access-authn-authz/kubelet-tls-bootstrapping/) for more details
612612
- `--use-service-account-credentials` to `true`
613613
- Flags for using certificates generated in previous steps:
614614
- `--root-ca-file` to `ca.crt`
@@ -618,7 +618,7 @@ The static Pod manifest for the controller manager is affected by following para
618618
-->
619619
- `--controllers` 为 TLS 引导程序启用所有默认控制器以及 `BootstrapSigner`
620620
`TokenCleaner` 控制器。详细信息请参阅
621-
[TLS 引导](/zh/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/)
621+
[TLS 引导](/zh/docs/reference/access-authn-authz/kubelet-tls-bootstrapping/)
622622
- `--use-service-account-credentials` 设为 `true`
623623
- 使用先前步骤中生成的证书的标志:
624624

content/zh/docs/reference/setup-tools/kubeadm/kubeadm-init.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ following steps:
102102
<!--
103103
1. Makes all the necessary configurations for allowing node joining with the
104104
[Bootstrap Tokens](/docs/reference/access-authn-authz/bootstrap-tokens/) and
105-
[TLS Bootstrap](/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/)
105+
[TLS Bootstrap](/docs/reference/access-authn-authz/kubelet-tls-bootstrapping/)
106106
mechanism:
107107
108108
- Write a ConfigMap for making available all the information required
@@ -115,7 +115,7 @@ following steps:
115115
See [kubeadm join](/docs/reference/setup-tools/kubeadm/kubeadm-join/) for additional info.
116116
-->
117117
7. 为了使得节点能够遵照[启动引导令牌](/zh/docs/reference/access-authn-authz/bootstrap-tokens/)
118-
[TLS 启动引导](/zh/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/)
118+
[TLS 启动引导](/zh/docs/reference/access-authn-authz/kubelet-tls-bootstrapping/)
119119
这两份文档中描述的机制加入到集群中,kubeadm 会执行所有的必要配置:
120120

121121
- 创建一个 ConfigMap 提供添加集群节点所需的信息,并为该 ConfigMap 设置相关的 RBAC 访问规则。

content/zh/docs/setup/best-practices/certificates.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Kubernetes 需要 PKI 才能执行以下操作:
3737

3838
<!--
3939
* Client certificates for the kubelet to authenticate to the API server
40-
* Kubelet [server certificates](/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/#client-and-serving-certificates)
40+
* Kubelet [server certificates](/docs/reference/access-authn-authz/kubelet-tls-bootstrapping/#client-and-serving-certificates)
4141
for the API server to talk to the kubelets
4242
* Server certificate for the API server endpoint
4343
* Client certificates for administrators of the cluster to authenticate to the API server
@@ -48,7 +48,7 @@ Kubernetes 需要 PKI 才能执行以下操作:
4848
* Client and server certificates for the [front-proxy](/docs/tasks/extend-kubernetes/configure-aggregation-layer/)
4949
-->
5050
* Kubelet 的客户端证书,用于 API 服务器身份验证
51-
* Kubelet [服务端证书](/zh/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/#client-and-serving-certificates)
51+
* Kubelet [服务端证书](/zh/docs/reference/access-authn-authz/kubelet-tls-bootstrapping/#client-and-serving-certificates)
5252
用于 API 服务器与 Kubelet 的会话
5353
* API 服务器端点的证书
5454
* 集群管理员的客户端证书,用于 API 服务器身份认证

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -530,14 +530,14 @@ By default, these serving certificate will expire after one year. Kubeadm sets t
530530
`KubeletConfiguration` field `rotateCertificates` to `true`, which means that close
531531
to expiration a new set of CSRs for the serving certificates will be created and must
532532
be approved to complete the rotation. To understand more see
533-
[Certificate Rotation](/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/#certificate-rotation).
533+
[Certificate Rotation](/docs/reference/access-authn-authz/kubelet-tls-bootstrapping/#certificate-rotation).
534534
-->
535535
默认情况下,这些服务证书上会在一年后过期。
536536
kubeadm 将 `KubeletConfiguration` 的 `rotateCertificates` 字段设置为
537537
`true`;这意味着证书快要过期时,会生成一组针对服务证书的新的 CSR,而
538538
这些 CSR 也要被批准才能完成证书轮换。
539539
要进一步了解这里的细节,可参阅
540-
[证书轮换](/zh/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/#certificate-rotation)
540+
[证书轮换](/zh/docs/reference/access-authn-authz/kubelet-tls-bootstrapping/#certificate-rotation)
541541
文档。
542542

543543
<!--

0 commit comments

Comments
 (0)