Updated for Istio 1.2.2

README.md

@@ -226,12 +226,12 @@ Error: incompatible versions client[v2.13.1] server[v2.12.2]
 # Use homebrew on Mac
 brew install kubernetes-helm
 
+# Install Tiller into your Kubernetes cluster
+helm init --upgrade -i registry.cn-hangzhou.aliyuncs.com/google_containers/tiller:v2.14.1 --skip-refresh
+
 # Change helm repo
 helm repo add stable http://mirror.azure.cn/kubernetes/charts-incubator/
 
-# Install Tiller into your Kubernetes cluster
-helm init --upgrade -i registry.cn-hangzhou.aliyuncs.com/google_containers/tiller:v2.12.2 --skip-refresh
-
 # Update charts repo (Optional)
 helm repo update
 ```
@@ -240,7 +240,7 @@ helm repo update
 
 ```
 # Download binary release
-在 https://github.com/helm/helm/releases 中找到匹配的版本并下载(需要梯子), 如: https://storage.googleapis.com/kubernetes-helm/helm-v2.12.2-darwin-amd64.tar.gz
+在 https://github.com/helm/helm/releases 中找到匹配的版本并下载(需要梯子), 如: https://storage.googleapis.com/kubernetes-helm/helm-v2.14.1-darwin-amd64.tar.gz
 
 # Unpack
 
@@ -261,12 +261,12 @@ mv darwin-amd64/helm /usr/local/bin/helm
 # 注：安装的时候需要保证网络能够访问googleapis这个域名
 choco install kubernetes-helm
 
+# Install Tiller into your Kubernetes cluster
+helm init --upgrade -i registry.cn-hangzhou.aliyuncs.com/google_containers/tiller:v2.14.1 --skip-refresh
+
 # Change helm repo
 helm repo add stable http://mirror.azure.cn/kubernetes/charts-incubator/
 
-# Install Tiller into your Kubernetes cluster
-helm init --upgrade -i registry.cn-hangzhou.aliyuncs.com/google_containers/tiller:v2.12.2 --skip-refresh
-
 # Update charts repo (Optional)
 helm repo update
 ```
@@ -281,8 +281,8 @@ helm repo update
 #### 下载 Istio 1.1.1 并安装 CLI
 
 ```bash
-curl -L https://git.io/getLatestIstio | sh -
-cd istio-1.1.1/
+curl -L https://git.io/getLatestIstio | ISTIO_VERSION=1.2.2 sh -
+cd istio-1.2.2/
 export PATH=$PWD/bin:$PATH
 ```
 
@@ -300,7 +300,7 @@ export PATH=$PWD/bin:$PATH
 # 安装 istio-init chart 安装所有的 Istio CRD
 helm install install/kubernetes/helm/istio-init --name istio-init --namespace istio-system
 
-# 验证下安装的 Istio CRD 个数
+# 验证下安装的 Istio CRD 个数, 应该安装23个CRD
 kubectl get crds | grep 'istio.io\|certmanager.k8s.io' | wc -l
 
 # 开始 istio chart 安装

README_en.md

@@ -5,7 +5,7 @@
 NOTE: 
 
 * The master branch is tested with Docker Desktop for Mac/Windows version 2.0.5.x (with Docker CE 19.03.0 and Kubernetes 1.14.3). 
-  * If you want to use 2.0.4.x (with Docker CE 19.03.0 and Kubernetes 1.14.1), please use the v1.14.1 ```git checkout v1.14.1``
+  * If you want to use 2.0.4.x (with Docker CE 19.03.0 and Kubernetes 1.14.1), please use the v1.14.1 ```git checkout v1.14.1```
   * If you want to use v2.0.1.0/v2.0.2.0/v2.0.3.0 (with Docker CE 18.09.1 and Kubernetes 1.13.0), please use the v2.0.1.0 branch ```git checkout v2.0.0.2```
   * If you want to use v2.0.0.2/v2.0.0.3 (with Docker CE 18.09.1 and Kubernetes 1.10.11), please use the v2.0.0.2 branch ```git checkout v2.0.0.2```
   * If you want to use Docker CE 18.09/18.06 (with Kubernetes 1.10.3), please use the 18.09 branch ```git checkout 18.09```
@@ -149,7 +149,7 @@ Install helm following the instruction on https://github.com/helm/helm/blob/mast
 brew install kubernetes-helm
 
 # Install Tiller into your Kubernetes cluster
-helm init --upgrade -i registry.cn-hangzhou.aliyuncs.com/google_containers/tiller:v2.12.2 --skip-refresh
+helm init --upgrade -i registry.cn-hangzhou.aliyuncs.com/google_containers/tiller:v2.14.1 --skip-refresh
 
 # update charts repo (Optional)
 helm repo update
@@ -163,7 +163,7 @@ helm repo update
 choco install kubernetes-helm
 
 # Install Tiller into your Kubernetes cluster
-helm init --upgrade -i registry.cn-hangzhou.aliyuncs.com/google_containers/tiller:v2.12.2 --skip-refresh
+helm init --upgrade -i registry.cn-hangzhou.aliyuncs.com/google_containers/tiller:v2.14.1 --skip-refresh
 
 # update charts repo (Optional)
 helm repo update
@@ -173,11 +173,11 @@ helm repo update
 
 More details can be found in https://istio.io/docs/setup/kubernetes/
 
-Download Istio 1.1.1 and install CLI
+Download Istio 1.2.2 and install CLI
 
 ```bash
-curl -L https://git.io/getLatestIstio | sh -
-cd istio-1.1.1/
+curl -L https://git.io/getLatestIstio | ISTIO_VERSION=1.2.2 sh -
+cd istio-1.2.2/
 export PATH=$PWD/bin:$PATH
 ```