From a07b8a79badfe41dde30c0892b5f2e5818e8fb24 Mon Sep 17 00:00:00 2001 From: Mengjiao Liu Date: Fri, 27 Aug 2021 16:01:59 +0800 Subject: [PATCH] [zh] Setup files to sync for 1.22(kubeadm part-3) --- .../tools/kubeadm/create-cluster-kubeadm.md | 2 +- .../tools/kubeadm/high-availability.md | 6 +++--- .../tools/kubeadm/setup-ha-etcd-with-kubeadm.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/content/zh/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm.md b/content/zh/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm.md index 9f7ac07584..9c6137c1d6 100644 --- a/content/zh/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm.md +++ b/content/zh/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm.md @@ -743,7 +743,7 @@ Talking to the control-plane node with the appropriate credentials, run: 使用适当的凭证与控制平面节点通信,运行: ```bash -kubectl drain --delete-local-data --force --ignore-daemonsets +kubectl drain --delete-emptydir-data --force --ignore-daemonsets ``` 标志 `kubeadm init`、`--config` 和 `--certificate-key` 不能混合使用, 因此如果你要使用 - [kubeadm 配置](https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2), + [kubeadm 配置](https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3), 你必须在相应的配置文件 (位于 `InitConfiguration` 和 `JoinConfiguration: controlPlane`)添加 `certificateKey` 字段。 {{< /note >}} @@ -418,7 +418,7 @@ in the kubeadm config file. 1. Create a file called `kubeadm-config.yaml` with the following contents: ```yaml - apiVersion: kubeadm.k8s.io/v1beta2 + apiVersion: kubeadm.k8s.io/v1beta3 kind: ClusterConfiguration kubernetesVersion: stable controlPlaneEndpoint: "LOAD_BALANCER_DNS:LOAD_BALANCER_PORT" diff --git a/content/zh/docs/setup/production-environment/tools/kubeadm/setup-ha-etcd-with-kubeadm.md b/content/zh/docs/setup/production-environment/tools/kubeadm/setup-ha-etcd-with-kubeadm.md index 95d997e424..fc30729efd 100644 --- a/content/zh/docs/setup/production-environment/tools/kubeadm/setup-ha-etcd-with-kubeadm.md +++ b/content/zh/docs/setup/production-environment/tools/kubeadm/setup-ha-etcd-with-kubeadm.md @@ -146,7 +146,7 @@ kubeadm 包含生成下述证书所需的所有必要的密码学工具;在这 HOST=${ETCDHOSTS[$i]} NAME=${NAMES[$i]} cat << EOF > /tmp/${HOST}/kubeadmcfg.yaml - apiVersion: "kubeadm.k8s.io/v1beta2" + apiVersion: "kubeadm.k8s.io/v1beta3" kind: ClusterConfiguration etcd: local: