From 7f2ee9f4c5522a0f66c0e33c40ca9fd4e7867141 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20Luk=C5=A1a?= <mluksa@redhat.com>
Date: Thu, 24 Oct 2024 10:24:07 +0200
Subject: [PATCH] Use `values.global.externalIstiod` instead of
 `values.pilot.env.EXTERNAL_ISTIOD` (#15805)

---
 .../docs/setup/install/multicluster/primary-remote/index.md  | 5 +++--
 .../docs/setup/install/multicluster/primary-remote/snips.sh  | 3 ++-
 .../multicluster/primary-remote_multi-network/index.md       | 5 +++--
 .../multicluster/primary-remote_multi-network/snips.sh       | 3 ++-
 .../docs/setup/install/multicluster/primary-remote/index.md  | 5 +++--
 .../multicluster/primary-remote_multi-network/index.md       | 5 +++--
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/content/en/docs/setup/install/multicluster/primary-remote/index.md b/content/en/docs/setup/install/multicluster/primary-remote/index.md
index 6cd46dff6c..f09338770c 100644
--- a/content/en/docs/setup/install/multicluster/primary-remote/index.md
+++ b/content/en/docs/setup/install/multicluster/primary-remote/index.md
@@ -54,16 +54,17 @@ spec:
       multiCluster:
         clusterName: cluster1
       network: network1
+      externalIstiod: true
 EOF
 {{< /text >}}
 
 Apply the configuration to `cluster1`:
 
 {{< text bash >}}
-$ istioctl install --set values.pilot.env.EXTERNAL_ISTIOD=true --context="${CTX_CLUSTER1}" -f cluster1.yaml
+$ istioctl install --context="${CTX_CLUSTER1}" -f cluster1.yaml
 {{< /text >}}
 
-Notice that `values.pilot.env.EXTERNAL_ISTIOD` is set to `true`. This enables the control plane
+Notice that `values.global.externalIstiod` is set to `true`. This enables the control plane
 installed on `cluster1` to also serve as an external control plane for other remote clusters.
 When this feature is enabled, `istiod` will attempt to acquire the leadership lock, and consequently manage,
 [appropriately annotated](#set-the-control-plane-cluster-for-cluster2) remote clusters that will be
diff --git a/content/en/docs/setup/install/multicluster/primary-remote/snips.sh b/content/en/docs/setup/install/multicluster/primary-remote/snips.sh
index c7dd22b0f6..5e1eb0c95e 100644
--- a/content/en/docs/setup/install/multicluster/primary-remote/snips.sh
+++ b/content/en/docs/setup/install/multicluster/primary-remote/snips.sh
@@ -31,11 +31,12 @@ spec:
       multiCluster:
         clusterName: cluster1
       network: network1
+      externalIstiod: true
 EOF
 }
 
 snip_configure_cluster1_as_a_primary_2() {
-istioctl install --set values.pilot.env.EXTERNAL_ISTIOD=true --context="${CTX_CLUSTER1}" -f cluster1.yaml
+istioctl install --context="${CTX_CLUSTER1}" -f cluster1.yaml
 }
 
 snip_install_the_eastwest_gateway_in_cluster1_1() {
diff --git a/content/en/docs/setup/install/multicluster/primary-remote_multi-network/index.md b/content/en/docs/setup/install/multicluster/primary-remote_multi-network/index.md
index 3c5d9f4adb..f275f5c3d2 100644
--- a/content/en/docs/setup/install/multicluster/primary-remote_multi-network/index.md
+++ b/content/en/docs/setup/install/multicluster/primary-remote_multi-network/index.md
@@ -58,16 +58,17 @@ spec:
       multiCluster:
         clusterName: cluster1
       network: network1
+      externalIstiod: true
 EOF
 {{< /text >}}
 
 Apply the configuration to `cluster1`:
 
 {{< text bash >}}
-$ istioctl install --set values.pilot.env.EXTERNAL_ISTIOD=true --context="${CTX_CLUSTER1}" -f cluster1.yaml
+$ istioctl install --context="${CTX_CLUSTER1}" -f cluster1.yaml
 {{< /text >}}
 
-Notice that `values.pilot.env.EXTERNAL_ISTIOD` is set to `true`. This enables the control plane
+Notice that `values.global.externalIstiod` is set to `true`. This enables the control plane
 installed on `cluster1` to also serve as an external control plane for other remote clusters.
 When this feature is enabled, `istiod` will attempt to acquire the leadership lock, and consequently manage,
 [appropriately annotated](#set-the-control-plane-cluster-for-cluster2) remote clusters that will be
diff --git a/content/en/docs/setup/install/multicluster/primary-remote_multi-network/snips.sh b/content/en/docs/setup/install/multicluster/primary-remote_multi-network/snips.sh
index a86b2baf13..909f312462 100644
--- a/content/en/docs/setup/install/multicluster/primary-remote_multi-network/snips.sh
+++ b/content/en/docs/setup/install/multicluster/primary-remote_multi-network/snips.sh
@@ -36,11 +36,12 @@ spec:
       multiCluster:
         clusterName: cluster1
       network: network1
+      externalIstiod: true
 EOF
 }
 
 snip_configure_cluster1_as_a_primary_2() {
-istioctl install --set values.pilot.env.EXTERNAL_ISTIOD=true --context="${CTX_CLUSTER1}" -f cluster1.yaml
+istioctl install --context="${CTX_CLUSTER1}" -f cluster1.yaml
 }
 
 snip_install_the_eastwest_gateway_in_cluster1_1() {
diff --git a/content/zh/docs/setup/install/multicluster/primary-remote/index.md b/content/zh/docs/setup/install/multicluster/primary-remote/index.md
index 22bc1b0e45..4f0dd70b45 100644
--- a/content/zh/docs/setup/install/multicluster/primary-remote/index.md
+++ b/content/zh/docs/setup/install/multicluster/primary-remote/index.md
@@ -52,16 +52,17 @@ spec:
       multiCluster:
         clusterName: cluster1
       network: network1
+      externalIstiod: true
 EOF
 {{< /text >}}
 
 将配置文件应用到 `cluster1`：
 
 {{< text bash >}}
-$ istioctl install --set values.pilot.env.EXTERNAL_ISTIOD=true --context="${CTX_CLUSTER1}" -f cluster1.yaml
+$ istioctl install --context="${CTX_CLUSTER1}" -f cluster1.yaml
 {{< /text >}}
 
-需要注意的是，当 `values.pilot.env.EXTERNAL_ISTIOD` 被设置为 `true` 时，
+需要注意的是，当 `values.global.externalIstiod` 被设置为 `true` 时，
 安装在 `cluster1` 上的控制平面也可以作为其他从集群的外部控制平面。
 当这个功能被启用时，`istiod` 将尝试获取领导权锁，
 并因此管理将附加到它的并且带有[适当注解的](#set-the-control-plane-cluster-for-cluster2)从集群
diff --git a/content/zh/docs/setup/install/multicluster/primary-remote_multi-network/index.md b/content/zh/docs/setup/install/multicluster/primary-remote_multi-network/index.md
index f9d22315cc..fc96bf2fd9 100644
--- a/content/zh/docs/setup/install/multicluster/primary-remote_multi-network/index.md
+++ b/content/zh/docs/setup/install/multicluster/primary-remote_multi-network/index.md
@@ -54,16 +54,17 @@ spec:
       multiCluster:
         clusterName: cluster1
       network: network1
+      externalIstiod: true
 EOF
 {{< /text >}}
 
 将配置应用到 `cluster1`：
 
 {{< text bash >}}
-$ istioctl install --set values.pilot.env.EXTERNAL_ISTIOD=true --context="${CTX_CLUSTER1}" -f cluster1.yaml
+$ istioctl install --context="${CTX_CLUSTER1}" -f cluster1.yaml
 {{< /text >}}
 
-请注意，`values.pilot.env.EXTERNAL_ISTIOD` 设置为 `true`。
+请注意，`values.global.externalIstiod` 设置为 `true`。
 这将启用安装在 `cluster1` 上的控制平面，使其也用作其他从集群的外部控制平面。
 启用此特性后，`istiod` 将尝试获取领导选举锁，
 并因此管理将附加到它的并且带有[适当注解的](#set-the-control-plane-cluster-for-cluster2)从集群