whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[zh] Setup files to sync for 1.22(kubeadm part-3)

Browse Source
This commit is contained in:
Mengjiao Liu
2021-08-27 16:01:59 +08:00
parent f76c2a7b63
commit a07b8a79ba
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/zh/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm.md
+1 -1
View File
@@ -743,7 +743,7 @@ Talking to the control-plane node with the appropriate credentials, run:
使用适当的凭证与控制平面节点通信，运行： 使用适当的凭证与控制平面节点通信，运行：
```bash ```bash
kubectl drain <node name> --delete-local-data --force --ignore-daemonsets kubectl drain <node name> --delete-emptydir-data --force --ignore-daemonsets
``` ```
<!-- <!--
content/zh/docs/setup/production-environment/tools/kubeadm/high-availability.md
+3 -3
View File
@@ -216,11 +216,11 @@ option. Your cluster requirements may need a different configuration.
{{< note >}} {{< note >}}
<!-- <!--
The `kubeadm init` flags `--config` and `--certificate-key` cannot be mixed, therefore if you want The `kubeadm init` flags `--config` and `--certificate-key` cannot be mixed, therefore if you want
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`). 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`).
--> -->
标志 `kubeadm init`、`--config` 和 `--certificate-key` 不能混合使用， 标志 `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` 字段。 （位于 `InitConfiguration` 和 `JoinConfiguration: controlPlane`）添加 `certificateKey` 字段。
{{< /note >}} {{< /note >}}
@@ -418,7 +418,7 @@ in the kubeadm config file.
1. Create a file called `kubeadm-config.yaml` with the following contents: 1. Create a file called `kubeadm-config.yaml` with the following contents:
```yaml ```yaml
apiVersion: kubeadm.k8s.io/v1beta2 apiVersion: kubeadm.k8s.io/v1beta3
kind: ClusterConfiguration kind: ClusterConfiguration
kubernetesVersion: stable kubernetesVersion: stable
controlPlaneEndpoint: "LOAD_BALANCER_DNS:LOAD_BALANCER_PORT" controlPlaneEndpoint: "LOAD_BALANCER_DNS:LOAD_BALANCER_PORT"
content/zh/docs/setup/production-environment/tools/kubeadm/setup-ha-etcd-with-kubeadm.md
+1 -1
View File
@@ -146,7 +146,7 @@ kubeadm 包含生成下述证书所需的所有必要的密码学工具；在这
HOST=${ETCDHOSTS[$i]} HOST=${ETCDHOSTS[$i]}
NAME=${NAMES[$i]} NAME=${NAMES[$i]}
cat << EOF > /tmp/${HOST}/kubeadmcfg.yaml cat << EOF > /tmp/${HOST}/kubeadmcfg.yaml
apiVersion: "kubeadm.k8s.io/v1beta2" apiVersion: "kubeadm.k8s.io/v1beta3"
kind: ClusterConfiguration kind: ClusterConfiguration
etcd: etcd:
local: local: