Skip to content

Commit 2ec33f6

Browse files
authored
Merge pull request #49258 from windsonsea/gloss
[zh] Update glossary: drain, rbac, addons, replicaset
2 parents 2c0aee8 + 95fa74f commit 2ec33f6

File tree

5 files changed

+85
-25
lines changed

5 files changed

+85
-25
lines changed

content/zh-cn/docs/reference/glossary/addons.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ tags:
2323
- tool
2424
-->
2525

26-
<!--
27-
Resources that extend the functionality of Kubernetes.
28-
-->
29-
扩展 Kubernetes 功能的资源。
26+
<!--
27+
Resources that extend the functionality of Kubernetes.
28+
-->
29+
扩展 Kubernetes 功能的资源。
3030

3131
<!--more-->
3232

content/zh-cn/docs/reference/glossary/admission-controller.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ short_description: >
2121
aka:
2222
tags:
2323
- extension
24-
- security
24+
- security
2525
-->
2626

2727
<!--
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
---
2+
title: 腾空
3+
id: drain
4+
date: 2024-12-27
5+
full_link:
6+
short_description: >
7+
从 Node 中安全地驱逐 Pod,为节点维护或移除做好准备。
8+
tags:
9+
- fundamental
10+
- operation
11+
---
12+
13+
<!--
14+
title: Drain
15+
id: drain
16+
date: 2024-12-27
17+
full_link:
18+
short_description: >
19+
Safely evicts Pods from a Node to prepare for maintenance or removal.
20+
tags:
21+
- fundamental
22+
- operation
23+
-->
24+
25+
<!--
26+
The process of safely evicting {{< glossary_tooltip text="Pods" term_id="pod" >}} from a {{< glossary_tooltip text="Node" term_id="node" >}} to prepare it for maintenance or removal from a {{< glossary_tooltip text="cluster" term_id="cluster" >}}.
27+
-->
28+
从 {{< glossary_tooltip text="Node" term_id="node" >}} 中安全驱逐
29+
{{< glossary_tooltip text="Pod" term_id="pod" >}} 的过程,
30+
为维护或从{{< glossary_tooltip text="集群" term_id="cluster" >}}中移除节点做好准备。
31+
32+
<!--more-->
33+
34+
<!--
35+
The `kubectl drain` command is used to mark a {{< glossary_tooltip text="Node" term_id="node" >}} as going out of service.
36+
When executed, it evicts all {{< glossary_tooltip text="Pods" term_id="pod" >}} from the {{< glossary_tooltip text="Node" term_id="node" >}}.
37+
If an eviction request is temporarily rejected, `kubectl drain` retries until all {{< glossary_tooltip text="Pods" term_id="pod" >}} are terminated or a configurable timeout is reached.
38+
-->
39+
`kubectl drain` 命令用于将 {{< glossary_tooltip text="Node" term_id="node" >}} 标记为停止服务。
40+
执行此命令时,它会从 {{< glossary_tooltip text="Node" term_id="node" >}} 驱逐所有
41+
{{< glossary_tooltip text="Pod" term_id="pod" >}}。
42+
如果驱逐请求临时被拒绝,`kubectl drain` 会重试,直到所有
43+
{{< glossary_tooltip text="Pod" term_id="pod" >}} 被终止或达到可配置的超时时限。

content/zh-cn/docs/reference/glossary/rbac.md

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,52 @@ tags:
1111
- security
1212
- fundamental
1313
---
14-
1514
<!--
16-
---
1715
title: RBAC (Role-Based Access Control)
1816
id: rbac
1917
date: 2018-04-12
20-
full_link: /zh-cn/docs/reference/access-authn-authz/rbac/
18+
full_link: /docs/reference/access-authn-authz/rbac/
2119
short_description: >
2220
Manages authorization decisions, allowing admins to dynamically configure access policies through the Kubernetes API.
2321
2422
aka:
2523
tags:
2624
- security
2725
- fundamental
28-
---
2926
-->
3027

3128
<!--
3229
Manages authorization decisions, allowing admins to dynamically configure access policies through the {{< glossary_tooltip text="Kubernetes API" term_id="kubernetes-api" >}}.
3330
-->
3431
管理授权决策,允许管理员通过 {{< glossary_tooltip text="Kubernetes API" term_id="kubernetes-api" >}} 动态配置访问策略。
3532

