Skip to content

Commit aee5e1b

Browse files
authored
Merge pull request #53357 from windsonsea/gloh2p
[zh] Sync glossary from h to n
2 parents 9e7d60c + eb1c06c commit aee5e1b

File tree

7 files changed

+47
-58
lines changed

7 files changed

+47
-58
lines changed

content/zh-cn/docs/reference/glossary/helm-chart.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ id: helm-chart
44
date: 2018-04-12
55
full_link: https://helm.sh/docs/topics/charts/
66
short_description: >
7-
Helm Chart 是一组预先配置的 Kubernetes 资源所构成的包,可以使用 Helm 工具对其进行管理。
7+
Helm Chart 是一组预先定义的 Kubernetes 配置所构成的包,可以使用 Helm 工具对其进行管理。
88
99
aka:
1010
tags:
@@ -16,19 +16,19 @@ id: helm-chart
1616
date: 2018-04-12
1717
full_link: https://helm.sh/docs/topics/charts/
1818
short_description: >
19-
A package of pre-configured Kubernetes resources that can be managed with the Helm tool.
19+
A package of pre-configured Kubernetes configurations that can be managed with the Helm tool.
2020
2121
aka:
2222
tags:
2323
- tool
2424
-->
2525

2626
<!--
27-
A package of pre-configured Kubernetes resources that can be managed with the Helm tool.
27+
A package of pre-configured Kubernetes configurations that can be managed with the Helm tool.
2828
-->
29-
Helm Chart 是一组预先配置的 Kubernetes 资源所构成的包,可以使用 Helm 工具对其进行管理。
29+
Helm Chart 是一组预先定义的 Kubernetes 配置所构成的包,可以使用 Helm 工具对其进行管理。
3030

31-
<!--more-->
31+
<!--more-->
3232

3333
<!--
3434
Charts provide a reproducible way of creating and sharing Kubernetes applications.
Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
2-
title: Pod 水平自动扩缩器(Horizontal Pod Autoscaler)
2+
title: Pod 水平自动扩缩器
33
id: horizontal-pod-autoscaler
44
date: 2018-04-12
55
full_link: /zh-cn/docs/tasks/run-application/horizontal-pod-autoscale/
66
short_description: >
7-
Pod 水平自动扩缩器(Horizontal Pod Autoscaler)是一种 API 资源,它根据目标 CPU 利用率或自定义度量目标扩缩 Pod 副本的数量。
7+
此对象根据目标资源利用率或自定义度量目标自动扩缩 Pod 副本的数量。
88
99
aka:
1010
- HPA
@@ -17,7 +17,7 @@ id: horizontal-pod-autoscaler
1717
date: 2018-04-12
1818
full_link: /docs/tasks/run-application/horizontal-pod-autoscale/
1919
short_description: >
20-
An API resource that automatically scales the number of pod replicas based on targeted CPU utilization or custom metric targets.
20+
Object that automatically scales the number of pod replicas based on targeted resource utilization or custom metric targets.
2121
2222
aka:
2323
- HPA
@@ -26,16 +26,18 @@ tags:
2626
-->
2727

2828
<!--
29-
An API resource that automatically scales the number of {{< glossary_tooltip term_id="pod" >}} replicas based on targeted CPU utilization or custom metric targets.
29+
An {{< glossary_tooltip text="object" term_id="object" >}} that automatically scales the number of {{< glossary_tooltip term_id="pod" >}} replicas,
30+
based on targeted {{< glossary_tooltip text="resource" term_id="infrastructure-resource" >}} utilization or custom metric targets.
3031
-->
31-
Pod 水平自动扩缩器(Horizontal Pod Autoscaler)是一种 API 资源,它根据目标 CPU 利用率或自定义度量目标扩缩 {{< glossary_tooltip term_id="pod" >}} 副本的数量。
32+
此{{< glossary_tooltip text="对象" term_id="object" >}}根据目标{{< glossary_tooltip text="资源" term_id="infrastructure-resource" >}}利用率或自定义度量目标自动扩缩
33+
{{< glossary_tooltip term_id="pod" >}} 副本的数量。
3234

3335
<!--more-->
3436

3537
<!--
36-
HPA is typically used with {{< glossary_tooltip text="ReplicationControllers" term_id="replication-controller" >}}, {{< glossary_tooltip text="Deployments" term_id="deployment" >}}, or {{< glossary_tooltip text="ReplicaSets" term_id="replica-set" >}}. It cannot be applied to objects that cannot be scaled, for example {{< glossary_tooltip text="DaemonSets" term_id="daemonset" >}}.
38+
HorizontalPodAutoscaler (HPA) is typically used with {{< glossary_tooltip text="Deployments" term_id="deployment" >}}, or {{< glossary_tooltip text="ReplicaSets" term_id="replica-set" >}}. It cannot be applied to objects that cannot be scaled, for example {{< glossary_tooltip text="DaemonSets" term_id="daemonset" >}}.
3739
-->
38-
HPA 通常用于 {{< glossary_tooltip text="ReplicationController" term_id="replication-controller" >}}
39-
{{< glossary_tooltip text="Deployment" term_id="deployment" >}}
40+
HorizontalPodAutoscaler (HPA) 通常用于
41+
{{< glossary_tooltip text="Deployment" term_id="deployment" >}}
4042
或者 {{< glossary_tooltip text="ReplicaSet" term_id="replica-set" >}} 上。
41-
HPA 不能用于不支持扩缩的对象,例如 {{< glossary_tooltip text="DaemonSets" term_id="daemonset" >}}。
43+
HPA 不能用于不支持扩缩的对象,例如 {{< glossary_tooltip text="DaemonSet" term_id="daemonset" >}}。

