From 7611e7d49f402f1b62278c605192c941cf9a3141 Mon Sep 17 00:00:00 2001
From: Yongguang Zhu <yoz@microsoft.com>
Date: Mon, 31 Dec 2018 22:35:02 +0800
Subject: [PATCH] improve readme for kubeconfig

---
 README.md    | 17 ++++++++++++++++-
 README_en.md | 30 ++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6a0aac3..f4f26dd 100644
--- a/README.md
+++ b/README.md
@@ -107,7 +107,21 @@ $ TOKEN=$(kubectl -n kube-system describe secret default| awk '$1=="token:"{prin
 kubectl config set-credentials docker-for-desktop --token="${TOKEN}"
 ```
 
-#### 选择 kubeconfig 文件
+对于Windows
+首先执行如下命令得到dashboard-admin-token的token值
+
+```cmd
+kubectl describe secret -n kube-system dashboard-admin-token
+```
+
+复制token值， 执行如下命令设置kubeconfig
+
+```cmd
+$TOKEN="YOUR_TOKEN_COPY_FROM_ABOVE"
+kubectl config set-credentials docker-for-desktop --token="${TOKEN}"
+```
+
+#### 登录dashboard的时候选择 kubeconfig 文件
 
 ![resource](images/k8s_credentials.png)
 
@@ -194,6 +208,7 @@ helm repo update
 
 ```shell
 # Use Chocolatey on Windows
+# 注：安装的时候需要保证网络能够访问googleapis这个域名
 choco install kubernetes-helm
 
 # Install Tiller into your Kubernetes cluster
diff --git a/README_en.md b/README_en.md
index e955e02..36aaa3c 100644
--- a/README_en.md
+++ b/README_en.md
@@ -108,6 +108,20 @@ $ TOKEN=$(kubectl -n kube-system describe secret default| awk '$1=="token:"{prin
 kubectl config set-credentials docker-for-desktop --token="${TOKEN}"
 ```
 
+For Windows
+First get value of dashboard-admin-token with below command:
+
+```cmd
+kubectl describe secret -n kube-system dashboard-admin-token
+```
+
+copy this value and run below command to setup kubeconfig
+
+```cmd
+$TOKEN="YOUR_TOKEN_COPY_FROM_ABOVE"
+kubectl config set-credentials docker-for-desktop --token="${TOKEN}"
+```
+
 #### Choose kubeconfig file (Optional)
 
 ![resource](images/k8s_credentials.png)
@@ -125,6 +139,8 @@ Click login, go to Kubernetes Dashboard
 
 Install helm following the instruction on https://github.com/helm/helm/blob/master/docs/install.md
 
+#### For Mac OS
+
 ```shell
 # Use homebrew on Mac
 brew install kubernetes-helm
@@ -136,6 +152,20 @@ helm init --upgrade -i registry.cn-hangzhou.aliyuncs.com/google_containers/tille
 helm repo update
 ```
 
+#### For Windows
+
+```shell
+# Use Chocolatey on Windows
+# NOTE: please ensure you can access googleapis
+choco install kubernetes-helm
+
+# Install Tiller into your Kubernetes cluster
+helm init --upgrade -i registry.cn-hangzhou.aliyuncs.com/google_containers/tiller:v2.11.0 --skip-refresh
+
+# update charts repo (Optional)
+helm repo update
+```
+
 ### Install Istio
 
 More details can be found in https://istio.io/docs/setup/kubernetes/