Skip to content

Commit 65ee812

Browse files
committed
Fix tools/kubeadm/high-availablility.md display format
1 parent 501daa2 commit 65ee812

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

content/zh/docs/setup/production-environment/tools/kubeadm/high-availability.md

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,11 @@ For the external etcd cluster only, you also need:
102102

103103
### 为 kube-apiserver 创建负载均衡器
104104

105-
{{< note >}}
106105
<!--
107106
There are many configurations for load balancers. The following example is only one
108107
option. Your cluster requirements may need a different configuration.
109108
-->
109+
{{< note >}}
110110
使用负载均衡器需要许多配置。你的集群搭建可能需要不同的配置。
111111
下面的例子只是其中的一方面配置。
112112
{{< /note >}}
@@ -212,24 +212,24 @@ option. Your cluster requirements may need a different configuration.
212212
如果正好相反,你更喜欢手动地通过控制平面节点或者使用自动化
213213
工具复制证书,请删除此标志并参考如下部分[证书分配手册](#manual-certs)。
214214

215-
{{< note >}}
216215
<!--
217216
The `kubeadm init` flags `--config` and `--certificate-key` cannot be mixed, therefore if you want
218217
to use the [kubeadm configuration](/docs/reference/config-api/kubeadm-config.v1beta3/) you must add the `certificateKey` field in the appropriate config locations (under `InitConfiguration` and `JoinConfiguration: controlPlane`).
219218
-->
219+
{{< note >}}
220220
标志 `kubeadm init``--config``--certificate-key` 不能混合使用,
221221
因此如果你要使用
222222
[kubeadm 配置](/docs/reference/config-api/kubeadm-config.v1beta3/),你必须在相应的配置文件
223223
(位于 `InitConfiguration``JoinConfiguration: controlPlane`)添加 `certificateKey` 字段。
224224
{{< /note >}}
225225

226-
{{< note >}}
227226
<!--
228227
Some CNI network plugins like Calico require a CIDR such as `192.168.0.0/16` and
229228
some like Weave do not. See the [CNI network documentation](/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm/#pod-network).
230229
To add a pod CIDR pass the flag `--pod-network-cidr`, or if you are using a kubeadm configuration file
231230
set the `podSubnet` field under the `networking` object of `ClusterConfiguration`.
232231
-->
232+
{{< note >}}
233233
一些 CNI 网络插件如 Calico 需要 CIDR 例如 `192.168.0.0/16` 和一些像 Weave 没有。参考
234234
[CNI 网络文档](/zh/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm/#pod-network)。
235235
通过传递 `--pod-network-cidr` 标志添加 pod CIDR,或者你可以使用 kubeadm
@@ -278,18 +278,17 @@ option. Your cluster requirements may need a different configuration.
278278
```shell
279279
kubeadm certs certificate-key
280280
```
281-
282-
{{< note >}}
283281
<!--
284282
The `kubeadm-certs` Secret and decryption key expire after two hours.
285283
-->
284+
{{< note >}}
286285
`kubeadm-certs` 密钥和解密密钥会在两个小时后失效。
287286
{{< /note >}}
288287

289-
{{< caution >}}
290288
<!--
291289
As stated in the command output, the certificate key gives access to cluster sensitive data, keep it secret!
292290
-->
291+
{{< caution >}}
293292
正如命令输出中所述,证书密钥可访问群集敏感数据。请妥善保管!
294293
{{< /caution >}}
295294

@@ -324,12 +323,12 @@ option. Your cluster requirements may need a different configuration.
324323
-->
325324
### 其余控制平面节点的步骤
326325

327-
{{< note >}}
328326
<!--
329327
Since kubeadm version 1.15 you can join multiple control-plane nodes in parallel.
330328
Prior to this version, you must join new control plane nodes sequentially, only after
331329
the first node has finished initializing.
332330
-->
331+
{{< note >}}
333332
从 kubeadm 1.15 版本开始,你可以并行加入多个控制平面节点。
334333
在此版本之前,你必须在第一个节点初始化后才能依序的增加新的控制平面节点。
335334
{{< /note >}}
@@ -451,13 +450,12 @@ in the kubeadm config file.
451450
certFile: /etc/kubernetes/pki/apiserver-etcd-client.crt
452451
keyFile: /etc/kubernetes/pki/apiserver-etcd-client.key
453452
```
454-
455-
{{< note >}}
456453
<!--
457454
The difference between stacked etcd and external etcd here is that the external etcd setup requires
458455
a configuration file with the etcd endpoints under the `external` object for `etcd`.
459456
In the case of the stacked etcd topology this is managed automatically.
460457
-->
458+
{{< note >}}
461459
这里的内部(stacked) etcd 和外部 etcd 之前的区别在于设置外部 etcd
462460
需要一个 `etcd``external` 对象下带有 etcd 端点的配置文件。
463461
如果是内部 etcd,是自动管理的。
@@ -627,13 +625,12 @@ SSH is required if you want to control all nodes from a single machine.
627625
scp /etc/kubernetes/pki/etcd/ca.key "${USER}"@$host:etcd-ca.key
628626
done
629627
```
630-
631-
{{< caution >}}
632628
<!--
633629
Copy only the certificates in the above list. kubeadm will take care of generating the rest of the certificates
634630
with the required SANs for the joining control-plane instances. If you copy all the certificates by mistake,
635631
the creation of additional nodes could fail due to a lack of required SANs.
636632
-->
633+
{{< caution >}}
637634
只需要复制上面列表中的证书。kubeadm 将负责生成其余证书以及加入控制平面实例所需的 SAN。
638635
如果你错误地复制了所有证书,由于缺少所需的 SAN,创建其他节点可能会失败。
639636
{{< /caution >}}

0 commit comments

Comments
 (0)