diff --git a/content/en/blog/2018/incremental-traffic-management/index.md b/content/en/blog/2018/incremental-traffic-management/index.md index 2147784c3a..63309724f2 100644 --- a/content/en/blog/2018/incremental-traffic-management/index.md +++ b/content/en/blog/2018/incremental-traffic-management/index.md @@ -57,7 +57,7 @@ $ kubectl create clusterrolebinding cluster-admin-binding \ --user=$(gcloud config get-value core/account) {{< /text >}} -Next, [install Helm](https://helm.sh/docs/securing_installation/) and [generate a minimal Istio install](/docs/setup/install/helm/) -- only traffic management components: +Next, [install Helm](https://helm.sh/docs/intro/install/) and [generate a minimal Istio install](/docs/setup/install/helm/) -- only traffic management components: {{< text bash >}} $ helm template install/kubernetes/helm/istio \ diff --git a/content/en/boilerplates/helm-security-warning.md b/content/en/boilerplates/helm-security-warning.md index 459e5326e6..6be544ee2e 100644 --- a/content/en/boilerplates/helm-security-warning.md +++ b/content/en/boilerplates/helm-security-warning.md @@ -2,6 +2,6 @@ --- {{< warning >}} The instructions for using Helm with Tiller do not use secure defaults. -See the [Securing your Helm Installation](https://helm.sh/docs/securing_installation/) +See the [Securing your Helm Installation](https://helm.sh/docs/intro/install/) for further steps to secure a Tiller-based installation. {{< /warning >}} diff --git a/content/en/docs/examples/virtual-machines/single-network/index.md b/content/en/docs/examples/virtual-machines/single-network/index.md index 6d93e45960..3396e5d2c5 100644 --- a/content/en/docs/examples/virtual-machines/single-network/index.md +++ b/content/en/docs/examples/virtual-machines/single-network/index.md @@ -80,7 +80,7 @@ following commands on a machine with cluster admin privileges: it to a `.yaml` values file and pass it to the command with `--values`, which is the recommended approach when managing configurations with multiple options. You can see some sample values files in your Istio installation's `install/kubernetes/helm/istio` directory and find out - more about customizing Helm charts in the [Helm documentation](https://docs.helm.sh/using_helm/#using-helm). + more about customizing Helm charts in the [Helm documentation](https://helm.sh/docs/intro/using_helm/). {{< /tip >}} 1. Define the namespace the VM joins. This example uses the `SERVICE_NAMESPACE` diff --git a/content/en/docs/setup/install/helm/index.md b/content/en/docs/setup/install/helm/index.md index bf84d106bf..951b2d1947 100644 --- a/content/en/docs/setup/install/helm/index.md +++ b/content/en/docs/setup/install/helm/index.md @@ -22,7 +22,7 @@ This installation guide uses [Helm](https://github.com/helm/helm) charts that pr customization of the Istio control plane and of the sidecars for the Istio data plane. You can simply use `helm template` to generate the configuration and then install it using `kubectl apply`, or you can choose to use `helm install` and let -[Tiller](https://helm.sh/docs/architecture/#components) +[Tiller](https://helm.sh/docs/topics/architecture/#components) completely manage the installation. Using these instructions, you can select any one of Istio's built-in @@ -66,7 +66,7 @@ appended to the end of the Helm instructions in the installation steps below. ### Option 1: Install with Helm via `helm template` -Choose this option if your cluster doesn't have [Tiller](https://helm.sh/docs/architecture/#components) +Choose this option if your cluster doesn't have [Tiller](https://helm.sh/docs/topics/architecture/#components) deployed and you don't want to install it. 1. Create a namespace for the `istio-system` components: @@ -171,7 +171,7 @@ $ helm template install/kubernetes/helm/istio --name istio --namespace istio-sys ### Option 2: Install with Helm and Tiller via `helm install` This option allows Helm and -[Tiller](https://helm.sh/docs/architecture/#components) +[Tiller](https://helm.sh/docs/topics/architecture/#components) to manage the lifecycle of Istio. {{< boilerplate helm-security-warning >}} diff --git a/content/zh/blog/2018/incremental-traffic-management/index.md b/content/zh/blog/2018/incremental-traffic-management/index.md index 2147784c3a..63309724f2 100644 --- a/content/zh/blog/2018/incremental-traffic-management/index.md +++ b/content/zh/blog/2018/incremental-traffic-management/index.md @@ -57,7 +57,7 @@ $ kubectl create clusterrolebinding cluster-admin-binding \ --user=$(gcloud config get-value core/account) {{< /text >}} -Next, [install Helm](https://helm.sh/docs/securing_installation/) and [generate a minimal Istio install](/docs/setup/install/helm/) -- only traffic management components: +Next, [install Helm](https://helm.sh/docs/intro/install/) and [generate a minimal Istio install](/docs/setup/install/helm/) -- only traffic management components: {{< text bash >}} $ helm template install/kubernetes/helm/istio \ diff --git a/content/zh/boilerplates/helm-security-warning.md b/content/zh/boilerplates/helm-security-warning.md index a3a1b11883..39d73469d4 100644 --- a/content/zh/boilerplates/helm-security-warning.md +++ b/content/zh/boilerplates/helm-security-warning.md @@ -2,5 +2,5 @@ --- {{< warning >}} 本文档中介绍如何使用带 Tiller 的 Helm 不使用安全默认值。 -有关基于 Tiller 安全安装的进一步步骤请参考[安全安装 Helm](https://helm.sh/docs/securing_installation/)。 +有关基于 Tiller 安全安装的进一步步骤请参考[安全安装 Helm](https://helm.sh/docs/intro/install/)。 {{< /warning >}} \ No newline at end of file diff --git a/content/zh/docs/examples/mesh-expansion/single-network/index.md b/content/zh/docs/examples/mesh-expansion/single-network/index.md index 42eb4d20c7..3199dc0d55 100644 --- a/content/zh/docs/examples/mesh-expansion/single-network/index.md +++ b/content/zh/docs/examples/mesh-expansion/single-network/index.md @@ -23,7 +23,7 @@ is not required to have access to the cluster IP addresses assigned by Kubernete include exposing the Kubernetes DNS server through an internal load balancer, using a Core DNS server, or configuring the IPs in any other DNS server accessible from the VM. -* Install the [Helm client](https://docs.helm.sh/using_helm/). Helm is needed to enable mesh expansion. +* Install the [Helm client](https://helm.sh/docs/intro/using_helm/). Helm is needed to enable mesh expansion. The following instructions: @@ -69,7 +69,7 @@ cluster for mesh expansion, run the following commands on a machine with cluster it to a `.yaml` values file and pass it to the command with `--values`, which is the recommended approach when managing configurations with multiple options. You can see some sample values files in your Istio installation's `install/kubernetes/helm/istio` directory and find out - more about customizing Helm charts in the [Helm documentation](https://docs.helm.sh/using_helm/#using-helm). + more about customizing Helm charts in the [Helm documentation](https://helm.sh/docs/intro/using_helm/). {{< /tip >}} 1. Define the namespace the VM joins. This example uses the `SERVICE_NAMESPACE` environment variable to store the namespace. The value of this variable must match the namespace you use in the configuration files later on. diff --git a/content/zh/docs/setup/install/helm/index.md b/content/zh/docs/setup/install/helm/index.md index 9a67edb087..6d610cddf4 100644 --- a/content/zh/docs/setup/install/helm/index.md +++ b/content/zh/docs/setup/install/helm/index.md @@ -20,7 +20,7 @@ Helm 的安装方法已被弃用。 这种安装方式使用 [Helm](https://github.com/helm/helm) charts 自定义 Istio 控制平面和 Istio 数据平面的 sidecar。 你只需使用 `helm template` 生成配置并使用 `kubectl apply` 命令安装它, 或者你可以选择使用 `helm install` 让 -[Tiller](https://helm.sh/docs/architecture/#components) +[Tiller](https://helm.sh/docs/topics/architecture/#components) 来完全管理安装。 通过这些说明, 您可以选择 Istio 内置的任何一个 @@ -57,7 +57,7 @@ $ helm repo add istio.io https://storage.googleapis.com/istio-release/releases/{ ### 方案 1: 使用 `helm template` 命令安装 -在您的集群没有按照 [Tiller](https://helm.sh/docs/architecture/#components) +在您的集群没有按照 [Tiller](https://helm.sh/docs/topics/architecture/#components) 而且您也不想安装它的情况下，选择此方案安装。 1. 为 Istio 组件创建命名空间 `istio-system`： @@ -143,7 +143,7 @@ $ helm template install/kubernetes/helm/istio --name istio --namespace istio-sys ### 方案 2: 在 Helm 和 Tiller 的环境中使用 `helm install` 命令安装 -这个方案使用 Helm 和 [Tiller](https://helm.sh/docs/architecture/#components) 来对 Istio 的生命周期进行管理。 +这个方案使用 Helm 和 [Tiller](https://helm.sh/docs/topics/architecture/#components) 来对 Istio 的生命周期进行管理。 {{< boilerplate helm-security-warning >}}