Skip to content

Commit ca46c29

Browse files
authored
Merge pull request #48175 from my-git9/pp-5824
[zh-cn] sync token-review-v1 namespace-v1
2 parents 0ab7fd7 + b52c517 commit ca46c29

File tree

2 files changed

+28
-3
lines changed

2 files changed

+28
-3
lines changed

content/zh-cn/docs/reference/kubernetes-api/authentication-resources/token-review-v1.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,12 @@ TokenReviewPec 是对令牌身份验证请求的描述。
7777
- **audiences** ([]string)
7878

7979
<!--
80+
*Atomic: will be replaced during a merge*
81+
8082
Audiences is a list of the identifiers that the resource server presented with the token identifies as. Audience-aware token authenticators will verify that the token was intended for at least one of the audiences in this list. If no audiences are provided, the audience will default to the audience of the Kubernetes apiserver.
8183
-->
84+
**原子性:将在合并期间被替换**
85+
8286
audiences 是带有令牌的资源服务器标识为受众的标识符列表。
8387
受众感知令牌身份验证器将验证令牌是否适用于此列表中的至少一个受众。
8488
如果未提供受众,受众将默认为 Kubernetes API 服务器的受众。
@@ -102,8 +106,13 @@ TokenReviewStatus 是令牌认证请求的结果。
102106
- **audiences** ([]string)
103107

104108
<!--
109+
*Atomic: will be replaced during a merge*
110+
105111
Audiences are audience identifiers chosen by the authenticator that are compatible with both the TokenReview and token. An identifier is any identifier in the intersection of the TokenReviewSpec audiences and the token's audiences. A client of the TokenReview API that sets the spec.audiences field should validate that a compatible audience identifier is returned in the status.audiences field to ensure that the TokenReview server is audience aware. If a TokenReview returns an empty status.audience field where status.authenticated is "true", the token is valid against the audience of the Kubernetes API server.
106112
-->
113+
114+
**原子性:将在合并期间被替换**
115+
107116
audiences 是身份验证者选择的与 TokenReview 和令牌兼容的受众标识符。标识符是
108117
TokenReviewSpec 受众和令牌受众的交集中的任何标识符。设置 spec.audiences
109118
字段的 TokenReview API 的客户端应验证在 status.audiences 字段中返回了兼容的受众标识符,
@@ -146,6 +155,12 @@ TokenReviewStatus 是令牌认证请求的结果。
146155

147156
- **user.groups** ([]string)
148157

158+
<!--
159+
Atomic: will be replaced during a merg
160+
-->
161+
162+
**Atomic:将在合并期间被替换**
163+
149164
<!--
150165
The names of groups this user is a part of.
151166
-->

content/zh-cn/docs/reference/kubernetes-api/cluster-resources/namespace-v1.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ api_metadata:
66
content_type: "api_reference"
77
description: "Namespace 为名字提供作用域。"
88
title: "Namespace"
9-
weight: 2
9+
weight: 7
1010
---
1111

1212
<!--
@@ -17,7 +17,7 @@ api_metadata:
1717
content_type: "api_reference"
1818
description: "Namespace provides a scope for Names."
1919
title: "Namespace"
20-
weight: 2
20+
weight: 7
2121
auto_generated: true
2222
-->
2323

@@ -69,6 +69,12 @@ NamespaceSpec 用于描述 Namespace 的属性。
6969

7070
finalizers 是一个不透明的值列表,只有此列表为空时才能从存储中永久删除对象。 更多信息: https://kubernetes.io/zh-cn/docs/tasks/administer-cluster/namespaces/
7171

72+
<!--
73+
*Atomic: will be replaced during a merge*
74+
-->
75+
76+
**原子性:将在合并期间被替换**
77+
7278
## NamespaceStatus {#NamespaceStatus}
7379
<!--
7480
NamespaceStatus is information about the current status of a Namespace.
@@ -79,11 +85,15 @@ NamespaceStatus 表示 Namespace 的当前状态信息。
7985
- **conditions** ([]NamespaceCondition)
8086
<!--
8187
*Patch strategy: merge on key `type`*
88+
89+
*Map: unique values on key type will be kept during a merge*
8290
8391
Represents the latest available observations of a namespace's current state.
8492
-->
8593
**补丁策略:基于 `type` 健合并**
86-
94+
95+
**Map:键 `type` 的唯一值将在合并期间保留**
96+
8797
表示命名空间当前状态的最新可用状况。
8898

8999
<a name="NamespaceCondition"></a>

0 commit comments

Comments
 (0)