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

Updated for Istio 1.2.2

Browse Source
pull/39/head
Li Yi 6 years ago
parent 35cb02ec51
commit 47814d9c8d
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File

22
README.md
Unescape View File

@ -54,7 +54,7 @@ pred='process matches ".*(ocker|vpnkit).*"
![mirror](images/mirror_win.png) ![mirror](images/mirror_win.png)
可选操作: 为 Kubernetes 配置 CPU 和 内存资源，建议分配 4GB 或更多内存。 可选操作: 为 Kubernetes 配置 CPU 和 内存资源，建议分配 4GB 或更多内存。
![resource](images/resource_win.png) ![resource](images/resource_win.png)
@ -226,12 +226,12 @@ Error: incompatible versions client[v2.13.1] server[v2.12.2]
# Use homebrew on Mac # Use homebrew on Mac
brew install kubernetes-helm 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 # 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/
# 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) # Update charts repo (Optional)
helm repo update helm repo update
``` ```
@ -240,7 +240,7 @@ helm repo update
``` ```
# Download binary release # 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 # Unpack
@ -261,12 +261,12 @@ mv darwin-amd64/helm /usr/local/bin/helm
# 注：安装的时候需要保证网络能够访问googleapis这个域名 # 注：安装的时候需要保证网络能够访问googleapis这个域名
choco install kubernetes-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
# 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/
# 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) # Update charts repo (Optional)
helm repo update helm repo update
``` ```
@ -281,8 +281,8 @@ helm repo update
#### 下载 Istio 1.1.1 并安装 CLI #### 下载 Istio 1.1.1 并安装 CLI
```bash ```bash
curl -L https://git.io/getLatestIstio | sh - curl -L https://git.io/getLatestIstio | ISTIO_VERSION=1.2.2 sh -
cd istio-1.1.1/ cd istio-1.2.2/
export PATH=$PWD/bin:$PATH export PATH=$PWD/bin:$PATH
``` ```
@ -300,7 +300,7 @@ export PATH=$PWD/bin:$PATH
# 安装 istio-init chart 安装所有的 Istio CRD # 安装 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 个数 # 验证下安装的 Istio CRD 个数, 应该安装23个CRD
kubectl get crds | grep 'istio.io\|certmanager.k8s.io' | wc -l kubectl get crds | grep 'istio.io\|certmanager.k8s.io' | wc -l
# 开始 istio chart 安装 # 开始 istio chart 安装

12
README_en.md
Unescape View File

@ -5,7 +5,7 @@
NOTE: 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). * 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.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 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``` * 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 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.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) # update charts repo (Optional)
helm repo update helm repo update
@ -163,7 +163,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.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) # update charts repo (Optional)
helm repo update helm repo update
@ -173,11 +173,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.1.1 and install CLI Download Istio 1.2.2 and install CLI
```bash ```bash
curl -L https://git.io/getLatestIstio | sh - curl -L https://git.io/getLatestIstio | ISTIO_VERSION=1.2.2 sh -
cd istio-1.1.1/ cd istio-1.2.2/
export PATH=$PWD/bin:$PATH export PATH=$PWD/bin:$PATH
``` ```

Write Preview
Loading…
Cancel
Save