diff --git a/README.md b/README.md index 64ba843..ba59cbe 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ ### 配置 Kubernetes -可选操作: 切换Kubernetes运行上下文至 docker-for-desktop +可选操作: 切换Kubernetes运行上下文至 docker-for-desktop (docker-ce 18.09 下 context 为 docker-desktop) ```shell @@ -224,11 +224,11 @@ helm repo update 可以根据文档安装 Istio https://istio.io/docs/setup/kubernetes/ -#### 下载 Istio 1.0.4 并安装 CLI +#### 下载 Istio 1.1.1 并安装 CLI ```bash curl -L https://git.io/getLatestIstio | sh - -cd istio-1.0.4/ +cd istio-1.1.1/ export PATH=$PWD/bin:$PATH ``` @@ -243,6 +243,13 @@ export PATH=$PWD/bin:$PATH #### 通过 Helm chart 安装 Istio ```shell +# 安装 istio-init chart 安装所有的 Istio CRD +helm install install/kubernetes/helm/istio-init --name istio-init --namespace istio-system + +# 验证下安装的 Istio CRD 个数 +kubectl get crds | grep 'istio.io\|certmanager.k8s.io' | wc -l + +# 开始 istio chart 安装 helm install install/kubernetes/helm/istio --name istio --namespace istio-system ``` diff --git a/README_en.md b/README_en.md index 5b5fe99..73cb88b 100644 --- a/README_en.md +++ b/README_en.md @@ -11,7 +11,7 @@ NOTE: ### Enable Kubernetes on Docker for Mac -Config registry mirror for Docker daemon with ```https://registry.docker-cn.com``` +Config registry mirror for Docker daemon with ```https://registry.docker-cn.com``` only if in China ![mirror](images/mirror.png) @@ -66,7 +66,7 @@ Enable Kubernetes in Docker for Windows, and wait a while for Kubernetes is runn ### Config Kubernetes -Optional: switch the context to docker-for-desktop +Optional: switch the context to `docker-for-desktop` (under docker ce 18.09, the conext is `docker-desktop`) ```shell @@ -166,17 +166,24 @@ helm repo update More details can be found in https://istio.io/docs/setup/kubernetes/ -Download Istio 1.0.4 and install CLI +Download Istio 1.1.1 and install CLI ```bash curl -L https://git.io/getLatestIstio | sh - -cd istio-1.0.4/ +cd istio-1.1.1/ export PATH=$PWD/bin:$PATH ``` Install Istio with Helm chart ```shell +# Install the istio-init chart to bootstrap all the Istio’s CRDs +helm install install/kubernetes/helm/istio-init --name istio-init --namespace istio-system + +# Verify that all Istio CRDs were committed to the Kubernetes api-server +kubectl get crds | grep 'istio.io\|certmanager.k8s.io' | wc -l + +# Install the istio chart helm install install/kubernetes/helm/istio --name istio --namespace istio-system ```