From 29dd000e3cde5d2e1e5f492211f9c2a23119a77e Mon Sep 17 00:00:00 2001 From: Li Yi Date: Wed, 30 Oct 2019 09:11:33 +0800 Subject: [PATCH] update helm to v2.15.1 for K8s 1.16 compatible --- README.md | 21 +++++++++++---------- README_en.md | 14 +++++++------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 15b36c1..41885d6 100644 --- a/README.md +++ b/README.md @@ -217,19 +217,13 @@ kubectl delete -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/mas ##### 通过 brew 安装 -brew 安装的版本可能会和 helm server 不兼容, 如果在后续使用 helm 安装组件的过程中出现以下错误，可以 `通过二进制包安装` 对应的版本 - -``` -$ helm install install/kubernetes/helm/istio-init --name istio-init --namespace istio-system -Error: incompatible versions client[v2.13.1] server[v2.12.2] -``` ```shell # 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.3 --skip-refresh +helm init --upgrade -i registry.cn-hangzhou.aliyuncs.com/google_containers/tiller:v2.15.1 --skip-refresh # Change helm repo helm repo add stable http://mirror.azure.cn/kubernetes/charts-incubator/ @@ -238,6 +232,13 @@ helm repo add stable http://mirror.azure.cn/kubernetes/charts-incubator/ helm repo update ``` +注：brew 安装的版本可能会和 helm server 不兼容, 如果在后续使用 helm 安装组件的过程中出现以下错误，可以 `通过二进制包安装` 对应的版本 + +``` +$ helm install install/kubernetes/helm/istio-init --name istio-init --namespace istio-system +Error: incompatible versions client[v2.13.1] server[v2.12.2] +``` + ##### 通过二进制包安装 ``` @@ -246,7 +247,7 @@ helm repo update # Unpack -tar -zxvf helm-v2.0.0-linux-amd64.tgz +tar -zxvf helm-v2.15.1-linux-amd64.tgz # Move it to its desired destination @@ -264,7 +265,7 @@ mv darwin-amd64/helm /usr/local/bin/helm 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 +helm init --upgrade -i registry.cn-hangzhou.aliyuncs.com/google_containers/tiller:v2.15.1 --skip-refresh # Change helm repo helm repo add stable http://mirror.azure.cn/kubernetes/charts-incubator/ @@ -300,7 +301,7 @@ export PATH=$PWD/bin:$PATH ```shell # 安装 istio-init chart 安装所有的 Istio CRD -helm install install/kubernetes/helm/istio-init --name istio-init --namespace istio-system + helm install install/kubernetes/helm/istio-init --name istio-init --namespace istio-system # 验证下安装的 Istio CRD 个数, 应该安装23个CRD kubectl get crds | grep 'istio.io\|certmanager.k8s.io' | wc -l diff --git a/README_en.md b/README_en.md index 6f24451..388fa8b 100644 --- a/README_en.md +++ b/README_en.md @@ -4,8 +4,8 @@ NOTE: -* The master branch is tested with Docker Desktop for Mac/Windows version 2.1.4.x (with Docker CE 19.03.3 and Kubernetes 1.15.4). - * If you want to use 2.1.3.x (with Docker CE 19.03.2 and Kubernetes 1.14.6), please use the v1.14.6 ```git checkout v1.14.6``` +* The master branch is tested with Docker Desktop for Mac/Windows version 2.1.2.x (with Docker CE 19.03.2 and Kubernetes 1.14.6). + * If you want to use 2.1.1.x (with Docker CE 19.03.0 and Kubernetes 1.14.6), please use the v1.14.3 ```git checkout v1.14.6``` * If you want to use 2.1.1.x (with Docker CE 19.03.0 and Kubernetes 1.14.3), please use the v1.14.3 ```git checkout v1.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 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``` @@ -151,7 +151,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.14.3 --skip-refresh +helm init --upgrade -i registry.cn-hangzhou.aliyuncs.com/google_containers/tiller:v2.15.1 --skip-refresh # update charts repo (Optional) helm repo update @@ -165,7 +165,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.14.1 --skip-refresh +helm init --upgrade -i registry.cn-hangzhou.aliyuncs.com/google_containers/tiller:v2.15.1 --skip-refresh # update charts repo (Optional) helm repo update @@ -175,11 +175,11 @@ helm repo update More details can be found in https://istio.io/docs/setup/kubernetes/ -Download Istio 1.3.3 and install CLI +Download Istio 1.2.4 and install CLI ```bash -curl -L https://git.io/getLatestIstio | ISTIO_VERSION=1.3.3 sh - -cd istio-1.3.3/ +curl -L https://git.io/getLatestIstio | ISTIO_VERSION=1.2.4 sh - +cd istio-1.2.4/ export PATH=$PWD/bin:$PATH ```