diff --git a/README.md b/README.md index dfce322..7723b48 100644 --- a/README.md +++ b/README.md @@ -218,50 +218,23 @@ kubectl delete -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/mas ### 安装 Helm -可以根据文档安装 helm https://github.com/helm/helm/blob/master/docs/install.md +可以根据文档安装 helm v3 https://helm.sh/docs/intro/install/ #### 在 Mac OS 上安装 ##### 通过 brew 安装 - ```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.15.2 --skip-refresh +brew install helm -# Change helm repo -helm repo add stable http://mirror.azure.cn/kubernetes/charts-incubator/ +# Add helm repo +helm repo add stable http://mirror.azure.cn/kubernetes/charts/ -# Update charts repo (Optional) +# Update charts repo 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] -``` - -##### 通过二进制包安装 - -``` -# Download binary release -在 https://github.com/helm/helm/releases 中找到匹配的版本并下载(需要梯子), 如: https://storage.googleapis.com/kubernetes-helm/helm-v2.15.2-darwin-amd64.tar.gz - -# Unpack - -tar -zxvf helm-v2.15.2-linux-amd64.tgz - -# Move it to its desired destination - -mv darwin-amd64/helm /usr/local/bin/helm - -``` - #### 在Windows上安装 如果在后续使用 helm 安装组件的过程中出现版本兼容问题,可以参考 `通过二进制包安装` 思路安装匹配的版本 @@ -271,16 +244,32 @@ mv darwin-amd64/helm /usr/local/bin/helm # 注:安装的时候需要保证网络能够访问googleapis这个域名 choco install kubernetes-helm -# Install Tiller into your Kubernetes cluster -helm init --upgrade -i registry.cn-hangzhou.aliyuncs.com/google_containers/tiller:v2.15.2 --skip-refresh - # Change helm repo -helm repo add stable http://mirror.azure.cn/kubernetes/charts-incubator/ +helm repo add stable http://mirror.azure.cn/kubernetes/charts/ -# Update charts repo (Optional) +# Update charts repo helm repo update ``` +#### 测试 Helm (可选) + +安装 Wordpress + +```shell +helm install wordpress stable/wordpress +``` + +查看 wordpress 发布状态 + +```shell +helm install wordpress stable/wordpress +``` + +卸载 wordpress 发布 + +```shell +helm uninstall wordpress +``` ### 配置 Istio @@ -302,8 +291,6 @@ export PATH=$PWD/bin:$PATH .\getLatestIstio.ps1 ``` - - #### 安装 Istio ```shell @@ -368,7 +355,7 @@ http://localhost/productpage #### 删除实例应用 -```bash +```shell samples/bookinfo/platform/kube/cleanup.sh ``` diff --git a/README_en.md b/README_en.md index 31afdf6..4e43a86 100644 --- a/README_en.md +++ b/README_en.md @@ -147,18 +147,18 @@ Click login, go to Kubernetes Dashboard ### Install Helm -Install helm following the instruction on https://github.com/helm/helm/blob/master/docs/install.md +Install helm following the instruction on https://helm.sh/docs/intro/install/ #### For Mac OS ```shell # Use homebrew on Mac -brew install kubernetes-helm +brew install helm -# Install Tiller into your Kubernetes cluster -helm init --upgrade -i registry.cn-hangzhou.aliyuncs.com/google_containers/tiller:v2.15.2 --skip-refresh +# add helm repo +helm repo add stable http://mirror.azure.cn/kubernetes/charts/ -# update charts repo (Optional) +# update charts repo helm repo update ``` @@ -169,10 +169,10 @@ helm repo update # NOTE: please ensure you can access googleapis choco install kubernetes-helm -# Install Tiller into your Kubernetes cluster -helm init --upgrade -i registry.cn-hangzhou.aliyuncs.com/google_containers/tiller:v2.15.2 --skip-refresh +# add helm repo +helm repo add stable http://mirror.azure.cn/kubernetes/charts/ -# update charts repo (Optional) +# update charts repo helm repo update ```