Merge pull request #44125 from amacneil/kubeadm-instructions

Automatic merge from submit-queue kubeadm: improve quickstart instructions **What this PR does / why we need it**: Improves instructional output following setup of a kubernetes master with kubeadm. This helps prevent unnecessary support overhead such as: https://github.com/kubernetes/kubeadm/issues/212#issuecomment-292015402 **Example current output**: ``` To start using your cluster, you need to run (as a regular user): sudo cp /etc/kubernetes/admin.conf $HOME/ sudo chown $(id -u):$(id -g) $HOME/admin.conf export KUBECONFIG=$HOME/admin.conf ``` **Example new output**: ``` To start using your cluster, you need to run (as a regular user): mkdir -p $HOME/.kube sudo cp -i /etc/kubernetes/admin.conf $HOME/.kube/config sudo chown $(id -u):$(id -g) $HOME/.kube/config ``` **Release note**: ```release-note NONE ```

Merge pull request #44125 from amacneil/kubeadm-instructions
f33a5f8b · Kubernetes Submit Queue · GitHub · 4a01f44b · 4a2cd620 · f33a5f8b
Commit f33a5f8b authored Jun 06, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 06, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

init.go cmd/kubeadm/app/cmd/init.go +3 -3

No files found.
--- a/cmd/kubeadm/app/cmd/init.go
+++ b/cmd/kubeadm/app/cmd/init.go
@@ -49,9 +49,9 @@ var (
 		To start using your cluster, you need to run (as a regular user):
-		  sudo cp {{.KubeConfigPath}} $HOME/
+		  mkdir -p $HOME/.kube
-		  sudo chown $(id -u):$(id -g) $HOME/{{.KubeConfigName}}
+		  sudo cp -i {{.KubeConfigPath}} $HOME/.kube/config
-		  export KUBECONFIG=$HOME/{{.KubeConfigName}}
+		  sudo chown $(id -u):$(id -g) $HOME/.kube/config
 		You should now deploy a pod network to the cluster.
 		Run "kubectl apply -f [podnetwork].yaml" with one of the options listed at: