Small cleanup/reorg of mesh expansion examples (#4784)

content/blog/2018/egress-tcp/index.md

@@ -338,7 +338,7 @@ bypassing the sidecar proxies.
 ## Relation to mesh expansion
 
 Note that the scenario described in this post is different from the mesh expansion scenario, described in the
-[Integrating Virtual Machines](/docs/examples/mesh-expansion/shared-vpn/integrating-vms/) example. In that scenario, a MySQL instance runs on an
+[Bookinfo with Mesh Expansion](/docs/examples/mesh-expansion/bookinfo-expanded/) example. In that scenario, a MySQL instance runs on an
 external
 (outside the cluster) machine (a bare metal or a VM), integrated with the Istio service mesh. The MySQL service becomes
 a first-class citizen of the mesh with all the beneficial features of Istio applicable. Among other things, the service
@@ -348,7 +348,7 @@ becomes addressable by a local cluster domain name, for example by `mysqldb.vm.s
 entry to access this service; however, the service must be registered with Istio. To enable such integration, Istio
 components (_Envoy proxy_, _node-agent_, `_istio-agent_`) must be installed on the machine and the Istio control plane
 (_Pilot_, _Mixer_, _Citadel_) must be accessible from it. See the
-[Istio Mesh Expansion](/docs/examples/mesh-expansion/shared-vpn/setups/) instructions for more details.
+[Istio Mesh Expansion](/docs/examples/mesh-expansion/) instructions for more details.
 
 In our case, the MySQL instance can run on any machine or can be provisioned as a service by a cloud provider. There is
 no requirement to integrate the machine with Istio. The Istio control plane does not have to be accessible from the

content/docs/concepts/traffic-management/index.md

@@ -991,7 +991,7 @@ outside of the mesh:
    and [fault injection](/docs/concepts/traffic-management/#fault-injection)
    policies for external destinations.
 
-- Add a service running in a Virtual Machine (VM) to the mesh to [expand your mesh](/docs/examples/mesh-expansion/shared-vpn/setups/#running-services-on-a-mesh-expansion-machine).
+- Add a service running in a Virtual Machine (VM) to the mesh to [expand your mesh](/docs/examples/mesh-expansion/).
 
 - Logically add services from a different cluster to the mesh to configure a
   [multicluster Istio mesh](/docs/setup/kubernetes/install/multicluster/gateways/#configure-the-example-services)

content/docs/examples/mesh-expansion/bookinfo-expanded/index.md

@@ -1,10 +1,10 @@
 ---
-title: Integrating Virtual Machines
-description: Illustrates how to use Istio to control a Kubernetes cluster and raw VMs as a single mesh.
+title: Bookinfo with Mesh Expansion
+description: Illustrates how to expand the Bookinfo application's mesh with a raw VM service.
 weight: 60
 keywords: [vms]
 aliases:
-    - /docs/examples/mesh-expansion/shared-vpn/integrating-vms/index.html
+    - /docs/examples/integrating-vms/
 ---
 
 This example deploys the Bookinfo services across Kubernetes and a set of
@@ -32,7 +32,7 @@ https://docs.google.com/drawings/d/1G1592HlOVgtbsIqxJnmMzvy6ejIdhajCosxF1LbvspI/
 
 * Deploy the [Bookinfo](/docs/examples/bookinfo/) sample application (in the `bookinfo` namespace).
 
-* Create a VM named 'vm-1' in the same project as Istio cluster, and [Join the Mesh](/docs/examples/mesh-expansion/shared-vpn/setups/).
+* Create a VM named 'vm-1' in the same project as Istio cluster, and [Join the Mesh](/docs/examples/mesh-expansion/single-network/).
 
 ## Running MySQL on the VM
 

content/docs/examples/mesh-expansion/multi-network/index.md

@@ -1,13 +1,11 @@
 ---
-title: Mesh Expansion with Gateways
+title: Multi-network Mesh Expansion
 description: Integrate VMs and bare metal hosts into an Istio mesh deployed on Kubernetes with gateways.
-weight: 95
+weight: 30
 keywords: [kubernetes,vms,gateways]
-aliases:
-    - /docs/examples/mesh-expansion-with-gateways/
 ---
 
-This guide provides instructions to integrate VMs and bare metal hosts into
+This example provides instructions to integrate VMs and bare metal hosts into
 an Istio mesh deployed on Kubernetes with gateways. No VPN connectivity nor direct network access between workloads in
 VMs, bare metals and clusters is required.
 

content/docs/examples/mesh-expansion/shared-vpn/_index.md

@@ -1,9 +0,0 @@
----
-title: Mesh Expansion
-description: Configure an Istio mesh spanning  Kubernetes clusters, VMs and bare metals.
-weight: 90
-aliases:
-    - /docs/examples/mesh-expansion/shared-vpn
-keywords: [kubernetes,mesh expansion]
----
-

content/docs/examples/mesh-expansion/single-network/index.md

@@ -1,13 +1,13 @@
 ---
-title: Mesh Expansion
+title: Single-network Mesh Expansion
 description: Integrate VMs and bare metal hosts into an Istio mesh deployed on Kubernetes.
-weight: 95
+weight: 20
 keywords: [kubernetes,vms]
 aliases:
-    - /docs/examples/mesh-expansion/
+    - /docs/setup/kubernetes/additional-setup/mesh-expansion/
 ---
 
-This guide provides instructions to integrate VMs and bare metal hosts into
+This example provides instructions to integrate VMs and bare metal hosts into
 an Istio mesh deployed on Kubernetes.
 
 ## Prerequisites

content/faq/security/cert-lifetime-config.md

@@ -41,7 +41,7 @@ For the workloads running on VMs and bare metal hosts, the lifetime of their Ist
 `max-workload-cert-ttl` of Citadel.
 
 To customize this configuration, the argument for the node agent service should be modified.
-After [setting up the machines](/docs/examples/mesh-expansion/shared-vpn/setups/#setting-up-the-vm) for Istio
+After [setting up the machines](/docs/examples/mesh-expansion/single-network/#setting-up-the-vm) for Istio
 mesh expansion, modify the file `/lib/systemd/system/istio-auth-node-agent.service` on the VMs or bare metal hosts:
 
 {{< text plain >}}

content_zh/docs/examples/mesh-expansion/shared-vpn/integrating-vms/index.md

@@ -14,7 +14,7 @@ keywords: [vms]
 ## 概述
 
 {{< image width="80%"
-    link="mesh-expansion.svg"
+    link="/docs/examples/mesh-expansion/bookinfo-expanded/mesh-expansion.svg"
     caption="网格扩展环境下的 Bookinfo 应用"
     >}}