diff --git a/docs/README.adoc b/docs/README.adoc index a7ca3003d..c69dbbba6 100644 --- a/docs/README.adoc +++ b/docs/README.adoc @@ -7,7 +7,7 @@ link:../[Return to Project Root] -*Note*: To add new topics to this documentation, please follow the guidelines in the link:../../docs/guidelines/guidelines.md[guidelines] doc. +*Note*: To add new topics to this documentation, please follow the guidelines in the link:../../docs/guidelines/guidelines.adoc[guidelines] doc. == Table of Contents diff --git a/docs/deployment-models/multicluster.adoc b/docs/deployment-models/multicluster.adoc index f3f9775fe..ffc48f35d 100644 --- a/docs/deployment-models/multicluster.adoc +++ b/docs/deployment-models/multicluster.adoc @@ -518,9 +518,9 @@ kubectl delete ns sample --context="${CTX_CLUSTER2}" === Primary-Remote - Single-Network -These instructions install a https://istio.io/latest/docs/setup/install/multicluster/primary-remote_single-network/[primary-remote/single-network] Istio deployment using the Sail Operator and Sail CRDs. **Before you begin**, ensure you complete the <>. +These instructions install a https://istio.io/latest/docs/setup/install/multicluster/primary-remote/[primary-remote] Istio deployment using the Sail Operator and Sail CRDs. **Before you begin**, ensure you complete the <>. -These installation instructions are adapted from: https://istio.io/latest/docs/setup/install/multicluster/primary-remote_single-network/. +These installation instructions are adapted from: https://istio.io/latest/docs/setup/install/multicluster/primary-remote/. In this setup there is a Primary cluster (`cluster1`) and a Remote cluster (`cluster2`) which are on a single shared network. @@ -541,16 +541,27 @@ spec: multiCluster: clusterName: cluster1 network: network1 + externalIstiod: true EOF +kubectl wait --context "${CTX_CLUSTER1}" --for=jsonpath='{.status.revisions.ready}'=1 istios/default --timeout=3m ---- -. Wait for the control plane to become ready. +. Create east-west gateway on `cluster1`. ++ +// TODO: Find a nicer way to deploy the actual service as ClusterIP, instead of patching it. + ---- -kubectl wait --context "${CTX_CLUSTER1}" --for=condition=Ready istios/default --timeout=3m +kubectl apply --context "${CTX_CLUSTER1}" -f https://raw.githubusercontent.com/istio-ecosystem/sail-operator/main/docs/deployment-models/resources/east-west-gateway-net1.yaml +kubectl --context "${CTX_CLUSTER1}" patch service istio-eastwestgateway -n istio-system -p '{"spec":{"type":"ClusterIP"}}' ---- -. Create an `Istio` resource on `cluster2` with the `remote` profile. +. Expose istiod on `cluster1`. ++ +---- +kubectl apply --context "${CTX_CLUSTER1}" -f https://raw.githubusercontent.com/istio-ecosystem/sail-operator/main/docs/deployment-models/resources/expose-istiod.yaml +---- + +. Create an `Istio` on `cluster2` with the `remote` profile. + ---- kubectl apply --context "${CTX_CLUSTER2}" -f - <