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

Fix bad merge committed in error

pull/35960/head
Tim Bannister 2022-08-14 20:16:45 +01:00
parent d1cf826516
commit a63eeb780e
No known key found for this signature in database
GPG Key ID: 1E76582C4F66FA48
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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