Skip to content

Commit 5315031

Browse files
committed
[zh-cn]sync kubeadm-init api-concepts
Signed-off-by: xin.li <[email protected]>
1 parent 0002f69 commit 5315031

File tree

2 files changed

+55
-47
lines changed

2 files changed

+55
-47
lines changed

content/zh-cn/docs/reference/setup-tools/kubeadm/kubeadm-init.md

Lines changed: 41 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@ following steps:
5656
APIServer 证书将为任何 `--apiserver-cert-extra-sans` 参数值提供附加的 SAN 条目,必要时将其小写。
5757

5858
<!--
59-
1. Writes kubeconfig files in `/etc/kubernetes/` for
60-
the kubelet, the controller-manager and the scheduler to use to connect to the
61-
API server, each with its own identity, as well as an additional
62-
kubeconfig file for administration named `admin.conf`.
59+
1. Writes kubeconfig files in `/etc/kubernetes/` for the kubelet, the controller-manager and the
60+
scheduler to use to connect to the API server, each with its own identity. Also
61+
additional kubeconfig files are written, for kubeadm as administrative entity (`admin.conf`)
62+
and for a super admin user that can bypass RBAC (`super-admin.conf`).
6363
-->
6464
3. 将 kubeconfig 文件写入 `/etc/kubernetes/` 目录以便 kubelet、控制器管理器和调度器用来连接到
65-
API 服务器,它们每一个都有自己的身份标识,同时生成一个名为 `admin.conf` 的独立的 kubeconfig
66-
文件,用于管理操作
65+
API 服务器,它们每一个都有自己的身份标识。再编写额外的 kubeconfig 文件,将 kubeadm
66+
作为管理实体(`admin.conf`)和可以绕过 RBAC 的超级管理员用户(`super-admin.conf`
6767

6868
<!--
6969
1. Generates static Pod manifests for the API server,
@@ -303,17 +303,17 @@ List of feature gates:
303303
{{< table caption="kubeadm feature gates" >}}
304304
Feature | Default | Alpha | Beta | GA
305305
:-------|:--------|:------|:-----|:----
306+
`EtcdLearnerMode` | `true` | 1.27 | 1.29 | -
306307
`PublicKeysECDSA` | `false` | 1.19 | - | -
307308
`RootlessControlPlane` | `false` | 1.22 | - | -
308-
`EtcdLearnerMode` | `false` | 1.27 | - | -
309309
{{< /table >}}
310310
-->
311311
{{< table caption="kubeadm 特性门控" >}}
312312
特性 | 默认值 | Alpha | Beta | GA
313313
:-------|:--------|:------|:-----|:----
314+
`EtcdLearnerMode` | `true` | 1.27 | 1.29 | -
314315
`PublicKeysECDSA` | `false` | 1.19 | - | -
315316
`RootlessControlPlane` | `false` | 1.22 | - | -
316-
`EtcdLearnerMode` | `false` | 1.27 | - | -
317317
{{< /table >}}
318318

319319
{{< note >}}
@@ -328,6 +328,15 @@ Feature gate descriptions:
328328
-->
329329
特性门控的描述:
330330

331+
<!--
332+
`EtcdLearnerMode`
333+
: With this feature gate enabled, when joining a new control plane node, a new etcd member will be created
334+
as a learner and promoted to a voting member only after the etcd data are fully aligned.
335+
-->
336+
`EtcdLearnerMode`
337+
: 启用此特性门控后,当加入新的控制平面节点时,将创建一个新的 etcd
338+
成员作为学习者(learner),并仅在 etcd 数据完全对齐后进级为投票成员(voting member)。
339+
331340
<!--
332341
`PublicKeysECDSA`
333342
: Can be used to create a cluster that uses ECDSA certificates instead of the default RSA algorithm.
@@ -352,29 +361,20 @@ you upgrade to a newer version of Kubernetes.
352361
以非 root 用户身份运行。如果未设置该标志,则这些组件以 root 身份运行。
353362
你可以在升级到更新版本的 Kubernetes 之前更改此特性门控的值。
354363

355-
<!--
356-
`EtcdLearnerMode`
357-
: With this feature gate enabled, when joining a new control plane node, a new etcd member will be created
358-
as a learner and promoted to a voting member only after the etcd data are fully aligned.
359-
-->
360-
`EtcdLearnerMode`
361-
: 启用此特性门控后,当加入新的控制平面节点时,将创建一个新的 etcd
362-
成员作为学习者(learner),并仅在 etcd 数据完全对齐后进级为投票成员(voting member)。
363-
364364
<!--
365365
List of deprecated feature gates:
366366
-->
367367
已弃用特性门控的列表:
368368

369369
<!--
370370
{{< table caption="kubeadm deprecated feature gates" >}}
371-
Feature | Default
371+
Feature | Default
372372
:-------|:--------
373373
`UpgradeAddonsBeforeControlPlane` | `false`
374374
{{< /table >}}
375375
-->
376376
{{< table caption="kubeadm 弃用的特性门控" >}}
377-
特性 | 默认值
377+
特性 | 默认值
378378
:-------|:--------
379379
`UpgradeAddonsBeforeControlPlane` | `false`
380380
{{< /table >}}
@@ -429,17 +429,31 @@ List of removed feature gates:
429429
{{< table caption="kubeadm removed feature gates" >}}
430430
Feature | Alpha | Beta | GA | Removed
431431
:-------|:------|:-----|:---|:-------
432-
`UnversionedKubeletConfigMap` | 1.22 | 1.23 | 1.25 | 1.26
433432
`IPv6DualStack` | 1.16 | 1.21 | 1.23 | 1.24
433+
`UnversionedKubeletConfigMap` | 1.22 | 1.23 | 1.25 | 1.26
434434
{{< /table >}}
435435
-->
436436
{{< table caption="kubeadm 已移除的特性门控" >}}
437437
特性 | Alpha | Beta | GA | 移除
438438
:-------|:------|:-----|:---|:-------
439-
`UnversionedKubeletConfigMap` | 1.22 | 1.23 | 1.25 | 1.26
440439
`IPv6DualStack` | 1.16 | 1.21 | 1.23 | 1.24
440+
`UnversionedKubeletConfigMap` | 1.22 | 1.23 | 1.25 | 1.26
441441
{{< /table >}}
442442

443+
<!--
444+
Feature gate descriptions:
445+
-->
446+
特性门控的描述:
447+
448+
<!--
449+
`IPv6DualStack`
450+
: This flag helps to configure components dual stack when the feature is in progress. For more details on Kubernetes
451+
dual-stack support see [Dual-stack support with kubeadm](/docs/setup/production-environment/tools/kubeadm/dual-stack-support/).
452+
-->
453+
`IPv6DualStack`
454+
: 在 IP 双栈特性处于开发过程中时,此标志有助于配置组件的双栈支持。有关 Kubernetes
455+
双栈支持的更多详细信息,请参阅 [kubeadm 的双栈支持](/zh-cn/docs/setup/production-environment/tools/kubeadm/dual-stack-support/)
456+
443457
<!--
444458
`UnversionedKubeletConfigMap`
445459
: This flag controls the name of the {{< glossary_tooltip text="ConfigMap" term_id="configmap" >}} where kubeadm stores
@@ -463,15 +477,6 @@ if that does not succeed, kubeadm falls back to using the legacy (versioned) nam
463477
kubeadm 尝试首先使用无版本(后缀)的 ConfigMap 名称;
464478
如果不成功,kubeadm 将回退到使用该 ConfigMap 的旧(带版本号的)名称。
465479

466-
<!--
467-
`IPv6DualStack`
468-
: This flag helps to configure components dual stack when the feature is in progress. For more details on Kubernetes
469-
dual-stack support see [Dual-stack support with kubeadm](/docs/setup/production-environment/tools/kubeadm/dual-stack-support/).
470-
-->
471-
`IPv6DualStack`
472-
: 当前此特性正在推进时,此标志有助于配置组件的 IP 双栈。有关 Kubernetes
473-
双栈支持的更多详细信息,请参阅 [kubeadm 的双栈支持](/zh-cn/docs/setup/production-environment/tools/kubeadm/dual-stack-support/)
474-
475480
<!--
476481
### Adding kube-proxy parameters {#kube-proxy}
477482
@@ -771,12 +776,16 @@ DNS name or an address of a load balancer.
771776
```
772777

773778
<!--
774-
Once the cluster is up, you can grab the admin credentials from the control-plane node
775-
at `/etc/kubernetes/admin.conf` and use that to talk to the cluster.
779+
Once the cluster is up, you can use the `/etc/kubernetes/admin.conf` file from
780+
a control-plane node to talk to the cluster with administrator credentials or
781+
[Generating kubeconfig files for additional users](/docs/tasks/administer-cluster/kubeadm/kubeadm-certs#kubeconfig-additional-users).
776782
-->
777783
一旦集群启动起来,你就可以从控制平面节点的 `/etc/kubernetes/admin.conf` 文件获取管理凭证,
778784
并使用这个凭证同集群通信。
779785

786+
一旦集群启动起来,你就可以从控制平面节点中的 `/etc/kubernetes/admin.conf`
787+
文件获取管理凭证或通过[为其他用户生成的 kubeconfig 文件](/zh-cn/docs/tasks/administer-cluster/kubeadm/kubeadm-certs#kubeconfig-additional-users)与集群通信。
788+
780789
<!--
781790
Note that this style of bootstrap has some relaxed security guarantees because
782791
it does not allow the root CA hash to be validated with

content/zh-cn/docs/reference/using-api/api-concepts.md

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ For example:
289289
_test_ namespace. Each change notification is a JSON document. The HTTP response body
290290
(served as `application/json`) consists a series of JSON documents.
291291
-->
292-
2. 从资源版本 10245 开始,接收影响 _test_ 名字空间中 Pod 的所有 API 操作
292+
2. 从资源版本 10245 开始,接收影响 **test** 名字空间中 Pod 的所有 API 操作
293293
(例如 **create****delete****patch****update**)的通知。
294294
每个更改通知都是一个 JSON 文档。
295295
HTTP 响应正文(用作 `application/json`)由一系列 JSON 文档组成。
@@ -443,7 +443,7 @@ _consistent read_ by setting empty resource version using `resourceVersion=`) co
443443
in the following sequence of events:
444444
-->
445445
举个例子:你想监视一组 Pod。对于该集合,当前资源版本为 10245,并且有两个 Pod:`foo``bar`
446-
接下来你发送了以下请求(通过使用 `resourceVersion=` 设置空的资源版本来明确请求 **一致性读**),
446+
接下来你发送了以下请求(通过使用 `resourceVersion=` 设置空的资源版本来明确请求**一致性读**),
447447
这样做的结果是可能收到如下事件序列:
448448

449449
```
@@ -524,7 +524,7 @@ The `content-encoding` header indicates that the response is compressed with `gz
524524
-->
525525
## 分块检视大体量结果 {#retrieving-large-results-sets-in-chunks}
526526

527-
{{< feature-state for_k8s_version="v1.9" state="beta" >}}
527+
{{< feature-state for_k8s_version="v1.29" state="stable" >}}
528528

529529
<!--
530530
On large clusters, retrieving the collection of some resource types may result in
@@ -538,15 +538,14 @@ response (10-20MB) and consume a large amount of server resources.
538538
跨所有名字空间检索所有 Pod 可能会导致非常大的响应 (10-20MB) 并消耗大量服务器资源。
539539

540540
<!--
541-
Provided that you don't explicitly disable the `APIListChunking`
542-
[feature gate](/docs/reference/command-line-tools-reference/feature-gates/), the
543-
Kubernetes API server supports the ability to break a single large collection request
541+
The Kubernetes API server supports the ability to break a single large collection request
544542
into many smaller chunks while preserving the consistency of the total request. Each
545543
chunk can be returned sequentially which reduces both the total size of the request and
546544
allows user-oriented clients to display results incrementally to improve responsiveness.
547545
-->
548-
如果你没有明确禁用 `APIListChunking` [特性门控](/zh-cn/docs/reference/command-line-tools-reference/feature-gates/)
549-
Kubernetes API 服务器支持将单个大型集合请求分解为许多较小块的能力,同时保持总请求的一致性。
546+
Kubernetes API 服务器支持将单个大型集合请求分解为许多较小块的能力,
547+
同时保持总体请求的一致性。每个块都可以按顺序返回,这既减少了请求的总大小,
548+
又允许面向用户的客户端增量显示结果以提高响应能力。
550549

551550
<!--
552551
You can request that the API server handles a **list** by serving single collection
@@ -572,7 +571,7 @@ continuing until the server returns an empty `continue` value, you can retrieve
572571
entire collection.
573572
-->
574573
作为 API 客户端,你可以在下一次请求时将 `continue` 值传递给 API 服务器,
575-
以指示服务器返回下一页(__)结果。继续下去直到服务器返回一个空的 `continue` 值,
574+
以指示服务器返回下一页(****)结果。继续下去直到服务器返回一个空的 `continue` 值,
576575
你可以检索整个集合。
577576

578577
<!--
@@ -1128,14 +1127,14 @@ When you **delete** a resource this takes place in two phases.
11281127
"kind": "ConfigMap",
11291128
"apiVersion": "v1",
11301129
"metadata": {
1131-
"finalizers": {"url.io/neat-finalization", "other-url.io/my-finalizer"},
1130+
"finalizers": ["url.io/neat-finalization", "other-url.io/my-finalizer"],
11321131
"deletionTimestamp": nil,
11331132
}
11341133
}
11351134
```
11361135

11371136
<!--
1138-
When a client first sends a **delete** to request removal of a resource, the `.metadata.deletionTimestamp` is set to the current time.
1137+
When a client first sends a **delete** to request the removal of a resource, the `.metadata.deletionTimestamp` is set to the current time.
11391138
Once the `.metadata.deletionTimestamp` is set, external controllers that act on finalizers
11401139
may start performing their cleanup work at any time, in any order.
11411140
@@ -1157,7 +1156,7 @@ Once the last finalizer is removed, the resource is actually removed from etcd.
11571156
一旦设置了 `.metadata.deletionTimestamp`
11581157
作用于终结器的外部控制器可以在任何时间以任何顺序开始执行它们的清理工作。
11591158

1160-
终结器之间 **不存在** 强制的执行顺序,因为这会带来卡住 `.metadata.finalizers` 的重大风险。
1159+
终结器之间**不存在**强制的执行顺序,因为这会带来卡住 `.metadata.finalizers` 的重大风险。
11611160

11621161
`.metadata.finalizers` 字段是共享的:任何有权限的参与者都可以重新排序。
11631162
如果终结器列表是按顺序处理的,那么这可能会导致这样一种情况:
@@ -1220,7 +1219,7 @@ By default, the API server drops fields that it does not recognize
12201219
from an input that it receives (for example, the JSON body of a `PUT` request).
12211220
-->
12221221
默认情况下,如果接收到的输入信息中含有 API 服务器无法识别的字段,API 服务器会丢弃该字段
1223-
(例如: `PUT` 请求中的 JSON 主体)。
1222+
(例如:`PUT` 请求中的 JSON 主体)。
12241223

12251224
<!--
12261225
There are two situations where the API server drops fields that you supplied in
@@ -1658,7 +1657,7 @@ but has drawbacks:
16581657

16591658
#### HTTP PUT 替换现有资源 {#update-mechanism-update}
16601659

1661-
**update** (HTTP `PUT`) 操作实现简单且灵活,但也存在一些缺点:
1660+
**update**HTTP `PUT`操作实现简单且灵活,但也存在一些缺点:
16621661

16631662
<!--
16641663
* You need to handle conflicts where the `resourceVersion` of the object changes
@@ -1999,7 +1998,7 @@ Continue Token, Exact
19991998

20001999
从 token 开始、精确匹配
20012000
: 返回初始分页 **list** 调用的资源版本的数据。
2002-
返回的 _Continue 令牌_ 负责跟踪最初提供的资源版本,最初提供的资源版本用于在初始分页 **list** 之后的所有分页 **list** 中。
2001+
返回的 **Continue 令牌**负责跟踪最初提供的资源版本,最初提供的资源版本用于在初始分页 **list** 之后的所有分页 **list** 中。
20032002

20042003

20052004
{{< note >}}

0 commit comments

Comments
 (0)