Skip to content

Commit 4bb2993

Browse files
authored
Merge pull request #37126 from my-git9/zhsync3
[zh-cn] sync install-kubeadm configure-persistent-volume-storage
2 parents 8ff7e18 + f5bc198 commit 4bb2993

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

content/zh-cn/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ For information on how to create a cluster with kubeadm once you have performed
4747
* 集群中的所有机器的网络彼此均能相互连接(公网和内网都可以)。
4848
* 节点之中不可以有重复的主机名、MAC 地址或 product_uuid。请参见[这里](#verify-mac-address)了解更多详细信息。
4949
* 开启机器上的某些端口。请参见[这里](#check-required-ports)了解更多详细信息。
50-
* 禁用交换分区。为了保证 kubelet 正常工作,你 **必须** 禁用交换分区。
50+
* 禁用交换分区。为了保证 kubelet 正常工作,你**必须**禁用交换分区。
5151

5252
<!-- steps -->
5353

@@ -88,7 +88,6 @@ These
8888
[required ports](/docs/reference/ports-and-protocols/)
8989
need to be open in order for Kubernetes components to communicate with each other. You can use tools like netcat to check if a port is open. For example:
9090
-->
91-
9291
## 检查所需端口{#check-required-ports}
9392

9493
启用这些[必要的端口](/zh-cn/docs/reference/ports-and-protocols/)后才能使 Kubernetes 的各组件相互通信。
@@ -174,11 +173,11 @@ The tables below include the known endpoints for supported operating systems:
174173
| CRI-O | `unix:///var/run/crio/crio.sock` |
175174
| Docker Engine (using cri-dockerd) | `unix:///var/run/cri-dockerd.sock` |
176175
-->
177-
| 运行时 | Unix 域套接字 |
176+
| 运行时 | Unix 域套接字 |
178177
|------------------------------------|----------------------------------------------|
179178
| containerd | `unix:///var/run/containerd/containerd.sock` |
180179
| CRI-O | `unix:///var/run/crio/crio.sock` |
181-
| Docker Engine (使用 cri-dockerd) | `unix:///var/run/cri-dockerd.sock` |
180+
| Docker Engine使用 cri-dockerd | `unix:///var/run/cri-dockerd.sock` |
182181
{{< /table >}}
183182

184183
{{% /tab %}}
@@ -192,10 +191,10 @@ The tables below include the known endpoints for supported operating systems:
192191
| containerd | `npipe:////./pipe/containerd-containerd` |
193192
| Docker Engine (using cri-dockerd) | `npipe:////./pipe/cri-dockerd` |
194193
-->
195-
| 运行时 | Windows 命名管道路径 |
194+
| 运行时 | Windows 命名管道路径 |
196195
|------------------------------------|----------------------------------------------|
197196
| containerd | `npipe:////./pipe/containerd-containerd` |
198-
| Docker Engine (使用 cri-dockerd) | `npipe:////./pipe/cri-dockerd` |
197+
| Docker Engine使用 cri-dockerd | `npipe:////./pipe/cri-dockerd` |
199198
{{< /table >}}
200199

201200
{{% /tab %}}
@@ -262,7 +261,7 @@ For more information on version skews, see:
262261
关于版本偏差的更多信息,请参阅以下文档:
263262

264263
* Kubernetes [版本与版本间的偏差策略](/zh-cn/releases/version-skew-policy/)
265-
* Kubeadm 特定的[版本偏差策略](/zh-cn/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm/#version-skew-policy)
264+
* kubeadm 特定的[版本偏差策略](/zh-cn/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm/#version-skew-policy)
266265

267266
{{< tabs name="k8s_install" >}}
268267
{{% tab name="基于 Debian 的发行版" %}}
@@ -317,7 +316,7 @@ name=Kubernetes
317316
baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-\$basearch
318317
enabled=1
319318
gpgcheck=1
320-
gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
319+
gpgkey=https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
321320
exclude=kubelet kubeadm kubectl
322321
EOF
323322

@@ -345,8 +344,7 @@ sudo systemctl enable --now kubelet
345344
-->
346345
**请注意:**
347346

348-
- 通过运行命令 `setenforce 0``sed ...` 将 SELinux 设置为 permissive 模式
349-
可以有效地将其禁用。
347+
- 通过运行命令 `setenforce 0``sed ...` 将 SELinux 设置为 permissive 模式可以有效地将其禁用。
350348
这是允许容器访问主机文件系统所必需的,而这些操作是为了例如 Pod 网络工作正常。
351349

352350
你必须这么做,直到 kubelet 做出对 SELinux 的支持进行升级为止。

content/zh-cn/docs/tasks/configure-pod-container/configure-persistent-volume-storage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,15 +151,15 @@ would provision a network resource like a Google Compute Engine persistent disk,
151151
an NFS share, or an Amazon Elastic Block Store volume. Cluster administrators can also
152152
use [StorageClasses](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#storageclass-v1-storage-k8s-io)
153153
to set up
154-
[dynamic provisioning](/blog/2016/10/dynamic-provisioning-and-storage-in-kubernetes).
154+
[dynamic provisioning](/docs/concepts/storage/dynamic-provisioning/).
155155
156156
Here is the configuration file for the hostPath PersistentVolume:
157157
-->
158158
在生产集群中,你不会使用 hostPath。
159159
集群管理员会提供网络存储资源,比如 Google Compute Engine 持久盘卷、NFS 共享卷或 Amazon Elastic Block Store 卷。
160160
集群管理员还可以使用
161161
[StorageClasses](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#storageclass-v1-storage-k8s-io)
162-
来设置[动态提供存储](/blog/2016/10/dynamic-provisioning-and-storage-in-kubernetes)
162+
来设置[动态制备存储](/zh-cn/docs/concepts/storage/dynamic-provisioning/)
163163

164164
下面是 hostPath PersistentVolume 的配置文件:
165165

0 commit comments

Comments
 (0)