From a63eeb780e507917ebdf2e9ac2dbe196f96a5e4b Mon Sep 17 00:00:00 2001 From: Tim Bannister Date: Sun, 14 Aug 2022 20:16:45 +0100 Subject: [PATCH 1/2] Fix bad merge committed in error --- .../setup-tools/kubeadm/implementation-details.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/content/en/docs/reference/setup-tools/kubeadm/implementation-details.md b/content/en/docs/reference/setup-tools/kubeadm/implementation-details.md index a8d0492e292..e8d594e3db7 100644 --- a/content/en/docs/reference/setup-tools/kubeadm/implementation-details.md +++ b/content/en/docs/reference/setup-tools/kubeadm/implementation-details.md @@ -371,12 +371,7 @@ static Pod manifest file for creating a local etcd instance running in a Pod wit Please note that: -<<<<<<< HEAD -1. The etcd image will be pulled from `registry.k8s.io` by default. See [using custom images](/docs/reference/setup-tools/kubeadm/kubeadm-init/#custom-images) for customizing the image repository -2. in case of kubeadm is executed in the `--dry-run` mode, the etcd static Pod manifest is written in a temporary folder -3. Static Pod manifest generation for local etcd can be invoked individually with the [`kubeadm init phase etcd local`](/docs/reference/setup-tools/kubeadm/kubeadm-init-phase/#cmd-phase-etcd) command -======= -1. The etcd image will be pulled from `k8s.gcr.io` by default. See +1. The etcd container image will be pulled from `registry.gcr.io` by default. See [using custom images](/docs/reference/setup-tools/kubeadm/kubeadm-init/#custom-images) for customizing the image repository 2. In case of kubeadm is executed in the `--dry-run` mode, the etcd static Pod manifest is written @@ -384,7 +379,6 @@ Please note that: 3. Static Pod manifest generation for local etcd can be invoked individually with the [`kubeadm init phase etcd local`](/docs/reference/setup-tools/kubeadm/kubeadm-init-phase/#cmd-phase-etcd) command. ->>>>>>> upstream/main ### Wait for the control plane to come up From 6b3caddc717ec23cf59dde439015b1765560e1c9 Mon Sep 17 00:00:00 2001 From: Tim Bannister Date: Sun, 14 Aug 2022 20:17:54 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Improve=20=E2=80=9CGenerate=20static=20Pod?= =?UTF-8?q?=20manifest=20for=20local=20etcd=E2=80=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Extra tidying --- .../setup-tools/kubeadm/implementation-details.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/content/en/docs/reference/setup-tools/kubeadm/implementation-details.md b/content/en/docs/reference/setup-tools/kubeadm/implementation-details.md index e8d594e3db7..97db9829db5 100644 --- a/content/en/docs/reference/setup-tools/kubeadm/implementation-details.md +++ b/content/en/docs/reference/setup-tools/kubeadm/implementation-details.md @@ -362,7 +362,7 @@ The static Pod manifest for the scheduler is not affected by parameters provided ### Generate static Pod manifest for local etcd -If the user specified an external etcd this step will be skipped, otherwise kubeadm generates a +If you specified an external etcd this step will be skipped, otherwise kubeadm generates a static Pod manifest file for creating a local etcd instance running in a Pod with following attributes: - listen on `localhost:2379` and use `HostNetwork=true` @@ -373,10 +373,10 @@ Please note that: 1. The etcd container image will be pulled from `registry.gcr.io` by default. See [using custom images](/docs/reference/setup-tools/kubeadm/kubeadm-init/#custom-images) - for customizing the image repository -2. In case of kubeadm is executed in the `--dry-run` mode, the etcd static Pod manifest is written - in a temporary folder. -3. Static Pod manifest generation for local etcd can be invoked individually with the + for customizing the image repository. +2. If you run kubeadm in `--dry-run` mode, the etcd static Pod manifest is written + into a temporary folder. +3. You can directly invoke static Pod manifest generation for local etcd, using the [`kubeadm init phase etcd local`](/docs/reference/setup-tools/kubeadm/kubeadm-init-phase/#cmd-phase-etcd) command.