Skip to content

Commit efc7c05

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #48028 from my-git9/pp-25665
[zh-cn] sync cluster-role-v1 role-v1 replication-controller-v1
2 parents 56be244 + 8ca4e7e commit efc7c05

File tree

3 files changed

+91
-21
lines changed

3 files changed

+91
-21
lines changed

‎content/zh-cn/docs/reference/kubernetes-api/authorization-resources/cluster-role-v1.md

Lines changed: 40 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ ClusterRole 是一个集群级别的 PolicyRule 逻辑分组，
4848
<a name="AggregationRule"></a>
4949
*AggregationRule describes how to locate ClusterRoles to aggregate into the ClusterRole*
5050
- **aggregationRule.clusterRoleSelectors** ([]<a href="{{< ref "../common-definitions/label-selector#LabelSelector" >}}">LabelSelector</a>)
51+
*Atomic: will be replaced during a merge*
5152
ClusterRoleSelectors holds a list of selectors which will be used to find ClusterRoles and create the rules. If any of the selectors match, then the ClusterRole's permissions will be added
5253
-->
5354
- **metadata** (<a href="{{< ref "../common-definitions/object-meta#ObjectMeta" >}}">ObjectMeta</a>)
@@ -63,63 +64,95 @@ ClusterRole 是一个集群级别的 PolicyRule 逻辑分组，
6364
**aggregationRule 描述如何定位并聚合其它 ClusterRole 到此 ClusterRole。**
6465

6566
- **aggregationRule.clusterRoleSelectors** ([]<a href="{{< ref "../common-definitions/label-selector#LabelSelector" >}}">LabelSelector</a>)
66-
67+
68+
**原子：将在合并期间被替换**
69+
6770
clusterRoleSelectors 包含一个选择器的列表，用于查找 ClusterRole 并创建规则。
6871
如果发现任何选择器匹配的 ClusterRole，将添加其对应的权限。
6972

7073
<!--
7174
- **rules** ([]PolicyRule)
75+
76+
*Atomic: will be replaced during a merge*
77+
7278
Rules holds all the PolicyRules for this ClusterRole
7379
7480
<a name="PolicyRule"></a>
7581
*PolicyRule holds information that describes a policy rule, but does not contain information about who the rule applies to or which namespace the rule applies to.*
7682
7783
- **rules.apiGroups** ([]string)
84+
85+
*Atomic: will be replaced during a merge*
86+
7887
APIGroups is the name of the APIGroup that contains the resources. If multiple API groups are specified, any action requested against one of the enumerated resources in any API group will be allowed. "" represents the core API group and "*" represents all API groups.
7988
8089
- **rules.resources** ([]string)
90+
91+
*Atomic: will be replaced during a merge*
92+
8193
Resources is a list of resources this rule applies to. '*' represents all resources.
8294
-->
8395
- **rules** ([]PolicyRule)
84-
96+
97+
**原子：将在合并期间被替换**
98+
8599
rules 包含了这个 ClusterRole 的所有 PolicyRule。
86100

87101
<a name="PolicyRule"></a>
88102
**PolicyRule 包含描述一个策略规则的信息，但不包含该规则适用于哪个主体或适用于哪个命名空间的信息。**
89103

90104
- **rules.apiGroups** ([]string)
91-
105+
106+
**原子：将在合并期间被替换**
107+
92108
apiGroups 是包含资源的 apiGroup 的名称。
93109
如果指定了多个 API 组，则允许针对任何 API 组中的其中一个枚举资源来请求任何操作。
94110
"" 表示核心 API 组，“*” 表示所有 API 组。
95111

96112
- **rules.resources** ([]string)
97-
113+
114+
**原子：将在合并期间被替换**
115+
98116
resources 是此规则所适用的资源的列表。“*” 表示所有资源。
99117

100118
<!--
101119
- **rules.verbs** ([]string), required
120+
121+
*Atomic: will be replaced during a merge*
122+
102123
Verbs is a list of Verbs that apply to ALL the ResourceKinds contained in this rule. '*' represents all verbs.
103124
104125
- **rules.resourceNames** ([]string)
126+
127+
*Atomic: will be replaced during a merge*
128+
105129
ResourceNames is an optional white list of names that the rule applies to. An empty set means that everything is allowed.
106130
107131
- **rules.nonResourceURLs** ([]string)
132+
133+
*Atomic: will be replaced during a merge*
134+
108135
NonResourceURLs is a set of partial urls that a user should have access to. *s are allowed, but only as the full, final step in the path Since non-resource URLs are not namespaced, this field is only applicable for ClusterRoles referenced from a ClusterRoleBinding. Rules can either apply to API resources (such as "pods" or "secrets") or non-resource URL paths (such as "/api"), but not both.
109136
-->
110137

111138
- **rules.verbs** ([]string)，必需
112-
139+
140+
**原子：将在合并期间被替换**
141+
113142
verbs 是适用于此规则中所包含的所有 ResourceKinds 的动作。
114143
“*” 表示所有动作。
115144

116145
- **rules.resourceNames** ([]string)
117-
146+
147+
**原子：将在合并期间被替换**
148+
118149
resourceNames 是此规则所适用的资源名称白名单，可选。
119150
空集合意味着允许所有资源。
120151

121152
- **rules.nonResourceURLs** ([]string)
122-
153+
154+
**原子：将在合并期间被替换**
155+
123156
nonResourceURLs 是用户应有权访问的一组部分 URL。
124157
允许使用 “*”，但仅能作为路径中最后一段且必须用于完整的一段，
125158
因为非资源 URL 没有划分命名空间。

‎content/zh-cn/docs/reference/kubernetes-api/authorization-resources/role-v1.md

Lines changed: 43 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,62 +39,95 @@ Role 是一个按命名空间划分的 PolicyRule 逻辑分组，可以被 RoleB
3939

4040
- **metadata** (<a href="{{< ref "../common-definitions/object-meta#ObjectMeta" >}}">ObjectMeta</a>)
4141

42+
<!--
43+
Standard object's metadata.
44+
-->
45+
4246
标准的对象元数据。
43-
<!--
44-
Standard object's metadata.
4547

48+
<!--
4649
- **rules** ([]PolicyRule)
50+
51+
*Atomic: will be replaced during a merge*
52+
4753
Rules holds all the PolicyRules for this Role
4854
4955
<a name="PolicyRule"></a>
5056
*PolicyRule holds information that describes a policy rule, but does not contain information about who the rule applies to or which namespace the rule applies to.*
5157
5258
- **rules.apiGroups** ([]string)
59+
60+
*Atomic: will be replaced during a merge*
61+
5362
APIGroups is the name of the APIGroup that contains the resources. If multiple API groups are specified, any action requested against one of the enumerated resources in any API group will be allowed. "" represents the core API group and "*" represents all API groups.
5463
5564
- **rules.resources** ([]string)
65+
66+
*Atomic: will be replaced during a merge*
67+
5668
Resources is a list of resources this rule applies to. '*' represents all resources.
5769
5870
- **rules.verbs** ([]string), required
71+
72+
*Atomic: will be replaced during a merge*
73+
5974
Verbs is a list of Verbs that apply to ALL the ResourceKinds contained in this rule. '*' represents all verbs.
6075
6176
- **rules.resourceNames** ([]string)
77+
78+
*Atomic: will be replaced during a merge*
79+
6280
ResourceNames is an optional white list of names that the rule applies to. An empty set means that everything is allowed.
6381
6482
- **rules.nonResourceURLs** ([]string)
83+
84+
*Atomic: will be replaced during a merge*
85+
6586
NonResourceURLs is a set of partial urls that a user should have access to. *s are allowed, but only as the full, final step in the path Since non-resource URLs are not namespaced, this field is only applicable for ClusterRoles referenced from a ClusterRoleBinding. Rules can either apply to API resources (such as "pods" or "secrets") or non-resource URL paths (such as "/api"), but not both.
6687
-->
6788

6889
- **rules** ([]PolicyRule)
69-
90+
91+
**原子：将在合并期间被替换**
92+
7093
rules 包含了这个 Role 的所有 PolicyRule。
71-
94+
7295
<a name="PolicyRule"></a>
7396
**PolicyRule 包含描述一个策略规则的信息，但不包含该规则适用于哪个主体或适用于哪个命名空间的信息。**
74-
97+
7598
- **rules.apiGroups** ([]string)
76-
99+
100+
**原子：将在合并期间被替换**
101+
77102
apiGroups 是包含资源的 apiGroup 的名称。
78103
如果指定了多个 API 组，则允许对任何 API 组中的其中一个枚举资源来请求任何操作。
79104
"" 表示核心 API 组，“*” 表示所有 API 组。
80105

81106
- **rules.resources** ([]string)
82-
107+
108+
**原子：将在合并期间被替换**
109+
83110
resources 是此规则所适用的资源的列表。
84111
“*” 表示所有资源。
85112

86113
- **rules.verbs** ([]string)，必需
87-
114+
115+
**原子：将在合并期间被替换**
116+
88117
verbs 是适用于此规则中所包含的所有 ResourceKinds 的动作。
89118
“*” 表示所有动作。
90119

91120
- **rules.resourceNames** ([]string)
92-
121+
122+
**原子：将在合并期间被替换**
123+
93124
resourceNames 是此规则所适用的资源名称白名单，可选。
94125
空集合意味着允许所有资源。
95126

96127
- **rules.nonResourceURLs** ([]string)
97-
128+
129+
**原子：将在合并期间被替换**
130+
98131
nonResourceURLs 是用户应有权访问的一组部分 URL。
99132
允许使用 “*”，但仅能作为路径中最后一段且必须用于完整的一段，
100133
因为非资源 URL 没有划分命名空间。

‎content/zh-cn/docs/reference/kubernetes-api/workload-resources/replication-controller-v1.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ api_metadata:
66
content_type: "api_reference"
77
description: "ReplicationController 表示一个副本控制器的配置。"
88
title: "ReplicationController"
9-
weight: 3
9+
weight: 4
1010
---
1111
<!--
1212
api_metadata:
@@ -16,7 +16,7 @@ api_metadata:
1616
content_type: "api_reference"
1717
description: "ReplicationController represents the configuration of a replication controller."
1818
title: "ReplicationController"
19-
weight: 3
19+
weight: 4
2020
auto_generated: true
2121
-->
2222

@@ -168,7 +168,9 @@ ReplicationControllerStatus 表示一个副本控制器的当前状态。
168168
- **conditions** ([]ReplicationControllerCondition)
169169
170170
*Patch strategy: merge on key `type`*
171-
171+
172+
*Map: unique values on key type will be kept during a merge*
173+
172174
Represents the latest available observations of a replication controller's current state.
173175
174176
<a name="ReplicationControllerCondition"></a>
@@ -177,7 +179,9 @@ ReplicationControllerStatus 表示一个副本控制器的当前状态。
177179
- **conditions** ([]ReplicationControllerCondition)
178180

179181
**补丁策略：按照键 `type` 合并**
180-
182+
183+
**Map：键 `type` 的唯一值将在合并期间保留**
184+
181185
表示副本控制器当前状态的最新可用观测值。
182186

183187
<a name="ReplicationControllerCondition"></a>

0 commit comments

Comments
 (0)