From 01ed12e4e3f561a38d59924a8bf9cb6a0ddc503e Mon Sep 17 00:00:00 2001
From: Jihoon Seo <46767780+jihoon-seo@users.noreply.github.com>
Date: Wed, 13 Mar 2019 02:04:43 +0900
Subject: [PATCH] Update kubeadm-init.md (#13068)

* Fix not available config field in kubeadm-init.md

Update the line describing `unifiedControlPlaneImage`, since "unifiedControlPlaneImage" in ClusterConfiguration was changed to a boolean field called "useHyperKubeImage" in v1beta1.
( https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1 )

* Update image names and versions in kubeadm-init.md

$ kubeadm config images list
k8s.gcr.io/kube-apiserver:v1.13.4
k8s.gcr.io/kube-controller-manager:v1.13.4
k8s.gcr.io/kube-scheduler:v1.13.4
k8s.gcr.io/kube-proxy:v1.13.4
k8s.gcr.io/pause:3.1
k8s.gcr.io/etcd:3.2.24
k8s.gcr.io/coredns:1.2.6

# docker images
REPOSITORY                           TAG                 IMAGE ID            CREATED             SIZE
k8s.gcr.io/kube-proxy                v1.13.4             fadcc5d2b066        10 days ago         80.3MB
k8s.gcr.io/kube-controller-manager   v1.13.4             40a817357014        10 days ago         146MB
k8s.gcr.io/kube-scheduler            v1.13.4             dd862b749309        10 days ago         79.6MB
k8s.gcr.io/kube-apiserver            v1.13.4             fc3801f0fc54        10 days ago         181MB
k8s.gcr.io/coredns                   1.2.6               f59dcacceff4        4 months ago        40MB
k8s.gcr.io/etcd                      3.2.24              3cab8e1b9802        5 months ago        220MB
k8s.gcr.io/pause                     3.1                 da86e6ba6ca1        14 months ago       742kB

* Update the way to use custom etcd image in kubeadm-init.md

According to rosti's [comment](https://github.com/kubernetes/kubeadm/issues/1255#issuecomment-439874004),
the `image` field under `etcd` (from `v1alpha3`) was replaced by a couple of fields - `imageRepository` and `imageTag`.

* Apply suggestions from @neolit123 in kubeadm-init.md

Suggestions from @neolit123: https://github.com/kubernetes/website/pull/13068#pullrequestreview-212806230

* Apply a suggestion from @rosti in kubeadm-init.md

A suggestion from @rosti : https://github.com/kubernetes/website/pull/13068#discussion_r264228348
---
 .../en/docs/reference/setup-tools/kubeadm/kubeadm-init.md   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/content/en/docs/reference/setup-tools/kubeadm/kubeadm-init.md b/content/en/docs/reference/setup-tools/kubeadm/kubeadm-init.md
index c2aab8f261..1130a20b1d 100644
--- a/content/en/docs/reference/setup-tools/kubeadm/kubeadm-init.md
+++ b/content/en/docs/reference/setup-tools/kubeadm/kubeadm-init.md
@@ -122,7 +122,7 @@ the [kubeadm config migrate](/docs/reference/setup-tools/kubeadm/kubeadm-config/
 because `v1alpha3` will be removed in Kubernetes 1.14.
 
 For more details on each field in the `v1beta1` configuration you can navigate to our
-[API reference pages.] (https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1)
+[API reference pages](https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1).
 
 ### Adding kube-proxy parameters {#kube-proxy}
 
@@ -148,8 +148,8 @@ Allowed customization are:
 
 * To provide an alternative `imageRepository` to be used instead of
   `k8s.gcr.io`.
-* To provide a `unifiedControlPlaneImage` to be used instead of different images for control plane components.
-* To provide a specific `etcd.image` to be used instead of the image available at`k8s.gcr.io`.
+* To set `useHyperKubeImage` to `true` to use the HyperKube image.
+* To provide a specific `imageRepository` and `imageTag` for etcd or DNS add-on.
 
 Please note that the configuration field `kubernetesVersion` or the command line flag
 `--kubernetes-version` affect the version of the images.