From 702d05e9fe68483c5cdb6da78e48776b7622d60c Mon Sep 17 00:00:00 2001 From: bjpaul Date: Sun, 22 Sep 2019 05:49:23 +0530 Subject: [PATCH] resolving merge conflict (#16497) --- .../tools/kubeadm/high-availability.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/content/en/docs/setup/production-environment/tools/kubeadm/high-availability.md b/content/en/docs/setup/production-environment/tools/kubeadm/high-availability.md index 53f9efa8ce..c20fcf16f5 100644 --- a/content/en/docs/setup/production-environment/tools/kubeadm/high-availability.md +++ b/content/en/docs/setup/production-environment/tools/kubeadm/high-availability.md @@ -105,13 +105,12 @@ option. Your cluster requirements may need a different configuration. ```sh sudo kubeadm init --control-plane-endpoint "LOAD_BALANCER_DNS:LOAD_BALANCER_PORT" --upload-certs ``` -<<<<<<< HEAD + - You can use the `--kubernetes-version` flag to set the Kubernetes version to use. It is recommended that the versions of kubeadm, kubelet, kubectl and Kubernetes match. - The `--control-plane-endpoint` flag should be set to the address or DNS and port of the load balancer. -======= ->>>>>>> upstream/master + - The `--upload-certs` flag is used to upload the certificates that should be shared across all the control-plane instances to the cluster. If instead, you prefer to copy certs across control-plane nodes manually or using automation tools, please remove this flag and refer to [Manual