36-
<!--more-->
33+
<!--more-->
3734

3835
<!--
39-
RBAC utilizes *roles*, which contain permission rules, and *role bindings*, which grant the permissions defined in a role to a set of users.
36+
RBAC utilizes four kinds of Kubernetes objects:
37+
38+
Role
39+
: Defines permission rules in a specific namespace.
40+
41+
ClusterRole
42+
: Defines permission rules cluster-wide.
43+
44+
RoleBinding
45+
: Grants the permissions defined in a role to a set of users in a specific namespace.
46+
47+
ClusterRoleBinding
48+
: Grants the permissions defined in a role to a set of users cluster-wide.
49+
50+
For more information, see [RBAC](/docs/reference/access-authn-authz/rbac/).
4051
-->
41-
RBAC 使用 *角色* (包含权限规则)和 *角色绑定* (将角色中定义的权限授予一组用户)。
52+
RBAC 使用四种类别的 Kubernetes 对象:
53+
54+
- **Role**:在特定命名空间中定义权限规则。
55+
56+
- **ClusterRole**:定义集群范围内的权限规则。
57+
58+
- **RoleBinding**:将角色中定义的权限授予特定命名空间中的一组用户。
4259

60+
- **ClusterRoleBinding**:将角色中定义的权限授予集群范围内的一组用户。
4361

62+
更多信息参见 [RBAC](/zh-cn/docs/reference/access-authn-authz/rbac/)

content/zh-cn/docs/reference/glossary/replica-set.md

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,40 @@ id: replica-set
44
date: 2018-04-12
55
full_link: /zh-cn/docs/concepts/workloads/controllers/replicaset/
66
short_description: >
7-
ReplicaSet 是下一代副本控制器
7+
ReplicaSet 确保一次运行指定数量的 Pod 副本
88
99
aka:
1010
tags:
1111
- fundamental
1212
- core-object
1313
- workload
1414
---
15-
1615
<!--
17-
---
1816
title: ReplicaSet
1917
id: replica-set
2018
date: 2018-04-12
21-
full_link: /zh-cn/docs/concepts/workloads/controllers/replicaset/
19+
full_link: /docs/concepts/workloads/controllers/replicaset/
2220
short_description: >
23-
ReplicaSet is the next-generation Replication Controller.
21+
ReplicaSet ensures that a specified number of Pod replicas are running at one time
2422
2523
aka:
2624
tags:
2725
- fundamental
2826
- core-object
2927
- workload
30-
---
3128
-->
3229

3330
<!--
34-
ReplicaSet is the next-generation Replication Controller.
31+
A ReplicaSet (aims to) maintain a set of replica Pods running at any given time.
3532
-->
33+
ReplicaSet(旨在)在任何给定时间确保运行一组 Pod 副本。
3634

37-
ReplicaSet 是下一代副本控制器。
38-
39-
<!--more-->
35+
<!--more-->
4036

4137
<!--
42-
ReplicaSet, like ReplicationController, ensures that a specified number of pods replicas are running at one time. ReplicaSet supports the new set-based selector requirements as described in the labels user guide, whereas a Replication Controller only supports equality-based selector requirements.
38+
Workload objects such as {{< glossary_tooltip term_id="deployment" >}} make use of ReplicaSets
39+
to ensure that the configured number of {{< glossary_tooltip term_id="pod" text="Pods" >}} are
40+
running in your cluster, based on the spec of that ReplicaSet.
4341
-->
44-
45-
ReplicaSet 就像 ReplicationController 那样,确保一次运行指定数量的 Pod 副本。ReplicaSet 支持新的基于集合的选择器需求(在标签的用户指南中有相关描述),而副本控制器只支持基于等值的选择器需求
42+
像 {{< glossary_tooltip term_id="deployment" >}} 这类工作负载对象利用 ReplicaSet
43+
基于其规约来确保集群中运行的 {{< glossary_tooltip term_id="pod" text="Pod" >}} 数量符合配置要求

0 commit comments

Comments
 (0)