content/zh-cn/docs/reference/glossary/kube-scheduler.md

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ tags:
1111
- architecture
1212
- scheduler
1313
---
14-
1514
<!--
16-
---
1715
title: kube-scheduler
1816
id: kube-scheduler
1917
date: 2018-04-12
@@ -24,24 +22,27 @@ short_description: >
2422
aka:
2523
tags:
2624
- architecture
27-
---
2825
-->
2926

3027
<!--
3128
Control plane component that watches for newly created
3229
{{< glossary_tooltip term_id="pod" text="Pods" >}} with no assigned
3330
{{< glossary_tooltip term_id="node" text="node">}}, and selects a node for them
34-
to run on.-->
35-
36-
`kube-scheduler` 是{{< glossary_tooltip text="控制平面" term_id="control-plane" >}}的组件,
37-
负责监视新创建的、未指定运行{{< glossary_tooltip term_id="node" text="节点(node)">}}的 {{< glossary_tooltip term_id="pod" text="Pods" >}},
38-
并选择节点来让 Pod 在上面运行。
31+
to run on.
32+
-->
33+
`kube-scheduler` 是{{< glossary_tooltip text="控制平面" term_id="control-plane" >}}的组件,
34+
负责监视新创建的、未指定运行{{< glossary_tooltip term_id="node" text="节点">}}的
35+
{{< glossary_tooltip term_id="pod" text="Pod" >}},
36+
并选择节点来让 Pod 在上面运行。
3937

40-
<!--more-->
38+
<!--more-->
4139

4240
<!--
43-
Factors taken into account for scheduling decisions include individual and collective resource requirements, hardware/software/policy constraints, affinity and anti-affinity specifications, data locality, inter-workload interference and deadlines.
41+
Factors taken into account for scheduling decisions include:
42+
individual and collective {{< glossary_tooltip text="resource" term_id="infrastructure-resource" >}}
43+
requirements, hardware/software/policy constraints, affinity and anti-affinity specifications,
44+
data locality, inter-workload interference, and deadlines.
4445
-->
45-
46-
调度决策考虑的因素包括单个 Pod 及 Pods 集合的资源需求、软硬件及策略约束
47-
亲和性及反亲和性规范、数据位置、工作负载间的干扰及最后时限。
46+
调度决策考虑的因素包括单个 Pod 及多个 Pod
47+
集合的{{< glossary_tooltip text="资源" term_id="infrastructure-resource" >}}需求
48+
软硬件及策略约束、亲和性及反亲和性规范、数据位置、工作负载间的干扰及最后时限。

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,29 @@ aka:
1010
tags:
1111
- fundamental
1212
---
13-
1413
<!--
15-
---
1614
title: Name
1715
id: name
1816
date: 2018-04-12
19-
full_link: /docs/concepts/overview/working-with-objects/names/
17+
full_link: /docs/concepts/overview/working-with-objects/names
2018
short_description: >
2119
A client-provided string that refers to an object in a resource URL, such as `/api/v1/pods/some-name`.
2220
2321
aka:
2422
tags:
2523
- fundamental
26-
---
2724
-->
2825

2926
<!--
30-
A client-provided string that refers to an object in a resource URL, such as `/api/v1/pods/some-name`.
27+
A client-provided string that refers to an object in a {{< glossary_tooltip text="resource" term_id="api-resource" >}}
28+
URL, such as `/api/v1/pods/some-name`.
3129
-->
30+
客户端提供的字符串,引用{{< glossary_tooltip text="资源" term_id="api-resource" >}} URL
31+
中的对象,如 `/api/v1/pods/some-name`
3232

33-
客户端提供的字符串,引用资源 URL 中的对象,如`/api/v1/pods/some name`
34-
35-
<!--more-->
33+
<!--more-->
3634

3735
<!--
3836
Only one object of a given kind can have a given name at a time. However, if you delete the object, you can make a new object with the same name.
3937
-->
40-
4138
某一时刻,只能有一个给定类型的对象具有给定的名称。但是,如果删除该对象,则可以创建同名的新对象。

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

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,36 +10,33 @@ aka:
1010
tags:
1111
- fundamental
1212
---
13-
1413
<!--
15-
---
1614
title: Namespace
1715
id: namespace
1816
date: 2018-04-12
19-
full_link: /docs/concepts/overview/working-with-objects/namespaces/
17+
full_link: /docs/concepts/overview/working-with-objects/namespaces
2018
short_description: >
2119
An abstraction used by Kubernetes to support isolation of groups of resources within a single cluster.
2220
2321
aka:
2422
tags:
2523
- fundamental
26-
---
2724
-->
2825

