Address the rest of the feedback

Signed-off-by: Keith Mattix II <[email protected]>

Author: keithmattix

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

@@ -2,7 +2,7 @@
 title: Install Multicluster
 description: Install an Istio mesh in ambient mode across multiple Kubernetes clusters.
 weight: 40
-keywords: [kubernetes,multicluster]
+keywords: [kubernetes,multicluster,ambient]
 simple_list: true
 content_above: true
 test: table-of-contents

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

@@ -2,7 +2,7 @@
 title: Before you begin
 description: Initial steps before installing Istio on multiple clusters.
 weight: 1
-keywords: [kubernetes,multicluster]
+keywords: [kubernetes,multicluster,ambient]
 test: n/a
 owner: istio/wg-environments-maintainers
 ---
@@ -19,7 +19,7 @@ In addition, review the requirements and perform the initial steps below.
 
 ### Cluster
 
-This guide requires that you have two Kubernetes clusters with any of the
+This guide requires that you have two Kubernetes clusters with support for LoadBalancing `Services` on any of the
 [supported Kubernetes versions:](/docs/releases/supported-releases#support-status-of-istio-releases) {{< supported_kubernetes_versions >}}.
 
 ### API Server Access

content/en/docs/ambient/install/multicluster/multi-primary_multi-network/helm_test.sh

@@ -41,11 +41,11 @@ function install_istio_on_cluster1_helm {
     _rewrite_helm_repo snip_install_ztunnel_cluster1
 
     echo "Creating the east-west gateway"
-    snip_install_the_eastwest_gateway_2
-    snip_install_the_eastwest_gateway_3
+    snip_install_an_ambient_eastwest_gateway_in_cluster1_2
+    snip_install_an_ambient_eastwest_gateway_in_cluster1_3
 
     echo "Waiting for the east-west gateway to have an external IP"
-    _verify_like snip_install_the_eastwest_gateway_4 "$snip_install_the_eastwest_gateway_4_out"
+    _verify_like snip_install_an_ambient_eastwest_gateway_in_cluster1_4 "$snip_install_an_ambient_eastwest_gateway_in_cluster1_4_out"
 }
 
 function install_istio_on_cluster2_helm {
@@ -62,11 +62,11 @@ function install_istio_on_cluster2_helm {
     _rewrite_helm_repo snip_install_ztunnel_cluster2
 
     echo "Creating the east-west gateway"
-    snip_install_the_eastwest_gateway_in_cluster2_2
-    snip_install_the_eastwest_gateway_in_cluster2_3
+    snip_install_an_ambient_eastwest_gateway_in_cluster2_2
+    snip_install_an_ambient_eastwest_gateway_in_cluster2_3
 
     echo "Waiting for the east-west gateway to have an external IP"
-    _verify_like snip_install_the_eastwest_gateway_in_cluster2_4 "$snip_install_the_eastwest_gateway_in_cluster2_4_out"
+    _verify_like snip_install_an_ambient_eastwest_gateway_in_cluster2_4 "$snip_install_an_ambient_eastwest_gateway_in_cluster2_4_out"
 }
 
 function install_istio_helm {

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

@@ -2,13 +2,17 @@
 title: Install ambient multi-primary on different networks
 description: Install an Istio ambient mesh across multiple primary clusters on different networks.
 weight: 30
-keywords: [kubernetes,multicluster]
+keywords: [kubernetes,multicluster,ambient]
 test: yes
 owner: istio/wg-environments-maintainers
 ---
 
 {{< boilerplate alpha >}}
 
+{{< tip >}}
+{{< boilerplate gateway-api-future >}}
+{{< /tip >}}
+
 Follow this guide to install the Istio control plane on both `cluster1` and
 `cluster2`, making each a {{< gloss >}}primary cluster{{< /gloss >}} (this is currently the only supported configuration in ambient mode). Cluster
 `cluster1` is on the `network1` network, while `cluster2` is on the
@@ -37,8 +41,7 @@ traffic. The gateway in each cluster must be reachable from the other cluster.
 If the istio-system namespace is already created, we need to set the cluster's network there:
 
 {{< text bash >}}
-$ kubectl --context="${CTX_CLUSTER1}" get namespace istio-system && \
-  kubectl --context="${CTX_CLUSTER1}" label namespace istio-system topology.istio.io/network=network1
+$ kubectl --context="${CTX_CLUSTER1}" label namespace istio-system topology.istio.io/network=network1
 {{< /text >}}
 
 ## Configure `cluster1` as a primary
@@ -114,21 +117,13 @@ $ helm install ztunnel istio/ztunnel -n istio-system --kube-context "${CTX_CLUST
 ## Install an ambient east-west gateway in `cluster1`
 
 Install a gateway in `cluster1` that is dedicated to ambient
-[east-west](https://en.wikipedia.org/wiki/East-west_traffic) traffic. By
-default, this gateway will be public on the Internet. Production systems may
+[east-west](https://en.wikipedia.org/wiki/East-west_traffic) traffic. Be
+aware that, depending on your Kubernetes environment, this gateway may be
+deployed on the public Internet by default. Production systems may
 require additional access restrictions (e.g. via firewall rules) to prevent
 external attacks. Check with your cloud vendor to see what options are
 available.
 
-### Deploy Gateway API CRDs
-
-{{< text syntax=bash snip_id=install_crds >}}
-$ kubectl get crd gateways.gateway.networking.k8s.io --context="${CTX_CLUSTER1}" &> /dev/null || \
-  { kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref={{< k8s_gateway_api_version >}}" | kubectl apply -f - --context="${CTX_CLUSTER1}"; }
-{{< /text >}}
-
-### Install the east-west gateway
-
 {{< tabset category-name="east-west-gateway-install-type-cluster-1" >}}
 
 {{< tab name="IstioOperator" category-value="iop" >}}
@@ -193,12 +188,6 @@ NAME                    TYPE           CLUSTER-IP    EXTERNAL-IP    PORT(S)   AG
 istio-eastwestgateway   LoadBalancer   10.80.6.124   34.75.71.237   ...       51s
 {{< /text >}}
 
-## Expose services in `cluster1`
-
-{{< text bash >}}
-$ kubectl --context="${CTX_CLUSTER1}" label svc helloworld -n sample istio.io/global="true"
-{{< /text >}}
-
 ## Set the default network for `cluster2`
 
 If the istio-system namespace is already created, we need to set the cluster's network there:
@@ -278,7 +267,7 @@ $ helm install ztunnel istio/ztunnel -n istio-system --kube-context "${CTX_CLUST
 
 {{< /tabset >}}
 
-## Install the east-west gateway in `cluster2`
+## Install an ambient east-west gateway in `cluster2`
 
 As we did with `cluster1` above, install a gateway in `cluster2` that is dedicated
 to east-west traffic.
@@ -343,12 +332,6 @@ NAME                    TYPE           CLUSTER-IP    EXTERNAL-IP    PORT(S)   AG
 istio-eastwestgateway   LoadBalancer   10.0.12.121   34.122.91.98   ...       51s
 {{< /text >}}
 
-## Expose services in `cluster2`
-
-{{< text bash >}}
-$ kubectl --context="${CTX_CLUSTER2}" label svc helloworld -n sample istio.io/global="true"
-{{< /text >}}
-
 ## Enable Endpoint Discovery
 
 Install a remote secret in `cluster2` that provides access to `cluster1`’s API server.

content/en/docs/ambient/install/multicluster/multi-primary_multi-network/snips.sh

@@ -21,8 +21,7 @@
 ####################################################################################################
 
 snip_set_the_default_network_for_cluster1_1() {
-kubectl --context="${CTX_CLUSTER1}" get namespace istio-system && \
-  kubectl --context="${CTX_CLUSTER1}" label namespace istio-system topology.istio.io/network=network1
+kubectl --context="${CTX_CLUSTER1}" label namespace istio-system topology.istio.io/network=network1
 }
 
 snip_configure_cluster1_as_a_primary_1() {
@@ -66,19 +65,14 @@ snip_install_ztunnel_cluster1() {
 helm install ztunnel istio/ztunnel -n istio-system --kube-context "${CTX_CLUSTER1}" --set multiCluster.clusterName=cluster1 --set global.network=network1
 }
 
-snip_install_crds() {
-kubectl get crd gateways.gateway.networking.k8s.io --context="${CTX_CLUSTER1}" &> /dev/null || \
-  { kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v1.3.0" | kubectl apply -f - --context="${CTX_CLUSTER1}"; }
-}
-
-snip_install_the_eastwest_gateway_1() {
+snip_install_an_ambient_eastwest_gateway_in_cluster1_1() {
 samples/multicluster/gen-eastwest-gateway.sh \
     --network network1 \
     --ambient | \
     kubectl --context="${CTX_CLUSTER1}" apply -f -
 }
 
-snip_install_the_eastwest_gateway_2() {
+snip_install_an_ambient_eastwest_gateway_in_cluster1_2() {
 cat <<EOF > cluster1-ewgateway.yaml
 kind: Gateway
 apiVersion: gateway.networking.k8s.io/v1
@@ -100,23 +94,19 @@ spec:
 EOF
 }
 
-snip_install_the_eastwest_gateway_3() {
+snip_install_an_ambient_eastwest_gateway_in_cluster1_3() {
 kubectl apply --context="${CTX_CLUSTER1}" -f cluster1-ewgateway.yaml
 }
 
-snip_install_the_eastwest_gateway_4() {
+snip_install_an_ambient_eastwest_gateway_in_cluster1_4() {
 kubectl --context="${CTX_CLUSTER1}" get svc istio-eastwestgateway -n istio-system
 }
 
-! IFS=$'\n' read -r -d '' snip_install_the_eastwest_gateway_4_out <<\ENDSNIP
+! IFS=$'\n' read -r -d '' snip_install_an_ambient_eastwest_gateway_in_cluster1_4_out <<\ENDSNIP
 NAME                    TYPE           CLUSTER-IP    EXTERNAL-IP    PORT(S)   AGE
 istio-eastwestgateway   LoadBalancer   10.80.6.124   34.75.71.237   ...       51s
 ENDSNIP
 
-snip_expose_services_in_cluster1_1() {
-kubectl --context="${CTX_CLUSTER1}" label svc helloworld -n sample istio.io/global="true"
-}
-
 snip_set_the_default_network_for_cluster2_1() {
 kubectl --context="${CTX_CLUSTER2}" get namespace istio-system && \
   kubectl --context="${CTX_CLUSTER2}" label namespace istio-system topology.istio.io/network=network2
@@ -163,14 +153,14 @@ snip_install_ztunnel_cluster2() {
 helm install ztunnel istio/ztunnel -n istio-system --kube-context "${CTX_CLUSTER2}"  --set multiCluster.clusterName=cluster2 --set global.network=network2
 }
 
-snip_install_the_eastwest_gateway_in_cluster2_1() {
+snip_install_an_ambient_eastwest_gateway_in_cluster2_1() {
 samples/multicluster/gen-eastwest-gateway.sh \
     --network network2 \
     --ambient | \
     kubectl apply --context="${CTX_CLUSTER2}" -f -
 }
 
-snip_install_the_eastwest_gateway_in_cluster2_2() {
+snip_install_an_ambient_eastwest_gateway_in_cluster2_2() {
 cat <<EOF > cluster2-ewgateway.yaml
 kind: Gateway
 apiVersion: gateway.networking.k8s.io/v1
@@ -192,23 +182,19 @@ spec:
 EOF
 }
 
-snip_install_the_eastwest_gateway_in_cluster2_3() {
+snip_install_an_ambient_eastwest_gateway_in_cluster2_3() {
 kubectl apply --context="${CTX_CLUSTER2}" -f cluster2-ewgateway.yaml
 }
 
-snip_install_the_eastwest_gateway_in_cluster2_4() {
+snip_install_an_ambient_eastwest_gateway_in_cluster2_4() {
 kubectl --context="${CTX_CLUSTER2}" get svc istio-eastwestgateway -n istio-system
 }
 
-! IFS=$'\n' read -r -d '' snip_install_the_eastwest_gateway_in_cluster2_4_out <<\ENDSNIP
+! IFS=$'\n' read -r -d '' snip_install_an_ambient_eastwest_gateway_in_cluster2_4_out <<\ENDSNIP
 NAME                    TYPE           CLUSTER-IP    EXTERNAL-IP    PORT(S)   AGE
 istio-eastwestgateway   LoadBalancer   10.0.12.121   34.122.91.98   ...       51s
 ENDSNIP
 
-snip_expose_services_in_cluster2_1() {
-kubectl --context="${CTX_CLUSTER2}" label svc helloworld -n sample istio.io/global="true"
-}
-
 snip_enable_endpoint_discovery_1() {
 istioctl create-remote-secret \
   --context="${CTX_CLUSTER1}" \

content/en/docs/ambient/install/multicluster/multi-primary_multi-network/test.sh

@@ -37,10 +37,10 @@ function install_istio_on_cluster1_istioctl {
     echo y | snip_configure_cluster1_as_a_primary_2
 
     echo "Creating the east-west gateway"
-    snip_install_the_eastwest_gateway_1
+    snip_install_an_ambient_eastwest_gateway_in_cluster1_1
 
     echo "Waiting for the east-west gateway to have an external IP"
-    _verify_like snip_install_the_eastwest_gateway_4 "$snip_install_the_eastwest_gateway_4_out"
+    _verify_like snip_install_an_ambient_eastwest_gateway_in_cluster1_4 "$snip_install_an_ambient_eastwest_gateway_in_cluster1_4_out"
 }
 
 function install_istio_on_cluster2_istioctl {
@@ -55,10 +55,10 @@ function install_istio_on_cluster2_istioctl {
     echo y | snip_configure_cluster2_as_a_primary_2
 
     echo "Creating the east-west gateway"
-    snip_install_the_eastwest_gateway_in_cluster2_1
+    snip_install_an_ambient_eastwest_gateway_in_cluster2_1
 
     echo "Waiting for the east-west gateway to have an external IP"
-    _verify_like snip_install_the_eastwest_gateway_in_cluster2_4 "$snip_install_the_eastwest_gateway_in_cluster2_4_out"
+    _verify_like snip_install_an_ambient_eastwest_gateway_in_cluster2_4 "$snip_install_an_ambient_eastwest_gateway_in_cluster2_4_out"
 }
 
 function install_istio_istioctl {

content/en/docs/ambient/install/multicluster/verify/index.md

@@ -1,19 +1,19 @@
 ---
 title: Verify the ambient installation
-description: Verify that Istio ambient mode has been installed properly on multiple clusters.
+description: Verify that Istio ambient mesh has been installed properly on multiple clusters.
 weight: 50
-keywords: [kubernetes,multicluster]
+keywords: [kubernetes,multicluster,ambient]
 test: yes
 owner: istio/wg-environments-maintainers
 ---
 Follow this guide to verify that your ambient multicluster Istio installation is working
 properly.
 
 Before proceeding, be sure to complete the steps under
-[before you begin](/docs/setup/install/multicluster/before-you-begin) as well as
-choosing and following one of the multicluster installation guides.
+[before you begin](/docs/ambient/install/multicluster/before-you-begin) as well as
+choosing and following one of the [multicluster installation guides](/docs/ambient/install/multicluster).
 
-In this guide, we will verify multicluster is functional, deploy the `HelloWorld`
+In this guide, we will verify multicluster is fuenctional, deploy the `HelloWorld`
 application `v1` to `cluster1` and `v2` to `cluster2`. Upon receiving a request,
 `HelloWorld` will include its version in its response when we call the `/hello` path.
 
@@ -64,7 +64,7 @@ $ kubectl create --context="${CTX_CLUSTER1}" namespace sample
 $ kubectl create --context="${CTX_CLUSTER2}" namespace sample
 {{< /text >}}
 
-Enable automatic sidecar injection for the `sample` namespace:
+Enroll the `sample` namespace in the mesh:
 
 {{< text bash >}}
 $ kubectl label --context="${CTX_CLUSTER1}" namespace sample \
@@ -186,7 +186,8 @@ $ kubectl exec --context="${CTX_CLUSTER1}" -n sample -c curl \
 {{< /text >}}
 
 Repeat this request several times and verify that the `HelloWorld` version
-should toggle between `v1` and `v2`:
+should change between `v1` and `v2`, signifying that endpoints in both
+clusters are being used:
 
 {{< text plain >}}
 Hello version: v2, instance: helloworld-v2-758dd55874-6x4t8
@@ -215,7 +216,4 @@ Hello version: v1, instance: helloworld-v1-86f77cd7bd-cpxhv
 **Congratulations!** You successfully installed and verified Istio on multiple
 clusters!
 
-## Next Steps
-
-Check out the [locality load balancing tasks](/docs/tasks/traffic-management/locality-load-balancing)
-to learn how to control the traffic across a multicluster mesh.
+<!-- TODO: Link to guide for locality load balancing once we add waypoint instructions -->