From ed4f77354b36952fa5f8a2e9ed461992e8392564 Mon Sep 17 00:00:00 2001 From: XiaoluHong Date: Wed, 17 Oct 2018 19:26:07 +0800 Subject: [PATCH 1/4] Specify tiller image for chinese users --- .../v2.x/en/installation/ha/helm-init/_index.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/content/rancher/v2.x/en/installation/ha/helm-init/_index.md b/content/rancher/v2.x/en/installation/ha/helm-init/_index.md index 5fc3a6fcf6a..14f3f7b86cd 100644 --- a/content/rancher/v2.x/en/installation/ha/helm-init/_index.md +++ b/content/rancher/v2.x/en/installation/ha/helm-init/_index.md @@ -23,9 +23,17 @@ kubectl create clusterrolebinding tiller \ --serviceaccount=kube-system:tiller helm init --service-account tiller + +# For chinese users +# The latest version of tiller images queries addresses: +# https://dev.aliyun.com/detail.html?spm=5176.1972343.2.18.ErFNgC&repoId=62085 + +helm init --service-account tiller \ + --tiller-image registry.cn-hangzhou.aliyuncs.com/google_containers/tiller: + ``` -> **Note:** This `tiller` install has full cluster access, which should be acceptable if the cluster is dedicated to Rancher server. Check out the [helm docs](https://docs.helm.sh/using_helm/#role-based-access-control) for restricting `tiller` access to suit your security requirements. +> **Note:** This`tiller`install has full cluster access, which should be acceptable if the cluster is dedicated to Rancher server. Check out the [helm docs](https://docs.helm.sh/using_helm/#role-based-access-control) for restricting `tiller` access to suit your security requirements. ### Issues or errors? From 7aabf46c98a4c070fc73a912ef6eebe49c475cd9 Mon Sep 17 00:00:00 2001 From: Denise Date: Wed, 31 Oct 2018 13:37:07 -0700 Subject: [PATCH 2/4] Update _index.md --- .../v2.x/en/installation/ha/helm-init/_index.md | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/content/rancher/v2.x/en/installation/ha/helm-init/_index.md b/content/rancher/v2.x/en/installation/ha/helm-init/_index.md index 14f3f7b86cd..73cfec3a0e6 100644 --- a/content/rancher/v2.x/en/installation/ha/helm-init/_index.md +++ b/content/rancher/v2.x/en/installation/ha/helm-init/_index.md @@ -23,17 +23,11 @@ kubectl create clusterrolebinding tiller \ --serviceaccount=kube-system:tiller helm init --service-account tiller - -# For chinese users -# The latest version of tiller images queries addresses: -# https://dev.aliyun.com/detail.html?spm=5176.1972343.2.18.ErFNgC&repoId=62085 - -helm init --service-account tiller \ - --tiller-image registry.cn-hangzhou.aliyuncs.com/google_containers/tiller: - ``` -> **Note:** This`tiller`install has full cluster access, which should be acceptable if the cluster is dedicated to Rancher server. Check out the [helm docs](https://docs.helm.sh/using_helm/#role-based-access-control) for restricting `tiller` access to suit your security requirements. +> **Users in China:** The latest version of tiller image queries a specific address (i.e. `https://dev.aliyun.com/detail.html?spm=5176.1972343.2.18.ErFNgC&repoId=62085`). In order to initialize tiller, you'll need to specify a specific tiller image. `helm init --service-account tiller --tiller-image registry.cn-hangzhou.aliyuncs.com/google_containers/tiller:` + +> **Note:** This `tiller` install has full cluster access, which should be acceptable if the cluster is dedicated to Rancher server. Check out the [helm docs](https://docs.helm.sh/using_helm/#role-based-access-control) for restricting `tiller` access to suit your security requirements. ### Issues or errors? From 51990e8955f55ecd9a8ce6e6f02c07aa6cbf8dea Mon Sep 17 00:00:00 2001 From: Denise Date: Wed, 31 Oct 2018 13:40:46 -0700 Subject: [PATCH 3/4] Update _index.md --- .../rancher/v2.x/en/installation/ha/helm-init/_index.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/content/rancher/v2.x/en/installation/ha/helm-init/_index.md b/content/rancher/v2.x/en/installation/ha/helm-init/_index.md index 73cfec3a0e6..1377e477c35 100644 --- a/content/rancher/v2.x/en/installation/ha/helm-init/_index.md +++ b/content/rancher/v2.x/en/installation/ha/helm-init/_index.md @@ -23,9 +23,14 @@ kubectl create clusterrolebinding tiller \ --serviceaccount=kube-system:tiller helm init --service-account tiller -``` -> **Users in China:** The latest version of tiller image queries a specific address (i.e. `https://dev.aliyun.com/detail.html?spm=5176.1972343.2.18.ErFNgC&repoId=62085`). In order to initialize tiller, you'll need to specify a specific tiller image. `helm init --service-account tiller --tiller-image registry.cn-hangzhou.aliyuncs.com/google_containers/tiller:` +# Note: If you are in China, you'll need to specify a specific tiller-image in order to initialize tiller. +# The list of tiller image tags are available here: https://dev.aliyun.com/detail.html?spm=5176.1972343.2.18.ErFNgC&repoId=62085. +# When initializing tiller, you'll need to pass in --tiller-image + +helm init --service-account tiller | +--tiller-image registry.cn-hangzhou.aliyuncs.com/google_containers/tiller: +``` > **Note:** This `tiller` install has full cluster access, which should be acceptable if the cluster is dedicated to Rancher server. Check out the [helm docs](https://docs.helm.sh/using_helm/#role-based-access-control) for restricting `tiller` access to suit your security requirements. From 501b78a939dd2913c7e7daf41ebf35e22b1dc414 Mon Sep 17 00:00:00 2001 From: Denise Date: Wed, 31 Oct 2018 13:41:39 -0700 Subject: [PATCH 4/4] Update _index.md --- content/rancher/v2.x/en/installation/ha/helm-init/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rancher/v2.x/en/installation/ha/helm-init/_index.md b/content/rancher/v2.x/en/installation/ha/helm-init/_index.md index 1377e477c35..27f3b746020 100644 --- a/content/rancher/v2.x/en/installation/ha/helm-init/_index.md +++ b/content/rancher/v2.x/en/installation/ha/helm-init/_index.md @@ -24,7 +24,7 @@ kubectl create clusterrolebinding tiller \ helm init --service-account tiller -# Note: If you are in China, you'll need to specify a specific tiller-image in order to initialize tiller. +# Users in China: You will need to specify a specific tiller-image in order to initialize tiller. # The list of tiller image tags are available here: https://dev.aliyun.com/detail.html?spm=5176.1972343.2.18.ErFNgC&repoId=62085. # When initializing tiller, you'll need to pass in --tiller-image