msb_14154
/
k8s-for-docker-desktop
mirror of https://github.com/AliyunContainerService/k8s-for-docker-desktop
1
1
Code Issues Projects Releases Wiki Activity

update helm to v2.15.1 for K8s 1.16 compatible

Browse Source
v1.15.4
Li Yi 5 years ago
parent 809601954d
commit 29dd000e3c
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File

19
README.md
Unescape View File

@ -217,19 +217,13 @@ kubectl delete -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/mas
##### 通过 brew 安装 ##### 通过 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 ```shell
# Use homebrew on Mac # Use homebrew on Mac
brew install kubernetes-helm brew install kubernetes-helm
# Install Tiller into your Kubernetes cluster # 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 # Change helm repo
helm repo add stable http://mirror.azure.cn/kubernetes/charts-incubator/ 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 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 # 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 # Move it to its desired destination
@ -264,7 +265,7 @@ mv darwin-amd64/helm /usr/local/bin/helm
choco install kubernetes-helm choco install kubernetes-helm
# Install Tiller into your Kubernetes cluster # 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 # Change helm repo
helm repo add stable http://mirror.azure.cn/kubernetes/charts-incubator/ helm repo add stable http://mirror.azure.cn/kubernetes/charts-incubator/

14
README_en.md
Unescape View File

@ -4,8 +4,8 @@
NOTE: 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). * 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.3.x (with Docker CE 19.03.2 and Kubernetes 1.14.6), please use the v1.14.6 ```git checkout v1.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.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 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.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 brew install kubernetes-helm
# Install Tiller into your Kubernetes cluster # 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) # update charts repo (Optional)
helm repo update helm repo update
@ -165,7 +165,7 @@ helm repo update
choco install kubernetes-helm choco install kubernetes-helm
# Install Tiller into your Kubernetes cluster # 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) # update charts repo (Optional)
helm repo update helm repo update
@ -175,11 +175,11 @@ helm repo update
More details can be found in https://istio.io/docs/setup/kubernetes/ 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 ```bash
curl -L https://git.io/getLatestIstio | ISTIO_VERSION=1.3.3 sh - curl -L https://git.io/getLatestIstio | ISTIO_VERSION=1.2.4 sh -
cd istio-1.3.3/ cd istio-1.2.4/
export PATH=$PWD/bin:$PATH export PATH=$PWD/bin:$PATH
``` ```

Write Preview
Loading…
Cancel
Save