Skip to content

Commit 6d6b0dd

Browse files
authored
Merge pull request #47196 from asa3311/sync-zh-134
[zh] sync certificate-signing-requests rbac
2 parents 08d4350 + c01eec7 commit 6d6b0dd

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

content/zh-cn/docs/reference/access-authn-authz/certificate-signing-requests.md

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,13 @@ Kubernetes 证书和信任包(trust bundle)API 可以通过为 Kubernetes AP
5454
{{< feature-state for_k8s_version="v1.19" state="stable" >}}
5555

5656
<!--
57-
A CertificateSigningRequest (CSR) resource is used to request that a certificate be signed
57+
A [CertificateSigningRequest](/docs/reference/kubernetes-api/authentication-resources/certificate-signing-request-v1/)
58+
(CSR) resource is used to request that a certificate be signed
5859
by a denoted signer, after which the request may be approved or denied before
5960
finally being signed.
6061
-->
61-
CertificateSigningRequest(CSR)资源用来向指定的签名者申请证书签名,
62+
[CertificateSigningRequest](/zh-cn/docs/reference/kubernetes-api/authentication-resources/certificate-signing-request-v1/)
63+
(CSR)资源用来向指定的签名者申请证书签名,
6264
在最终签名之前,申请可能被批准,也可能被拒绝。
6365

6466
<!--
@@ -344,7 +346,7 @@ Kubernetes 提供了内置的签名者,每个签名者都有一个众所周知
344346
May be auto-approved by {{< glossary_tooltip term_id="kube-controller-manager" >}}.
345347
1. Trust distribution: signed certificates must be honored as client certificates by the API server. The CA bundle
346348
is not distributed by any other means.
347-
1. Permitted subjects - organizations are exactly `["system:nodes"]`, common name starts with "`system:node:`".
349+
1. Permitted subjects - organizations are exactly `["system:nodes"]`, common name is "`system:node:${NODE_NAME}`".
348350
1. Permitted x509 extensions - honors key usage extensions, forbids subjectAltName extensions and drops other extensions.
349351
1. Permitted key usages - `["key encipherment", "digital signature", "client auth"]` or `["digital signature", "client auth"]`.
350352
1. Expiration/certificate lifetime - for the kube-controller-manager implementation of this signer, set to the minimum
@@ -355,7 +357,7 @@ Kubernetes 提供了内置的签名者,每个签名者都有一个众所周知
355357
{{< glossary_tooltip term_id="kube-controller-manager" >}} 可以自动批准它。
356358

357359
1. 信任分发:签名的证书将被 API 服务器视为客户端证书,CA 证书包不通过任何其他方式分发。
358-
1. 许可的主体:组织名必须是 `["system:nodes"]`用户名以 "`system:node:`" 开头
360+
1. 许可的主体:组织名必须是 `["system:nodes"]`通用名称为 "`system:node:${NODE_NAME}`" 开头
359361
1. 许可的 x509 扩展:允许 key usage 扩展,禁用 subjectAltName 扩展,并删除其他扩展。
360362
1. 许可的密钥用途:`["key encipherment", "digital signature", "client auth"]`
361363
`["digital signature", "client auth"]`
@@ -369,7 +371,7 @@ Kubernetes 提供了内置的签名者,每个签名者都有一个众所周知
369371
Never auto-approved by {{< glossary_tooltip term_id="kube-controller-manager" >}}.
370372
1. Trust distribution: signed certificates must be honored by the API server as valid to terminate connections to a kubelet.
371373
The CA bundle is not distributed by any other means.
372-
1. Permitted subjects - organizations are exactly `["system:nodes"]`, common name starts with "`system:node:`".
374+
1. Permitted subjects - organizations are exactly `["system:nodes"]`, common name is "`system:node:${NODE_NAME}`".
373375
1. Permitted x509 extensions - honors key usage and DNSName/IPAddress subjectAltName extensions, forbids EmailAddress and
374376
URI subjectAltName extensions, drops other extensions. At least one DNS or IP subjectAltName must be present.
375377
1. Permitted key usages - `["key encipherment", "digital signature", "server auth"]` or `["digital signature", "server auth"]`.
@@ -380,7 +382,7 @@ Kubernetes 提供了内置的签名者,每个签名者都有一个众所周知
380382
3. `kubernetes.io/kubelet-serving`:签名服务端证书,该服务证书被 API 服务器视为有效的 kubelet 服务端证书,
381383
但没有其他保证。{{< glossary_tooltip term_id="kube-controller-manager" >}} 不会自动批准它。
382384
1. 信任分发:签名的证书必须被 kube-apiserver 认可,可有效的中止 kubelet 连接,CA 证书包不通过任何其他方式分发。
383-
1. 许可的主体:组织名必须是 `["system:nodes"]`用户名以 "`system:node:`" 开头
385+
1. 许可的主体:组织名必须是 `["system:nodes"]`通用名称为 "`system:node:${NODE_NAME}`" 开头
384386
1. 许可的 x509 扩展:允许 key usage、DNSName/IPAddress subjectAltName 等扩展,
385387
禁止 EmailAddress、URI subjectAltName 等扩展,并丢弃其他扩展。
386388
至少有一个 DNS 或 IP 的 SubjectAltName 存在。
@@ -909,11 +911,14 @@ openssl req -new -key myuser.key -out myuser.csr -subj "/CN=myuser"
909911
<!--
910912
### Create a CertificateSigningRequest {#create-certificatessigningrequest}
911913

