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

merge branch v1.14.7

Browse Source
pull/54/head
yidasanqian 5 years ago
parent 8f65815314 809601954d
commit 0152fa9d6a
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File

10
README.md
Unescape View File

@ -244,7 +244,7 @@ Error: incompatible versions client[v2.13.1] server[v2.12.2]
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.1 --skip-refresh helm init --upgrade -i registry.cn-hangzhou.aliyuncs.com/google_containers/tiller:v2.14.3 --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/
@ -257,7 +257,7 @@ helm repo update
``` ```
# Download binary release # Download binary release
在 https://github.com/helm/helm/releases 中找到匹配的版本并下载(需要梯子), 如: https://storage.googleapis.com/kubernetes-helm/helm-v2.14.1-darwin-amd64.tar.gz 在 https://github.com/helm/helm/releases 中找到匹配的版本并下载(需要梯子), 如: https://storage.googleapis.com/kubernetes-helm/helm-v2.14.3-darwin-amd64.tar.gz
# Unpack # Unpack
@ -295,11 +295,11 @@ helm repo update
可以根据文档安装 Istio https://istio.io/docs/setup/kubernetes/ 可以根据文档安装 Istio https://istio.io/docs/setup/kubernetes/
#### 下载 Istio 1.2.4 并安装 CLI #### 下载 Istio 1.3.3 并安装 CLI
```bash ```bash
curl -L https://git.io/getLatestIstio | ISTIO_VERSION=1.2.4 sh - curl -L https://git.io/getLatestIstio | ISTIO_VERSION=1.3.3 sh -
cd istio-1.2.4/ cd istio-1.3.3/
export PATH=$PWD/bin:$PATH export PATH=$PWD/bin:$PATH
``` ```

8
README_en.md
Unescape View File

@ -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.1 --skip-refresh helm init --upgrade -i registry.cn-hangzhou.aliyuncs.com/google_containers/tiller:v2.14.3 --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.2.4 and install CLI Download Istio 1.3.3 and install CLI
```bash ```bash
curl -L https://git.io/getLatestIstio | ISTIO_VERSION=1.2.4 sh - curl -L https://git.io/getLatestIstio | ISTIO_VERSION=1.3.3 sh -
cd istio-1.2.4/ cd istio-1.3.3/
export PATH=$PWD/bin:$PATH export PATH=$PWD/bin:$PATH
``` ```

Write Preview
Loading…
Cancel
Save