Skip to content

Commit ba257fd

Browse files
authored
Merge pull request #36263 from ydFu/update-reference-glossary-1
[zh] Update reference\glossary (1)
2 parents da149db + ff52e83 commit ba257fd

File tree

5 files changed

+16
-37
lines changed

5 files changed

+16
-37
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ tags:
1111
- tool
1212
---
1313
<!--
14-
---
1514
title: Add-ons
1615
id: addons
1716
date: 2019-12-15
@@ -22,16 +21,13 @@ short_description: >
2221
aka:
2322
tags:
2423
- tool
25-
---
2624
-->
2725

28-
2926
<!--
3027
Resources that extend the functionality of Kubernetes.
3128
-->
3229
扩展 Kubernetes 功能的资源。
3330

34-
3531
<!--more-->
3632

3733
<!--

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

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@ id: admission-controller
44
date: 2019-06-28
55
full_link: /zh-cn/docs/reference/access-authn-authz/admission-controllers/
66
short_description: >
7-
在对象持久化之前拦截 Kubernetes Api 服务器请求的一段代码
7+
在对象持久化之前拦截 Kubernetes API 服务器请求的一段代码
88
aka:
99
tags:
1010
- extension
1111
- security
1212
---
1313

14-
1514
<!--
16-
---
1715
title: Admission Controller
1816
id: admission-controller
1917
date: 2019-06-28
@@ -24,27 +22,25 @@ short_description: >
2422
aka:
2523
tags:
2624
- extension
27-
- security
28-
---
25+
- security
2926
-->
3027

31-
3228
<!--
3329
A piece of code that intercepts requests to the Kubernetes API server prior to persistence of the object.
3430
-->
35-
在对象持久化之前拦截 Kubernetes Api 服务器请求的一段代码
31+
在对象持久化之前拦截 Kubernetes API 服务器请求的一段代码
3632

3733
<!--more-->
3834

3935
<!--
40-
Admission controllers are configurable for the Kubernetes API server and may be validating”, “mutating, or
36+
Admission controllers are configurable for the Kubernetes API server and may be "validating", "mutating", or
4137
both. Any admission controller may reject the request. Mutating controllers may modify the objects they admit;
4238
validating controllers may not.
4339
4440
* [Admission controllers in the Kubernetes documentation](/docs/reference/access-authn-authz/admission-controllers/)
4541
-->
42+
准入控制器可针对 Kubernetes API 服务器进行配置,可以执行“验证(validating)“、“变更(mutating)“或两者都执行。
43+
任何准入控制器都可以拒绝访问请求。
44+
变更控制器可以修改其允许的对象,验证控制器则不可以。
4645