2926
<!--
30-
An abstraction used by Kubernetes to support isolation of groups of resources within a single {{< glossary_tooltip text="cluster" term_id="cluster" >}}.
27+
An abstraction used by Kubernetes to support isolation of groups of {{< glossary_tooltip text="API resources" term_id="api-resource" >}}
28+
within a single {{< glossary_tooltip text="cluster" term_id="cluster" >}}.
3129
-->
30+
名字空间是 Kubernetes 用来支持隔离单个{{< glossary_tooltip text="集群" term_id="cluster" >}}中的
31+
{{< glossary_tooltip text="API 资源" term_id="api-resource" >}}组的一种抽象。
3232

33-
名字空间是 Kubernetes 用来支持隔离单个 {{< glossary_tooltip text="集群" term_id="cluster" >}}中的资源组的一种抽象。
34-
35-
<!--more-->
33+
<!--more-->
3634

3735
<!--
38-
Namespaces are used to organize objects in a cluster and provide a way to divide cluster resources. Names of resources need to be unique within a namespace, but not across namespaces. Namespace-based scoping is applicable only for namespaced objects _(e.g. Deployments, Services, etc)_ and not for cluster-wide objects _(e.g. StorageClass, Nodes, PersistentVolumes, etc)_.
36+
Namespaces are used to organize objects in a cluster and provide a way to divide cluster resources. Names of resources need to be unique within a namespace, but not across namespaces. Namespace-based scoping is applicable only for namespaced resources _(for example: Pods, Deployments, Services)_ and not for cluster-wide resources _(for example: StorageClasses, Nodes, PersistentVolumes)_.
3937
-->
40-
4138
名字空间用来组织集群中对象,并为集群资源划分提供了一种方法。
4239
同一名字空间内的资源名称必须唯一,但跨名字空间时不作要求。
43-
基于名字空间的作用域限定仅适用于名字空间作用域的对象(例如 Deployment、Services 等),
40+
基于名字空间的作用域限定仅适用于名字空间作用域的对象(例如 Pod、Deployment、Service 等),
4441
而不适用于集群作用域的对象(例如 StorageClass、Node、PersistentVolume 等)。
4542
在一些文档里名字空间也称为命名空间。

content/zh-cn/docs/reference/glossary/network-policy.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ tags:
1313
- extension
1414
- core-object
1515
---
16-
1716
<!--
18-
---
1917
title: Network Policy
2018
id: network-policy
2119
date: 2018-04-12
@@ -29,16 +27,14 @@ tags:
2927
- architecture
3028
- extension
3129
- core-object
32-
---
3330
-->
3431

3532
<!--
3633
A specification of how groups of Pods are allowed to communicate with each other and with other network endpoints.
3734
-->
38-
3935
网络策略是一种规范,规定了允许 Pod 组之间、Pod 与其他网络端点之间以怎样的方式进行通信。
4036

41-
<!--more-->
37+
<!--more-->
4238

4339
<!--
4440
NetworkPolicies help you declaratively configure which Pods are allowed to connect to each other, which namespaces are allowed to communicate,
@@ -48,7 +44,6 @@ to select Pods and define rules which specify what traffic is allowed to the sel
4844
NetworkPolicies are implemented by a supported network plugin provided by a network provider.
4945
Be aware that creating a NetworkPolicy object without a controller to implement it will have no effect.
5046
-->
51-
5247
网络策略帮助你声明式地配置允许哪些 Pod 之间、哪些命名空间之间允许进行通信,
5348
并具体配置了哪些端口号来执行各个策略。`NetworkPolicy`
5449
资源使用{{< glossary_tooltip text="标签" term_id="label" >}}来选择 Pod,

content/zh-cn/docs/reference/glossary/node-pressure-eviction.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,17 @@ tags:
1111
- operation
1212
---
1313
<!--
14-
---
1514
title: Node-pressure eviction
1615
id: node-pressure-eviction
1716
date: 2021-05-13
1817
full_link: /docs/concepts/scheduling-eviction/node-pressure-eviction/
1918
short_description: >
2019
Node-pressure eviction is the process by which the kubelet proactively fails
21-
pods to reclaim {{< glossary_tooltip text="resource" term_id="infrastructure-resource" >}}
22-
on nodes.
20+
pods to reclaim resources on nodes.
2321
aka:
2422
- kubelet eviction
2523
tags:
2624
- operation
27-
---
2825
-->
2926

3027
<!--
@@ -48,4 +45,4 @@ kubelet 可以主动使节点上的一个或多个 Pod 失效,以回收资源
4845
<!--
4946
Node-pressure eviction is not the same as [API-initiated eviction](/docs/concepts/scheduling-eviction/api-eviction/).
5047
-->
51-
节点压力驱逐不用于 [API 发起的驱逐](/zh-cn/docs/concepts/scheduling-eviction/api-eviction/)
48+
节点压力驱逐不同于 [API 发起的驱逐](/zh-cn/docs/concepts/scheduling-eviction/api-eviction/)

0 commit comments

Comments
 (0)