Skip to content

Commit 7f2ee9f

Browse files
authored
Use values.global.externalIstiod instead of values.pilot.env.EXTERNAL_ISTIOD (#15805)
1 parent 7688cc7 commit 7f2ee9f

File tree

6 files changed

+16
-10
lines changed

6 files changed

+16
-10
lines changed

content/en/docs/setup/install/multicluster/primary-remote/index.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,17 @@ spec:
5454
multiCluster:
5555
clusterName: cluster1
5656
network: network1
57+
externalIstiod: true
5758
EOF
5859
{{< /text >}}
5960

6061
Apply the configuration to `cluster1`:
6162

6263
{{< text bash >}}
63-
$ istioctl install --set values.pilot.env.EXTERNAL_ISTIOD=true --context="${CTX_CLUSTER1}" -f cluster1.yaml
64+
$ istioctl install --context="${CTX_CLUSTER1}" -f cluster1.yaml
6465
{{< /text >}}
6566

66-
Notice that `values.pilot.env.EXTERNAL_ISTIOD` is set to `true`. This enables the control plane
67+
Notice that `values.global.externalIstiod` is set to `true`. This enables the control plane
6768
installed on `cluster1` to also serve as an external control plane for other remote clusters.
6869
When this feature is enabled, `istiod` will attempt to acquire the leadership lock, and consequently manage,
6970
[appropriately annotated](#set-the-control-plane-cluster-for-cluster2) remote clusters that will be

content/en/docs/setup/install/multicluster/primary-remote/snips.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,12 @@ spec:
3131
multiCluster:
3232
clusterName: cluster1
3333
network: network1
34+
externalIstiod: true
3435
EOF
3536
}
3637

3738
snip_configure_cluster1_as_a_primary_2() {
38-
istioctl install --set values.pilot.env.EXTERNAL_ISTIOD=true --context="${CTX_CLUSTER1}" -f cluster1.yaml
39+
istioctl install --context="${CTX_CLUSTER1}" -f cluster1.yaml
3940
}
4041

4142
snip_install_the_eastwest_gateway_in_cluster1_1() {

content/en/docs/setup/install/multicluster/primary-remote_multi-network/index.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,17 @@ spec:
5858
multiCluster:
5959
clusterName: cluster1
6060
network: network1
61+
externalIstiod: true
6162
EOF
6263
{{< /text >}}
6364

6465
Apply the configuration to `cluster1`:
6566

6667
{{< text bash >}}
67-
$ istioctl install --set values.pilot.env.EXTERNAL_ISTIOD=true --context="${CTX_CLUSTER1}" -f cluster1.yaml
68+
$ istioctl install --context="${CTX_CLUSTER1}" -f cluster1.yaml
6869
{{< /text >}}
6970

70-
Notice that `values.pilot.env.EXTERNAL_ISTIOD` is set to `true`. This enables the control plane
71+
Notice that `values.global.externalIstiod` is set to `true`. This enables the control plane
7172
installed on `cluster1` to also serve as an external control plane for other remote clusters.
7273
When this feature is enabled, `istiod` will attempt to acquire the leadership lock, and consequently manage,
7374
[appropriately annotated](#set-the-control-plane-cluster-for-cluster2) remote clusters that will be

content/en/docs/setup/install/multicluster/primary-remote_multi-network/snips.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,12 @@ spec:
3636
multiCluster:
3737
clusterName: cluster1
3838
network: network1
39+
externalIstiod: true
3940
EOF
4041
}
4142

4243
snip_configure_cluster1_as_a_primary_2() {
43-
istioctl install --set values.pilot.env.EXTERNAL_ISTIOD=true --context="${CTX_CLUSTER1}" -f cluster1.yaml
44+
istioctl install --context="${CTX_CLUSTER1}" -f cluster1.yaml
4445
}
4546

4647
snip_install_the_eastwest_gateway_in_cluster1_1() {

content/zh/docs/setup/install/multicluster/primary-remote/index.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,17 @@ spec:
5252
multiCluster:
5353
clusterName: cluster1
5454
network: network1
55+
externalIstiod: true
5556
EOF
5657
{{< /text >}}
5758

5859
将配置文件应用到 `cluster1`
5960

6061
{{< text bash >}}
61-
$ istioctl install --set values.pilot.env.EXTERNAL_ISTIOD=true --context="${CTX_CLUSTER1}" -f cluster1.yaml
62+
$ istioctl install --context="${CTX_CLUSTER1}" -f cluster1.yaml
6263
{{< /text >}}
6364

64-
需要注意的是,当 `values.pilot.env.EXTERNAL_ISTIOD` 被设置为 `true` 时,
65+
需要注意的是,当 `values.global.externalIstiod` 被设置为 `true` 时,
6566
安装在 `cluster1` 上的控制平面也可以作为其他从集群的外部控制平面。
6667
当这个功能被启用时,`istiod` 将尝试获取领导权锁,
6768
并因此管理将附加到它的并且带有[适当注解的](#set-the-control-plane-cluster-for-cluster2)从集群

content/zh/docs/setup/install/multicluster/primary-remote_multi-network/index.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,17 @@ spec:
5454
multiCluster:
5555
clusterName: cluster1
5656
network: network1
57+
externalIstiod: true
5758
EOF
5859
{{< /text >}}
5960

6061
将配置应用到 `cluster1`
6162

6263
{{< text bash >}}
63-
$ istioctl install --set values.pilot.env.EXTERNAL_ISTIOD=true --context="${CTX_CLUSTER1}" -f cluster1.yaml
64+
$ istioctl install --context="${CTX_CLUSTER1}" -f cluster1.yaml
6465
{{< /text >}}
6566

66-
请注意,`values.pilot.env.EXTERNAL_ISTIOD` 设置为 `true`
67+
请注意,`values.global.externalIstiod` 设置为 `true`
6768
这将启用安装在 `cluster1` 上的控制平面,使其也用作其他从集群的外部控制平面。
6869
启用此特性后,`istiod` 将尝试获取领导选举锁,
6970
并因此管理将附加到它的并且带有[适当注解的](#set-the-control-plane-cluster-for-cluster2)从集群

0 commit comments

Comments
 (0)