Skip to content

Commit 2e834df

Browse files
authored
Merge pull request #23730 from tengqm/zh-links-setup-3
[zh] fix links in setup section (3)
2 parents c901c84 + e592fc1 commit 2e834df

File tree

5 files changed

+234
-222
lines changed

5 files changed

+234
-222
lines changed

content/zh/docs/setup/production-environment/on-premises-vm/ovirt.md

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@ title: oVirt
33
content_type: concept
44
---
55
<!--
6-
---
76
reviewers:
87
- caesarxuchao
98
- erictune
109
title: oVirt
1110
content_type: concept
12-
---
1311
-->
1412

1513
<!-- overview -->
@@ -20,52 +18,44 @@ oVirt is a virtual datacenter manager that delivers powerful management of multi
2018
oVirt 是一个虚拟数据中心管理器,可以对多个主机上的多个虚拟机进行强大的管理。
2119
使用 KVM 和 libvirt ,可以将 oVirt 安装在 Fedora、CentOS 或者 Red Hat Enterprise Linux 主机上,以部署和管理您的虚拟数据中心。
2220

23-
24-
2521
<!-- body -->
2622

2723
<!--
2824
## oVirt Cloud Provider Deployment
29-
-->
30-
## oVirt 云驱动的部署
3125
32-
<!--
3326
The oVirt cloud provider allows to easily discover and automatically add new VM instances as nodes to your Kubernetes cluster.
3427
At the moment there are no community-supported or pre-loaded VM images including Kubernetes but it is possible to [import] or [install] Project Atomic (or Fedora) in a VM to [generate a template]. Any other distribution that includes Kubernetes may work as well.
3528
-->
29+
## oVirt 云驱动的部署
30+
3631
oVirt 云驱动可以轻松发现新 VM 实例并自动将其添加为 Kubernetes 集群的节点。
37-
目前,包括 Kubernetes 在内,尚无社区支持或预加载的 VM 镜像,但可以在 VM 中 [导入][安装] Project Atomic(或 Fedora)来 [生成模版]
32+
目前,包括 Kubernetes 在内,尚无社区支持或预加载的 VM 镜像,但可以在 VM 中
33+
[导入](https://ovedou.blogspot.it/2014/03/importing-glance-images-as-ovirt.html)
34+
[安装](https://www.ovirt.org/documentation/quickstart/quickstart-guide/#create-virtual-machines)
35+
Project Atomic(或 Fedora)来
36+
[生成模版](https://www.ovirt.org/documentation/quickstart/quickstart-guide/#using-templates)
3837
包括 Kubernetes 的任何其他 Linux 发行版也可能可行。
3938

4039
<!--
4140
It is mandatory to [install the ovirt-guest-agent] in the guests for the VM ip address and hostname to be reported to ovirt-engine and ultimately to Kubernetes.
4241
-->
43-
必须在寄宿系统中 [安装 ovirt-guest-agent],才能将 VM 的 IP 地址和主机名报给 ovirt-engine 并最终报告给 Kubernetes。
42+
必须在寄宿系统中
43+
[安装 ovirt-guest-agent](https://www.ovirt.org/documentation/how-to/guest-agent/install-the-guest-agent-in-fedora/)
44+
才能将 VM 的 IP 地址和主机名报给 ovirt-engine 并最终报告给 Kubernetes。
4445

4546
<!--
4647
Once the Kubernetes template is available it is possible to start instantiating VMs that can be discovered by the cloud provider.
4748
-->
4849
一旦 Kubernetes 模版可用,就可以开始创建可由云驱动发现的 VM。
4950

50-
<!--
51-
[import]: https://ovedou.blogspot.it/2014/03/importing-glance-images-as-ovirt.html
52-
[install]: https://www.ovirt.org/documentation/quickstart/quickstart-guide/#create-virtual-machines
53-
[generate a template]: https://www.ovirt.org/documentation/quickstart/quickstart-guide/#using-templates
54-
[install the ovirt-guest-agent]: https://www.ovirt.org/documentation/how-to/guest-agent/install-the-guest-agent-in-fedora/
55-
-->
56-
[导入]: https://ovedou.blogspot.it/2014/03/importing-glance-images-as-ovirt.html
57-
[安装]: https://www.ovirt.org/documentation/quickstart/quickstart-guide/#create-virtual-machines
58-
[生成模版]: https://www.ovirt.org/documentation/quickstart/quickstart-guide/#using-templates
59-
[安装 ovirt-guest-agent]: https://www.ovirt.org/documentation/how-to/guest-agent/install-the-guest-agent-in-fedora/
60-
6151
<!--
6252
## Using the oVirt Cloud Provider
53+
54+
The oVirt Cloud Provider requires access to the oVirt REST-API to gather the proper information,
55+
the required credential should be specified in the `ovirt-cloud.conf` file:
6356
-->
6457
## 使用 oVirt 云驱动
6558

66-
<!--
67-
The oVirt Cloud Provider requires access to the oVirt REST-API to gather the proper information, the required credential should be specified in the `ovirt-cloud.conf` file:
68-
-->
6959
oVirt 云驱动需要访问 oVirt REST-API 来收集正确的信息,所需的凭据应在 `ovirt-cloud.conf` 文件中设定:
7060

7161
```none
@@ -128,8 +118,6 @@ oVirt | | | | [docs](/docs/setup/
128118
-->
129119
IaaS 提供商 | 配置管理 | OS | 联网 | 文件 | 遵从性 | 支持级别
130120
----------------- | ------- | ------ | ---- | ------------------------------------------------- |------| ---------------
131-
oVirt | | | | [文件](/docs/setup/production-environment/on-premises-vm/ovirt/) | | 社区 ([@simon3z](https://github.com/simon3z))
132-
133-
121+
oVirt | | | | [文件](/zh/docs/setup/production-environment/on-premises-vm/ovirt/) | | 社区 ([@simon3z](https://github.com/simon3z))
134122

135123

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
---
2-
reviewers:
3-
- sig-cluster-lifecycle
42
title: 配置您的 kubernetes 集群以自托管控制平台
53
content_type: concept
64
weight: 100
75
---
86
<!--
9-
---
10-
reviewers:
11-
- sig-cluster-lifecycle
127
title: Configuring your kubernetes cluster to self-host the control plane
138
content_type: concept
149
weight: 100
15-
---
1610
-->
1711

1812
<!-- overview -->
@@ -30,15 +24,17 @@ configured via the Kubernetes API instead of [static pods](/docs/tasks/administe
3024
configured in the kubelet via static files.
3125
-->
3226
kubeadm 允许您实验性地创建 _self-hosted_ Kubernetes 控制平面。
33-
这意味着 API 服务器,控制管理器和调度程序之类的关键组件将通过配置 Kubernetes API 以 [DaemonSet pods](/docs/concepts/workloads/controllers/daemonset/) 的身份运行,而不是通过静态文件将 [static pods](/docs/tasks/administer-cluster/static-pod/) 在 kubelet 中配置。
27+
这意味着 API 服务器,控制管理器和调度程序之类的关键组件将通过配置 Kubernetes API 以
28+
[DaemonSet Pods](/zh/docs/concepts/workloads/controllers/daemonset/) 的身份运行,
29+
而不是通过静态文件在 kubelet 中配置[静态 Pods](/zh/docs/tasks/configure-pod-container/static-pod/)
3430

3531
<!--
3632
To create a self-hosted cluster see the
3733
[kubeadm alpha selfhosting pivot](/docs/reference/setup-tools/kubeadm/kubeadm-alpha/#cmd-selfhosting) command.
3834
-->
39-
要创建自托管集群,请参见 [kubeadm alpha 自托管枢纽](/docs/reference/setup-tools/kubeadm/kubeadm-alpha/#cmd-selfhosting) 命令。
40-
41-
35+
要创建自托管集群,请参见
36+
[kubeadm alpha selfhosting pivot](/zh/docs/reference/setup-tools/kubeadm/kubeadm-alpha/#cmd-selfhosting)
37+
命令。
4238

4339
<!-- body -->
4440

@@ -47,11 +43,11 @@ To create a self-hosted cluster see the
4743
-->
4844
#### 警告
4945

50-
{{< caution >}}
5146
<!--
5247
This feature pivots your cluster into an unsupported state, rendering kubeadm unable
5348
to manage you cluster any longer. This includes `kubeadm upgrade`.
5449
-->
50+
{{< caution >}}
5551
此功能将您的集群设置为不受支持的状态,从而使 kubeadm 无法再管理您的集群。
5652
这包括 `kubeadm 升级`
5753
{{< /caution >}}
@@ -62,38 +58,38 @@ to manage you cluster any longer. This includes `kubeadm upgrade`.
6258
without manual intervention.
6359
-->
6460
1. 1.8及更高版本中的自托管功能有一些重要限制。
65-
特别是,自托管集群在没有人工干预的情况下_无法从控制平面节点的重新启动中恢复_
61+
特别是,自托管集群在没有人工干预的情况下_无法从控制平面节点的重新启动中恢复_
6662

6763
<!--
6864
1. By default, self-hosted control plane Pods rely on credentials loaded from
6965
[`hostPath`](/docs/concepts/storage/volumes/#hostpath)
7066
volumes. Except for initial creation, these credentials are not managed by
7167
kubeadm.
7268
-->
73-
1. 默认情况下,自托管的控制平面 Pod 依赖于从 [`hostPath`](/docs/concepts/storage/volumes/#hostpath) 卷加载的凭据。
74-
除初始创建外,这些凭据不由 kubeadm 管理。
69+
2. 默认情况下,自托管的控制平面 Pod 依赖于从
70+
[`hostPath`](/zh/docs/concepts/storage/volumes/#hostpath) 卷加载的凭据。
71+
除初始创建外,这些凭据不由 kubeadm 管理。
7572

7673
<!--
7774
1. The self-hosted portion of the control plane does not include etcd,
7875
which still runs as a static Pod.
7976
-->
80-
1. 控制平面的自托管部分不包括 etcd,后者仍作为静态 Pod 运行。
77+
3. 控制平面的自托管部分不包括 etcd,后者仍作为静态 Pod 运行。
8178

8279
<!--
8380
#### Process
84-
-->
85-
#### 处理
8681
87-
<!--
8882
The self-hosting bootstrap process is documented in the [kubeadm design
8983
document](https://github.com/kubernetes/kubeadm/blob/master/docs/design/design_v1.9.md#optional-self-hosting).
9084
-->
91-
自托管引导过程记录在 [kubeadm 设计文档](https://github.com/kubernetes/kubeadm/blob/master/docs/design/design_v1.9.md#optional-self-hosting) 中。
85+
#### 过程
86+
87+
自托管引导过程描述于 [kubeadm 设计文档](https://github.com/kubernetes/kubeadm/blob/master/docs/design/design_v1.9.md#optional-self-hosting) 中。
9288

9389
<!--
9490
In summary, `kubeadm alpha selfhosting` works as follows:
9591
-->
96-
总而言之`kubeadm alpha 自托管` 的工作原理如下:
92+
总体而言`kubeadm alpha 自托管` 的工作原理如下:
9793

9894
<!--
9995
1. Waits for this bootstrap static control plane to be running and
@@ -107,28 +103,27 @@ In summary, `kubeadm alpha selfhosting` works as follows:
107103
It also modifies these manifests where necessary, for example adding new volumes
108104
for secrets.
109105
-->
110-
1. 使用静态控制平面 Pod 清单来构造一组 DaemonSet 清单,这些清单将运行自托管的控制平面。
106+
2. 使用静态控制平面 Pod 清单来构造一组 DaemonSet 清单,这些清单将运行自托管的控制平面。
111107
它还会在必要时修改这些清单,例如添加新的秘密卷。
112108

113109
<!--
114110
1. Creates DaemonSets in the `kube-system` namespace and waits for the
115111
resulting Pods to be running.
116112
-->
117-
1.`kube-system` 名称空间中创建 DaemonSets ,并等待生成的 Pod 运行。
113+
3.`kube-system` 名称空间中创建 DaemonSets ,并等待生成的 Pod 运行。
118114

119115
<!--
120116
1. Once self-hosted Pods are operational, their associated static Pods are deleted
121117
and kubeadm moves on to install the next component. This triggers kubelet to
122118
stop those static Pods.
123119
-->
124-
1. 自托管 Pod 运行后,将删除其关联的静态 Pod,然后 kubeadm 继续安装下一个组件。
125-
这将触发 kubelet 停止那些静态 Pod 。
120+
4. 自托管 Pod 运行后,将删除其关联的静态 Pod,然后 kubeadm 继续安装下一个组件。
121+
这将触发 kubelet 停止那些静态 Pod 。
126122

127123
<!--
128124
1. When the original static control plane stops, the new self-hosted control
129125
plane is able to bind to listening ports and become active.
130126
-->
131-
1. 当原始静态控制平面停止时,新的自托管控制平面能够绑定到侦听端口并变为活动状态。
132-
127+
5. 当原始静态控制平面停止时,新的自托管控制平面能够绑定到侦听端口并变为活动状态。
133128

134129

0 commit comments

Comments
 (0)