Skip to content

Commit ea802ad

Browse files
committed
[zh-cn] minor sync docs/reference/access-authn-authz
Signed-off-by: tico88612 <17496418+tico88612@users.noreply.github.com>
1 parent ea4444a commit ea802ad

File tree

7 files changed

+46
-17
lines changed

7 files changed

+46
-17
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: 使用 ABAC 鉴权
33
content_type: concept
4-
weight: 80
4+
weight: 39
55
---
66
<!--
77
reviewers:
@@ -11,7 +11,7 @@ reviewers:
1111
- liggitt
1212
title: Using ABAC Authorization
1313
content_type: concept
14-
weight: 80
14+
weight: 39
1515
-->
1616

1717
<!-- overview -->

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

Lines changed: 34 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
---
22
title: 证书和证书签名请求
3+
api_metadata:
4+
- apiVersion: "certificates.k8s.io/v1"
5+
kind: "CertificateSigningRequest"
6+
override_link_text: "CSR v1"
7+
- apiVersion: "certificates.k8s.io/v1alpha1"
8+
kind: "ClusterTrustBundle"
39
content_type: concept
4-
weight: 25
10+
weight: 60
511
---
612
<!--
713
reviewers:
@@ -10,8 +16,14 @@ reviewers:
1016
- munnerz
1117
- enj
1218
title: Certificates and Certificate Signing Requests
19+
api_metadata:
20+
- apiVersion: "certificates.k8s.io/v1"
21+
kind: "CertificateSigningRequest"
22+
override_link_text: "CSR v1"
23+
- apiVersion: "certificates.k8s.io/v1alpha1"
24+
kind: "ClusterTrustBundle"
1325
content_type: concept
14-
weight: 25
26+
weight: 60
1527
-->
1628

1729
<!-- overview -->
@@ -676,14 +688,14 @@ you like. If you want to add a note for human consumption, use the
676688

677689
{{< note >}}
678690
<!--
679-
In Kubernetes {{< skew currentVersion >}}, you must enable the `ClusterTrustBundles`
691+
In Kubernetes {{< skew currentVersion >}}, you must enable the `ClusterTrustBundle`
680692
[feature gate](/docs/reference/command-line-tools-reference/feature-gates/)
681693
_and_ the `certificates.k8s.io/v1alpha1`
682694
{{< glossary_tooltip text="API group" term_id="api-group" >}} in order to use
683695
this API.
684696
-->
685697
在 Kubernetes {{< skew currentVersion >}} 中,如果想要使用此 API,
686-
必须同时启用 `ClusterTrustBundles` [特性门控](/zh-cn/docs/reference/command-line-tools-reference/feature-gates/)
698+
必须同时启用 `ClusterTrustBundle` [特性门控](/zh-cn/docs/reference/command-line-tools-reference/feature-gates/)
687699
**以及** `certificates.k8s.io/v1alpha1` {{< glossary_tooltip text="API 组" term_id="api-group" >}}。
688700
{{< /note >}}
689701

@@ -783,7 +795,7 @@ controller in the cluster, so they have several security features:
783795
`<signerNameDomain>/*`.
784796
* Signer-linked ClusterTrustBundles **must** be named with a prefix derived from
785797
their `spec.signerName` field. Slashes (`/`) are replaced with colons (`:`),
786-
and a final colon is appended. This is followed by an arbitary name. For
798+
and a final colon is appended. This is followed by an arbitrary name. For
787799
example, the signer `example.com/mysigner` can be linked to a
788800
ClusterTrustBundle `example.com:mysigner:<arbitrary-name>`.
789801
-->
@@ -847,6 +859,19 @@ signer-unlinked ClusterTrustBundles **must not** contain a colon (`:`).
847859
为了将它们与与签名者关联的 ClusterTrustBundle 区分开来,与签名者未关联的
848860
ClusterTrustBundle 的名称**必须不**包含英文冒号 (`:`)。
849861

