Skip to content

Commit 214cd73

Browse files
committed
Adopt Mitch's changes
Signed-off-by: Keith Mattix II <[email protected]>
1 parent 9c4d466 commit 214cd73

File tree

3 files changed

+40
-17
lines changed

3 files changed

+40
-17
lines changed

content/en/docs/ambient/install/multicluster/_index.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,18 @@ the current state and limitations of this feature:
3232

3333
### Supported Configurations
3434

35-
Currently, ambient multicluster **only supports**:
36-
- **Multi-network topologies** with multiple primary clusters
37-
- **Double HBONE encapsulation** for cross-cluster traffic
35+
Currently, ambient multicluster only supports:
36+
- **Multi-network topologies** with each cluster acting as a primary cluster.
3837
- **Universal waypoint deployments** across all clusters with identical names
3938

4039
### Critical Limitations
4140

4241
#### Network Topology Restrictions
43-
- **Multi-cluster single-network configurations are untested, broken, and pre-experimental**
44-
- Do not attempt to deploy ambient across clusters that share the same network
42+
- **Multi-cluster single-network configurations are untested, and may be broken**
43+
- Use caution when deploying ambient across clusters that share the same network
4544
- Only multi-network configurations are supported
4645

47-
#### Control Plane Limitations
46+
#### Control Plane Limitations
4847
- **Primary remote configuration is not currently supported**
4948
- You can only have multiple primary clusters
5049
- Configurations with one or more remote clusters will not work correctly
@@ -58,7 +57,7 @@ Currently, ambient multicluster **only supports**:
5857
#### Service Visibility and Scoping
5958
- **Service scope configurations are not read from across clusters**
6059
- Only the local cluster's service scope configuration is used as the source of truth
61-
- Remote cluster service scopes are ignored, which can lead to unexpected traffic behavior
60+
- Remote cluster service scopes are not respected, which can lead to unexpected traffic behavior
6261
- Cross-cluster service discovery may not respect intended service boundaries
6362

6463
#### Gateway Limitations

content/en/docs/ambient/install/multicluster/before-you-begin/index.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,7 @@ below may have to be altered based on your choice of CA.
7575

7676
## Next steps
7777

78-
You're now ready to install an Istio ambient mesh across multiple clusters. The
79-
particular steps will depend on your requirements for network and
80-
control plane topology.
81-
82-
Choose the installation that best fits your needs:
78+
You're now ready to install an Istio ambient mesh across multiple clusters.
8379

8480
- [Install Multi-Primary on Different Networks](/docs/ambient/install/multicluster/multi-primary_multi-network)
8581

content/en/docs/ambient/install/multicluster/multi-primary_multi-network/index.md

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ owner: istio/wg-environments-maintainers
1010
{{< boilerplate alpha >}}
1111

1212
Follow this guide to install the Istio control plane on both `cluster1` and
13-
`cluster2`, making each a {{< gloss >}}primary cluster{{< /gloss >}}. Cluster
13+
`cluster2`, making each a {{< gloss >}}primary cluster{{< /gloss >}} (this is currently the only supported configuration in ambient mode). Cluster
1414
`cluster1` is on the `network1` network, while `cluster2` is on the
1515
`network2` network. This means there is no direct connectivity between pods
1616
across cluster boundaries.
@@ -92,6 +92,18 @@ Then, install the `istiod` chart in `cluster1` with the following multi-cluster
9292
$ helm install istiod istio/istiod -n istio-system --kube-context "${CTX_CLUSTER1}" --set global.meshID=mesh1 --set global.multiCluster.clusterName=cluster1 --set global.network=network1 --set profile=ambient --set pilot.env.AMBIENT_ENABLE_MULTI_NETWORK="true"
9393
{{< /text >}}
9494

95+
Next, install the CNI node agent in ambient mode:
96+
97+
{{< text syntax=bash snip_id=install_cni >}}
98+
$ helm install istio-cni istio/cni -n istio-system --kube-context "${CTX_CLUSTER1}"--set profile=ambient
99+
{{< /text >}}
100+
101+
Finally, install the ztunnel data plane:
102+
103+
{{< text syntax=bash snip_id=install_ztunnel >}}
104+
$ helm install ztunnel istio/ztunnel -n istio-system --kube-context "${CTX_CLUSTER1}
105+
{{< /text >}}
106+
95107
{{< /tab >}}
96108

97109
{{< /tabset >}}
@@ -163,7 +175,7 @@ TODO: Handle revisions
163175
Apply the configuration to `cluster1`:
164176

165177
{{< text bash >}}
166-
$ istioctl install --context="${CTX_CLUSTER1}" -f cluster1-ewgateway.yaml
178+
$ kubectl apply --context="${CTX_CLUSTER1}" -f cluster1-ewgateway.yaml
167179
{{< /text >}}
168180

169181
{{< /tab >}}
@@ -180,7 +192,9 @@ istio-eastwestgateway LoadBalancer 10.80.6.124 34.75.71.237 ... 51
180192

181193
## Expose services in `cluster1`
182194

183-
TODO: change to explanation about service/namespace scope
195+
{{< text bash >}}
196+
$ kubectl --context="${CTX_CLUSTER1}" label svc helloworld -n sample istio.io/global="true"
197+
{{< /text >}}
184198

185199
## Set the default network for `cluster2`
186200

@@ -243,6 +257,18 @@ Then, install the `istiod` chart in `cluster2` with the following multi-cluster
243257
$ helm install istiod istio/istiod -n istio-system --kube-context "${CTX_CLUSTER2}" --set global.meshID=mesh1 --set global.multiCluster.clusterName=cluster2 --set global.network=network2 --set profile=ambient --set pilot.env.AMBIENT_ENABLE_MULTI_NETWORK="true"
244258
{{< /text >}}
245259

260+
Next, install the CNI node agent in ambient mode:
261+
262+
{{< text syntax=bash snip_id=install_cni >}}
263+
$ helm install istio-cni istio/cni -n istio-system --kube-context "${CTX_CLUSTER2}"--set profile=ambient
264+
{{< /text >}}
265+
266+
Finally, install the ztunnel data plane:
267+
268+
{{< text syntax=bash snip_id=install_ztunnel >}}
269+
$ helm install ztunnel istio/ztunnel -n istio-system --kube-context "${CTX_CLUSTER2}
270+
{{< /text >}}
271+
246272
{{< /tab >}}
247273

248274
{{< /tabset >}}
@@ -297,7 +323,7 @@ TODO: Handle revisions
297323
Apply the configuration to `cluster2`:
298324

299325
{{< text bash >}}
300-
$ istioctl install --context="${CTX_CLUSTER2}" -f cluster2-ewgateway.yaml
326+
$ kubectl apply --context="${CTX_CLUSTER2}" -f cluster2-ewgateway.yaml
301327
{{< /text >}}
302328

303329
{{< /tab >}}
@@ -314,7 +340,9 @@ istio-eastwestgateway LoadBalancer 10.0.12.121 34.122.91.98 ... 51
314340

315341
## Expose services in `cluster2`
316342

317-
TODO: change to explanation about service/namespace scope
343+
{{< text bash >}}
344+
$ kubectl --context="${CTX_CLUSTER2}" label svc helloworld -n sample istio.io/global="true"
345+
{{< /text >}}
318346

319347
## Enable Endpoint Discovery
320348

0 commit comments

Comments
 (0)