47-
准入控制器可针对 Kubernetes Api 服务器进行配置,可以执行验证,变更或两者都执行。任何准入控制器都可以拒绝访问请求。
48-
变更(mutating)控制器可以修改其允许的对象,验证(validating)控制器则不可以。
49-
50-
* [Kubernetes 文档中的准入控制器](/zh-cn/docs/reference/access-authn-authz/admission-controllers/)
46+
* [Kubernetes 文档中的准入控制器](/zh-cn/docs/reference/access-authn-authz/admission-controllers/)

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ id: affinity
44
date: 2019-01-11
55
full_link: /zh-cn/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity
66
short_description: >
7-
调度程序用于确定在何处放置 Pods(亲和性)的规则
7+
调度程序用于确定在何处放置 Pod(亲和性)的规则
88
aka:
99
tags:
1010
- fundamental
@@ -26,12 +26,15 @@ tags:
2626
<!--
2727
In Kubernetes, _affinity_ is a set of rules that give hints to the scheduler about where to place pods.
2828
-->
29-
在 Kubernetes 中,_亲和性(affinity)_是一组规则,它们为调度程序提供在何处放置 Pods 提示信息。
29+
在 Kubernetes 中 **亲和性(affinity)** 是一组规则,它们为调度程序提供在何处放置 Pod 提示信息。
30+
3031
<!--more-->
32+
3133
<!--
3234
There are two kinds of affinity:
3335
-->
3436
亲和性有两种:
37+
3538
<!--
3639
* [node affinity](/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity)
3740
* [pod-to-pod affinity](/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity)
@@ -45,6 +48,6 @@ and {{< glossary_tooltip term_id="selector" text="selectors">}} specified in {{<
4548
and they can be either required or preferred, depending on how strictly you want the scheduler to enforce them.
4649
-->
4750
这些规则是使用 Kubernetes {{< glossary_tooltip term_id="label" text="标签">}}(label)
48-
和 {{< glossary_tooltip term_id="pod" text="pods" >}} 中指定的
51+
和 {{< glossary_tooltip term_id="pod" text="Pod" >}} 中指定的
4952
{{< glossary_tooltip term_id="selector" text="选择算符">}}定义的,
5053
这些规则可以是必需的或首选的,这取决于你希望调度程序执行它们的严格程度。

content/zh-cn/docs/reference/glossary/aggregation-layer.md

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ tags:
1313
- operation
1414
---
1515
<!--
16-
---
1716
title: Aggregation Layer
1817
id: aggregation-layer
1918
date: 2018-10-08
@@ -26,24 +25,17 @@ tags:
2625
- architecture
2726
- extension
2827
- operation
29-
---
3028
-->
3129

32-
33-
34-
3530
<!--
3631
The aggregation layer lets you install additional Kubernetes-style APIs in your cluster.
3732
-->
38-
3933
聚合层允许你在自己的集群上安装额外的 Kubernetes 风格的 API。
4034

4135
<!--more-->
42-
4336

4437
<!--
4538
When you've configured the {{< glossary_tooltip text="Kubernetes API Server" term_id="kube-apiserver" >}} to [support additional APIs](/docs/tasks/extend-kubernetes/configure-aggregation-layer/), you can add `APIService` objects to "claim" a URL path in the Kubernetes API.
4639
-->
47-
48-
当你配置了 {{< glossary_tooltip text="Kubernetes API Server" term_id="kube-apiserver" >}} 来 [支持额外的 API](/zh-cn/docs/tasks/extend-kubernetes/configure-aggregation-layer/)
49-
你就可以在 Kubernetes API 中增加 `APIService` 对象来 "申领(Claim)" 一个 URL 路径。
40+
当你配置了 {{< glossary_tooltip text="Kubernetes API 服务器" term_id="kube-apiserver" >}} 来 [支持额外的 API](/zh-cn/docs/tasks/extend-kubernetes/configure-aggregation-layer/)
41+
你就可以在 Kubernetes API 中增加 `APIService` 对象来"申领(Claim)"一个 URL 路径。

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ aka:
1010
tags:
1111
- fundamental
1212
---
13-
1413
<!--
15-
---
1614
title: Annotation
1715
id: annotation
1816
date: 2018-04-12
@@ -23,24 +21,18 @@ short_description: >
2321
aka:
2422
tags:
2523
- fundamental
26-
---
2724
-->
2825

29-
30-
3126
<!--
3227
A key-value pair that is used to attach arbitrary non-identifying metadata to objects.
3328
-->
34-
3529
注解是以键值对的形式给资源对象附加随机的无法标识的元数据。
3630

3731
<!--more-->
3832

3933
<!--
4034
The metadata in an annotation can be small or large, structured or unstructured, and can include characters not permitted by {{< glossary_tooltip text="labels" term_id="label" >}}. Clients such as tools and libraries can retrieve this metadata.
4135
-->
42-
4336
注解中的元数据可大可小,可以是结构化的也可以是非结构化的,
4437
并且能包含{{< glossary_tooltip text="标签" term_id="label" >}}不允许使用的字符。
4538
像工具和软件库这样的客户端可以检索这些元数据。
46-

0 commit comments

Comments
 (0)