912-
Create a CertificateSigningRequest and submit it to a Kubernetes Cluster via kubectl. Below is a script to generate the CertificateSigningRequest.
914+
Create a [CertificateSigningRequest](/docs/reference/kubernetes-api/authentication-resources/certificate-signing-request-v1/)
915+
and submit it to a Kubernetes Cluster via kubectl. Below is a script to generate the
916+
CertificateSigningRequest. a CertificateSigningRequest and submit it to a Kubernetes Cluster via kubectl. Below is a script to generate the CertificateSigningRequest.
913917
-->
914918
### 创建 CertificateSigningRequest {#create-certificatesigningrequest}
915919

916-
创建一个 CertificateSigningRequest,并通过 kubectl 将其提交到 Kubernetes 集群。
920+
创建一个 [CertificateSigningRequest](/zh-cn/docs/reference/kubernetes-api/authentication-resources/certificate-signing-request-v1/),
921+
并通过 kubectl 将其提交到 Kubernetes 集群。
917922
下面是生成 CertificateSigningRequest 的脚本。
918923

919924
```shell

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2107,7 +2107,7 @@ Examples:
21072107

21082108
Default RBAC policies grant scoped permissions to control-plane components, nodes,
21092109
and controllers, but grant *no permissions* to service accounts outside the `kube-system` namespace
2110-
(beyond discovery permissions given to all authenticated users).
2110+
(beyond the permissions given by [API discovery roles](#discovery-roles)).
21112111

21122112
This allows you to grant particular roles to particular ServiceAccounts as needed.
21132113
Fine-grained role bindings provide greater security, but require more effort to administrate.
@@ -2118,7 +2118,7 @@ ServiceAccounts, but are easier to administrate.
21182118

21192119
默认的 RBAC 策略为控制面组件、节点和控制器授予权限。
21202120
但是不会对 `kube-system` 名字空间之外的服务账户授予权限。
2121-
除了授予所有已认证用户的发现权限
2121+
除了 [API 发现角色](#discovery-roles) 授予的权限
21222122

21232123
这使得你可以根据需要向特定 ServiceAccount 授予特定权限。
21242124
细粒度的角色绑定可带来更好的安全性,但需要更多精力管理。
@@ -2320,13 +2320,13 @@ service accounts.
23202320
<!--
23212321
Default RBAC policies grant scoped permissions to control-plane components, nodes,
23222322
and controllers, but grant *no permissions* to service accounts outside the `kube-system` namespace
2323-
(beyond discovery permissions given to all authenticated users).
2323+
(beyond the permissions given by [API discovery roles](#discovery-roles)).
23242324

23252325
While far more secure, this can be disruptive to existing workloads expecting to automatically receive API permissions.
23262326
Here are two approaches for managing this transition:
23272327
-->
23282328
默认的 RBAC 策略为控制面组件、节点和控制器等授予有限的权限,但不会为
2329-
`kube-system` 名字空间外的服务账户授权(除了授予所有认证用户的发现权限之外)。
2329+
`kube-system` 名字空间外的服务账户授权(除了 [API 发现角色](#discovery-roles)授予的权限)。
23302330

23312331
这样做虽然安全得多,但可能会干扰期望自动获得 API 权限的现有工作负载。
23322332
这里有两种方法来完成这种转换:

0 commit comments

Comments
 (0)