Skip to content

Commit 37c9165

Browse files
authored
Merge pull request #29563 from mengjiao-liu/sync-1.22-kubeadm-part3
[zh] Setup files to sync for 1.22(kubeadm part-3)
2 parents d25b64c + a07b8a7 commit 37c9165

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,7 @@ Talking to the control-plane node with the appropriate credentials, run:
743743
使用适当的凭证与控制平面节点通信,运行:
744744

745745
```bash
746-
kubectl drain <node name> --delete-local-data --force --ignore-daemonsets
746+
kubectl drain <node name> --delete-emptydir-data --force --ignore-daemonsets
747747
```
748748

749749
<!--

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,11 +216,11 @@ option. Your cluster requirements may need a different configuration.
216216
{{< note >}}
217217
<!--
218218
The `kubeadm init` flags `--config` and `--certificate-key` cannot be mixed, therefore if you want
219-
to use the [kubeadm configuration](https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2) you must add the `certificateKey` field in the appropriate config locations (under `InitConfiguration` and `JoinConfiguration: controlPlane`).
219+
to use the [kubeadm configuration](https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3) you must add the `certificateKey` field in the appropriate config locations (under `InitConfiguration` and `JoinConfiguration: controlPlane`).
220220
-->
221221
标志 `kubeadm init``--config``--certificate-key` 不能混合使用,
222222
因此如果你要使用
223-
[kubeadm 配置](https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2),
223+
[kubeadm 配置](https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3),
224224
你必须在相应的配置文件
225225
(位于 `InitConfiguration``JoinConfiguration: controlPlane`)添加 `certificateKey` 字段。
226226
{{< /note >}}
@@ -418,7 +418,7 @@ in the kubeadm config file.
418418
1. Create a file called `kubeadm-config.yaml` with the following contents:
419419

420420
```yaml
421-
apiVersion: kubeadm.k8s.io/v1beta2
421+
apiVersion: kubeadm.k8s.io/v1beta3
422422
kind: ClusterConfiguration
423423
kubernetesVersion: stable
424424
controlPlaneEndpoint: "LOAD_BALANCER_DNS:LOAD_BALANCER_PORT"

content/zh/docs/setup/production-environment/tools/kubeadm/setup-ha-etcd-with-kubeadm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ kubeadm 包含生成下述证书所需的所有必要的密码学工具;在这
146146
HOST=${ETCDHOSTS[$i]}
147147
NAME=${NAMES[$i]}
148148
cat << EOF > /tmp/${HOST}/kubeadmcfg.yaml
149-
apiVersion: "kubeadm.k8s.io/v1beta2"
149+
apiVersion: "kubeadm.k8s.io/v1beta3"
150150
kind: ClusterConfiguration
151151
etcd:
152152
local:

0 commit comments

Comments
 (0)