kubernetes
/
website
mirror of https://github.com/kubernetes/website.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #35960 from sftim/20220814_fix_kubeadm_etcd_static_pod 

Fix bad merge for kubeadm etcd static pod
pull/35046/head
Tim Bannister 2022-08-14 20:31:15 +01:00 committed by GitHub
parent d1cf826516 6b3caddc71
commit 3261bebbaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
content/en/docs/reference/setup-tools/kubeadm/implementation-details.md
View File

@ -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`
@ -371,20 +371,14 @@ 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
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.
>>>>>>> upstream/main
### Wait for the control plane to come up