Skip to content

Commit b335878

Browse files
committed
[zh-cn] sync create-cluster-kubeadm verify-kubectl intro
Signed-off-by: xin.li <[email protected]>
1 parent 8d47bd1 commit b335878

File tree

3 files changed

+62
-39
lines changed

3 files changed

+62
-39
lines changed

content/zh-cn/docs/concepts/windows/intro.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -469,8 +469,8 @@ The following list documents differences between how Pod specifications work bet
469469
请参考 [GitHub issue](https://github.com/moby/moby/issues/25982)
470470
目前的行为是通过 CTRL_SHUTDOWN_EVENT 发送 ENTRYPOINT 进程,然后 Windows 默认等待 5 秒,
471471
最后使用正常的 Windows 关机行为终止所有进程。
472-
5 秒默认值实际上位于[容器内](https://github.com/moby/moby/issues/25982#issuecomment-426441183) Windows 注册表中,
473-
因此在构建容器时可以覆盖这个值。
472+
5 秒默认值实际上位于[容器内](https://github.com/moby/moby/issues/25982#issuecomment-426441183)
473+
Windows 注册表中,因此在构建容器时可以覆盖这个值。
474474
* `volumeDevices` - 这是一个 beta 版功能特性,未在 Windows 上实现。
475475
Windows 无法将原始块设备挂接到 Pod。
476476
* `volumes`
@@ -594,7 +594,7 @@ The following container runtimes work with Windows:
594594
You can use {{< glossary_tooltip term_id="containerd" text="ContainerD" >}} 1.4.0+
595595
as the container runtime for Kubernetes nodes that run Windows.
596596
597-
Learn how to [install ContainerD on a Windows node](/docs/setup/production-environment/container-runtimes/#install-containerd).
597+
Learn how to [install ContainerD on a Windows node](/docs/setup/production-environment/container-runtimes/#containerd).
598598
-->
599599
### ContainerD {#containerd}
600600

@@ -603,7 +603,7 @@ Learn how to [install ContainerD on a Windows node](/docs/setup/production-envir
603603
对于运行 Windows 的 Kubernetes 节点,你可以使用
604604
{{< glossary_tooltip term_id="containerd" text="ContainerD" >}} 1.4.0+ 作为容器运行时。
605605

606-
学习如何[在 Windows 上安装 ContainerD](/zh-cn/docs/setup/production-environment/container-runtimes/#install-containerd)
606+
学习如何[在 Windows 上安装 ContainerD](/zh-cn/docs/setup/production-environment/container-runtimes/#containerd)
607607

608608
{{< note >}}
609609
<!--
@@ -719,7 +719,8 @@ The Kubernetes [cluster API](https://cluster-api.sigs.k8s.io/) project also prov
719719

720720
kubeadm 工具帮助你部署 Kubernetes 集群,提供管理集群的控制平面以及运行工作负载的节点。
721721

722-
Kubernetes [集群 API](https://cluster-api.sigs.k8s.io/) 项目也提供了自动部署 Windows 节点的方式。
722+
Kubernetes [集群 API](https://cluster-api.sigs.k8s.io/) 项目也提供了自动部署
723+
Windows 节点的方式。
723724

724725
<!--
725726
## Windows distribution channels

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

Lines changed: 30 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ applies to `kubeadm` as well as to Kubernetes overall.
8383
Check that policy to learn about what versions of Kubernetes and `kubeadm`
8484
are supported. This page is written for Kubernetes {{< param "version" >}}.
8585
-->
86-
[Kubernetes 版本及版本偏差策略](/zh-cn/releases/version-skew-policy/#supported-versions)适用于 `kubeadm` 以及整个 Kubernetes。
86+
[Kubernetes 版本及版本偏差策略](/zh-cn/releases/version-skew-policy/#supported-versions)适用于
87+
`kubeadm` 以及整个 Kubernetes。
8788
查阅该策略以了解支持哪些版本的 Kubernetes 和 `kubeadm`
8889
该页面是为 Kubernetes {{< param "version" >}} 编写的。
8990

@@ -160,7 +161,7 @@ After you initialize your control-plane, the kubelet runs normally.
160161
#### Network setup
161162
162163
kubeadm similarly to other Kubernetes components tries to find a usable IP on
163-
the network interface associated with the default gateway on a host. Such
164+
the network interfaces associated with the default gateway on a host. Such
164165
an IP is then used for the advertising and/or listening performed by a component.
165166
-->
166167
#### 网络设置 {#network-setup}
@@ -181,6 +182,14 @@ ip route show # Look for a line starting with "default via"
181182
ip route show # 查找以 "default via" 开头的行
182183
```
183184

185+
{{< note >}}
186+
<!--
187+
If the host does not have a default gateway and if a custom IP address is not passed
188+
to a Kubernetes component, the component may exit with an error.
189+
-->
190+
如果主机没有默认网关,并且未给 Kubernetes 组件赋予自定义 IP,此组件可能会报错退出。
191+
{{< /note >}}
192+
184193
<!--
185194
Kubernetes components do not accept custom network interface as an option,
186195
therefore a custom IP address must be passed as a flag to all components instances
@@ -214,18 +223,18 @@ For dual-stack see
214223

215224
有关双协议栈细节参见[使用 kubeadm 支持双协议栈](/zh-cn/docs/setup/production-environment/tools/kubeadm/dual-stack-support)
216225

217-
{{< note >}}
218226
<!--
219-
IP addresses become part of certificates SAN fields. Changing these IP addresses would require
227+
The IP addresses that you assign to control plane components become part of their X.509 certificates'
228+
subject alternative name fields. Changing these IP addresses would require
220229
signing new certificates and restarting the affected components, so that the change in
221230
certificate files is reflected. See
222231
[Manual certificate renewal](/docs/tasks/administer-cluster/kubeadm/kubeadm-certs/#manual-certificate-renewal)
223232
for more details on this topic.
224233
-->
225-
IP 地址成为证书 SAN 字段的一部分。更改这些 IP 地址将需要签署新的证书并重启受影响的组件,
234+
控制平面组件所分配的 IP 地址将成为其 X.509 证书的使用者备用名称字段的一部分。
235+
更改这些 IP 地址将需要签署新的证书并重启受影响的组件,
226236
以便反映证书文件中的变化。有关此主题的更多细节参见
227237
[手动续期证书](/zh-cn/docs/tasks/administer-cluster/kubeadm/kubeadm-certs/#manual-certificate-renewal)
228-
{{</ note >}}
229238

230239
{{< warning >}}
231240
<!--
@@ -244,22 +253,6 @@ Kubernetes 维护者建议设置主机网络,使默认网关 IP 成为 Kuberne
244253
如果节点的默认网关是公共 IP 地址,你应配置数据包过滤或其他保护节点和集群的安全措施。
245254
{{< /warning >}}
246255

247-
{{< note >}}
248-
<!--
249-
If the host does not have a default gateway, it is recommended to setup one. Otherwise,
250-
without passing a custom IP address to a Kubernetes component, the component
251-
will exit with an error. If two or more default gateways are present on the host,
252-
a Kubernetes component will try to use the first one it encounters that has a suitable
253-
global unicast IP address. While making this choice, the exact ordering of gateways
254-
might vary between different operating systems and kernel versions.
255-
-->
256-
如果主机没有默认网关,则建议设置一个默认网关。
257-
否则,在不传递自定义 IP 地址给 Kubernetes 组件的情况下,此组件将退出并报错。
258-
如果主机上存在两个或多个默认网关,则 Kubernetes
259-
组件将尝试使用所遇到的第一个具有合适全局单播 IP 地址的网关。
260-
在做出此选择时,网关的确切顺序可能因不同的操作系统和内核版本而有所差异。
261-
{{< /note >}}
262-
263256
<!--
264257
### Preparing the required container images
265258
-->
@@ -278,7 +271,8 @@ Kubeadm allows you to use a custom image repository for the required images.
278271
See [Using custom images](/docs/reference/setup-tools/kubeadm/kubeadm-init#custom-images)
279272
for more details.
280273
-->
281-
这个步骤是可选的,只适用于你希望 `kubeadm init``kubeadm join` 不去下载存放在 `registry.k8s.io` 上的默认的容器镜像的情况。
274+
这个步骤是可选的,只适用于你希望 `kubeadm init``kubeadm join` 不去下载存放在
275+
`registry.k8s.io` 上的默认的容器镜像的情况。
282276

283277
当你在离线的节点上创建一个集群的时候,Kubeadm 有一些命令可以帮助你预拉取所需的镜像。
284278
阅读[离线运行 kubeadm](/zh-cn/docs/reference/setup-tools/kubeadm/kubeadm-init#without-internet-connection)
@@ -376,8 +370,9 @@ This will allow you to pass `--control-plane-endpoint=cluster-endpoint` to `kube
376370
high availability scenario.
377371
-->
378372
其中 `192.168.0.102` 是此节点的 IP 地址,`cluster-endpoint` 是映射到该 IP 的自定义 DNS 名称。
379-
这将允许你将 `--control-plane-endpoint=cluster-endpoint` 传递给 `kubeadm init`,并将相同的 DNS 名称传递给 `kubeadm join`
380-
稍后你可以修改 `cluster-endpoint` 以指向高可用性方案中的负载均衡器的地址。
373+
这将允许你将 `--control-plane-endpoint=cluster-endpoint` 传递给 `kubeadm init`
374+
并将相同的 DNS 名称传递给 `kubeadm join`。稍后你可以修改 `cluster-endpoint`
375+
以指向高可用性方案中的负载均衡器的地址。
381376

382377
<!--
383378
Turning a single control plane cluster created without `--control-plane-endpoint` into a highly available cluster
@@ -538,8 +533,8 @@ Read all of this advice carefully before proceeding.
538533
Cluster DNS (CoreDNS) will not start up before a network is installed.**
539534
-->
540535
**你必须部署一个基于 Pod 网络插件的
541-
{{< glossary_tooltip text="容器网络接口" term_id="cni" >}}
542-
(CNI),以便你的 Pod 可以相互通信。
536+
{{< glossary_tooltip text="容器网络接口" term_id="cni" >}}(CNI),
537+
以便你的 Pod 可以相互通信。
543538
在安装网络之前,集群 DNS (CoreDNS) 将不会启动。**
544539

545540
<!--
@@ -664,7 +659,7 @@ reasons. If you want to be able to schedule Pods on the control plane nodes,
664659
for example for a single machine Kubernetes cluster, run:
665660
-->
666661
默认情况下,出于安全原因,你的集群不会在控制平面节点上调度 Pod。
667-
如果你希望能够在控制平面节点上调度 Pod,例如单机 Kubernetes 集群,请运行:
662+
如果你希望能够在控制平面节点上调度 Pod,例如单机 Kubernetes 集群,请运行
668663

669664
```bash
670665
kubectl taint nodes --all node-role.kubernetes.io/control-plane-
@@ -780,7 +775,8 @@ The output is similar to:
780775
<!--
781776
To specify an IPv6 tuple for `<control-plane-host>:<control-plane-port>`, IPv6 address must be enclosed in square brackets, for example: `[2001:db8::101]:2073`.
782777
-->
783-
要为 `<control-plane-host>:<control-plane-port>` 指定 IPv6 元组,必须将 IPv6 地址括在方括号中,例如:`[2001:db8::101]:2073`
778+
要为 `<control-plane-host>:<control-plane-port>` 指定 IPv6 元组,必须将 IPv6
779+
地址括在方括号中,例如:`[2001:db8::101]:2073`
784780
{{< /note >}}
785781

786782
<!--
@@ -1029,10 +1025,10 @@ options.
10291025
* 有关漏洞,访问 [kubeadm GitHub issue tracker](https://github.com/kubernetes/kubeadm/issues)
10301026
* 有关支持,访问
10311027
[#kubeadm](https://kubernetes.slack.com/messages/kubeadm/) Slack 频道
1032-
* General SIG 集群生命周期开发 Slack 频道:
1028+
* General SIG 集群生命周期开发 Slack 频道
10331029
[#sig-cluster-lifecycle](https://kubernetes.slack.com/messages/sig-cluster-lifecycle/)
10341030
* SIG 集群生命周期 [SIG information](https://github.com/kubernetes/community/tree/master/sig-cluster-lifecycle#readme)
1035-
* SIG 集群生命周期邮件列表:
1031+
* SIG 集群生命周期邮件列表
10361032
[kubernetes-sig-cluster-lifecycle](https://groups.google.com/forum/#!forum/kubernetes-sig-cluster-lifecycle)
10371033

10381034
<!--
@@ -1143,16 +1139,16 @@ Example for `kubeadm upgrade`:
11431139
* The version of kubeadm used for upgrading the node must be at {{< skew currentVersionAddMinor -1 >}}
11441140
or {{< skew currentVersion >}}
11451141
-->
1146-
`kubeadm upgrade` 的例子:
1142+
`kubeadm upgrade` 的例子
11471143
* 用于创建或升级节点的 kubeadm 版本为 {{< skew currentVersionAddMinor -1 >}}。
11481144
* 用于升级节点的 kubeadm 版本必须为 {{< skew currentVersionAddMinor -1 >}} 或 {{< skew currentVersion >}}。
11491145

11501146
<!--
11511147
To learn more about the version skew between the different Kubernetes component see
11521148
the [Version Skew Policy](/releases/version-skew-policy/).
11531149
-->
1154-
要了解更多关于不同 Kubernetes 组件之间的版本偏差,请参见
1155-
[版本偏差策略](/zh-cn/releases/version-skew-policy/)
1150+
要了解更多关于不同 Kubernetes 组件之间的版本偏差,
1151+
请参见[版本偏差策略](/zh-cn/releases/version-skew-policy/)
11561152

11571153
<!--
11581154
## Limitations {#limitations}

content/zh-cn/docs/tasks/tools/included/verify-kubectl.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,29 @@ If kubectl cluster-info returns the url response but you can't access your clust
6767
```shell
6868
kubectl cluster-info dump
6969
```
70+
71+
<!--
72+
### Troubleshooting the 'No Auth Provider Found' error message {#no-auth-provider-found}
73+
74+
In Kubernetes 1.26, kubectl removed the built-in authentication for the following cloud
75+
providers' managed Kubernetes offerings.
76+
These providers have released kubectl plugins to provide the cloud-specific authentication.
77+
For instructions, refer to the following provider documentation:
78+
-->
79+
### 排查"找不到身份验证提供商"的错误信息 {#no-auth-provider-found}
80+
81+
在 Kubernetes 1.26 中,kubectl 删除了以下云提供商托管的 Kubernetes 产品的内置身份验证。
82+
这些提供商已经发布了 kubectl 插件来提供特定于云的身份验证。
83+
有关说明,请参阅以下提供商文档:
84+
85+
<!--
86+
* Azure AKS: [kubelogin plugin](https://azure.github.io/kubelogin/)
87+
* Google Kubernetes Engine: [gke-gcloud-auth-plugin](https://cloud.google.com/kubernetes-engine/docs/how-to/cluster-access-for-kubectl#install_plugin)
88+
-->
89+
* Azure AKS:[kubelogin 插件](https://azure.github.io/kubelogin/)
90+
* CKE:[gke-gcloud-auth-plugin](https://cloud.google.com/kubernetes-engine/docs/how-to/cluster-access-for-kubectl#install_plugin)
91+
92+
<!--
93+
(There could also be other reasons to see the same error message, unrelated to that change.)
94+
-->
95+
(还可能会有其他原因会看到相同的错误信息,和这个更改无关。)

0 commit comments

Comments
 (0)