862+
<!--
863+
### Accessing ClusterTrustBundles from pods {#ctb-projection}
864+
-->
865+
### 从 pod 访问 ClusterTrustBundles {#ctb-projection}
866+
867+
{{<feature-state for_k8s_version="v1.29" state="alpha" >}}
868+
869+
<!--
870+
The contents of ClusterTrustBundles can be injected into the container filesystem, similar to ConfigMaps and Secrets. See the [clusterTrustBundle projected volume source](/docs/concepts/storage/projected-volumes#clustertrustbundle) for more details.
871+
-->
872+
ClusterTrustBundle 的内容可以注入到容器文件系统,这与 ConfigMap 和 Secret 类似。
873+
更多细节参阅 [clusterTrustBundle 投射卷源](/zh-cn/docs/concepts/storage/projected-volumes#clustertrustbundle)。
874+
850875
<!-- TODO this should become a task page -->
851876

852877
<!--
@@ -1049,9 +1074,13 @@ kubectl config use-context myuser
10491074
* View the source code for the kube-controller-manager built in [approver](http://github.com/kubernetes/kubernetes/blob/32ec6c212ec9415f604ffc1f4c1f29b782968ff1/pkg/controller/certificates/approver/sarapprove.go)
10501075
* For details of X.509 itself, refer to [RFC 5280](http://tools.ietf.org/html/rfc5280#section-3.1) section 3.1
10511076
* For information on the syntax of PKCS#10 certificate signing requests, refer to [RFC 2986](http://tools.ietf.org/html/rfc2986)
1077+
* Read about the ClusterTrustBundle API:
1078+
* {{< page-api-reference kind="ClusterTrustBundle" >}}
10521079
-->
10531080
* 参阅 [管理集群中的 TLS 认证](/zh-cn/docs/tasks/tls/managing-tls-in-a-cluster/)
10541081
* 查看 kube-controller-manager 中[签名者](http://github.com/kubernetes/kubernetes/blob/32ec6c212ec9415f604ffc1f4c1f29b782968ff1/pkg/controller/certificates/signer/cfssl_signer.go)部分的源代码
10551082
* 查看 kube-controller-manager 中[批准者](http://github.com/kubernetes/kubernetes/blob/32ec6c212ec9415f604ffc1f4c1f29b782968ff1/pkg/controller/certificates/approver/sarapprove.go)部分的源代码
10561083
* 有关 X.509 本身的详细信息,请参阅 [RFC 5280](http://tools.ietf.org/html/rfc5280#section-3.1) 第 3.1 节
10571084
* 有关 PKCS#10 证书签名请求语法的信息,请参阅 [RFC 2986](http://tools.ietf.org/html/rfc2986)
1085+
* 阅读 ClusterTrustBundle 相关内容:
1086+
* {{< page-api-reference kind="ClusterTrustBundle" >}}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ To enable X509 client certificate authentication to the kubelet's HTTPS endpoint
5858
<!--
5959
* start the kubelet with the `--client-ca-file` flag, providing a CA bundle to verify client certificates with
6060
* start the apiserver with `--kubelet-client-certificate` and `--kubelet-client-key` flags
61-
* see the [apiserver authentication documentation](/docs/reference/access-authn-authz/authentication/#x509-client-certs) for more details
61+
* see the [apiserver authentication documentation](/docs/reference/access-authn-authz/authentication/#x509-client-certificates) for more details
6262
-->
6363
*`--client-ca-file` 标志启动 kubelet,提供一个 CA 证书包以供验证客户端证书
6464
*`--kubelet-client-certificate``--kubelet-client-key` 标志启动 API 服务器
6565
* 有关更多详细信息,请参见
66-
[API 服务器身份验证文档](/zh-cn/docs/reference/access-authn-authz/authentication/#x509-client-certs)
66+
[API 服务器身份验证文档](/zh-cn/docs/reference/access-authn-authz/authentication/#x509-client-certificates)
6767

6868
<!--
6969
To enable API bearer tokens (including service account tokens) to be used to authenticate to the kubelet's HTTPS endpoint:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: 使用 Node 鉴权
33
content_type: concept
4-
weight: 90
4+
weight: 34
55
---
66
<!--
77
reviewers:
@@ -10,7 +10,7 @@ reviewers:
1010
- liggitt
1111
title: Using Node Authorization
1212
content_type: concept
13-
weight: 90
13+
weight: 34
1414
-->
1515

1616
<!-- overview -->

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: 使用 RBAC 鉴权
33
content_type: concept
44
aliases: [/zh-cn/rbac/]
5-
weight: 70
5+
weight: 33
66
---
77

88
<!--
@@ -13,7 +13,7 @@ reviewers:
1313
title: Using RBAC Authorization
1414
content_type: concept
1515
aliases: [/rbac/]
16-
weight: 70
16+
weight: 33
1717
-->
1818

1919
<!-- overview -->

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ content_type: concept
1313

1414
<!-- overview -->
1515

16-
{{< feature-state state="beta" for_k8s_version="v1.28" >}}
16+
{{< feature-state state="stable" for_k8s_version="v1.30" >}}
1717

1818
<!--
1919
This page provides an overview of Validating Admission Policy.
@@ -708,7 +708,7 @@ When an API request is validated with this admission policy, the resulting audit
708708
709709
<!--
710710
In this example the annotation will only be included if the `spec.replicas` of the Deployment is more than
711-
50, otherwise the CEL expression evalutes to null and the annotation will not be included.
711+
50, otherwise the CEL expression evaluates to null and the annotation will not be included.
712712
713713
Note that audit annotation keys are prefixed by the name of the `ValidatingAdmissionWebhook` and a `/`. If
714714
another admission controller, such as an admission webhook, uses the exact same audit annotation key, the

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Webhook 模式
33
content_type: concept
4-
weight: 100
4+
weight: 36
55
---
66
<!--
77
reviewers:
@@ -11,7 +11,7 @@ reviewers:
1111
- liggitt
1212
title: Webhook Mode
1313
content_type: concept
14-
weight: 100
14+
weight: 36
1515
-->
1616

1717
<!-- overview -->

0 commit comments

Comments
 (0)