From 8cb10002a984ca6923256db1e21075d695841281 Mon Sep 17 00:00:00 2001
From: xuzhonghu <xuzhonghu@huawei.com>
Date: Sat, 9 Mar 2019 10:51:22 +0800
Subject: [PATCH 1/3] fix MeshNetworks demo

---
 mesh/v1alpha1/network.proto | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/mesh/v1alpha1/network.proto b/mesh/v1alpha1/network.proto
index a55c416cfe..1c36c9d981 100644
--- a/mesh/v1alpha1/network.proto
+++ b/mesh/v1alpha1/network.proto
@@ -35,7 +35,7 @@ message Network {
   //
   // 2. Explicitly:
   //
-  //    a. By matching the registry name with one of the "from_registries"
+  //    a. By matching the registry name with one of the "from_registry"
   //    in the mesh config. A "from_registry" can only be assigned to a
   //    single network.
   //
@@ -97,14 +97,17 @@ message Network {
 //
 // MeshNetworks(file/config map):
 // networks:
-// - network1:
+//   network1:
 //   - endpoints:
-//     - fromRegistry: registry1 #must match secret name inKubernetes
+//     - fromRegistry: registry1 #must match secret name in Kubernetes
 //     - fromCidr: 192.168.100.0/22 #a VM network for example
 //     gateways:
 //     - registryServiceName: istio-ingressgateway.istio-system.svc.cluster.local
 //       port: 15443
 //       locality: us-east-1a
+//     - address: 192.168.100.1
+//       port: 15443
+//       locality: us-east-1a
 message MeshNetworks {
   // REQUIRED: The set of networks inside this mesh. Each network should
   // have a unique name and information about how to infer the endpoints in

From 3cc8d22466309793317811c377a77acf35ad4376 Mon Sep 17 00:00:00 2001
From: xuzhonghu <xuzhonghu@huawei.com>
Date: Sat, 9 Mar 2019 11:03:54 +0800
Subject: [PATCH 2/3] generate

---
 mesh/v1alpha1/istio.mesh.v1alpha1.pb.html | 9 ++++++---
 mesh/v1alpha1/network.pb.go               | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
index d4d0be852a..caf9d6226d 100644
--- a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
+++ b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
@@ -620,12 +620,15 @@ <h2 id="MeshNetworks">MeshNetworks</h2>
 
 <p>MeshNetworks(file/config map):
 networks:
-- network1:
+  network1:
   - endpoints:
-    - fromRegistry: registry1 #must match secret name inKubernetes
+    - fromRegistry: registry1 #must match secret name in Kubernetes
     - fromCidr: 192.168.100.0/22 #a VM network for example
     gateways:
     - registryServiceName: istio-ingressgateway.istio-system.svc.cluster.local
+      port: 15443
+      locality: us-east-1a
+    - address: 192.168.100.1
       port: 15443
       locality: us-east-1a</p>
 
@@ -760,7 +763,7 @@ <h2 id="Network-NetworkEndpoints">Network.NetworkEndpoints</h2>
 <li><p>Explicitly:</p></li>
 </ol>
 
-<p>a. By matching the registry name with one of the &ldquo;from<em>registries&rdquo;
+<p>a. By matching the registry name with one of the &ldquo;from<em>registry&rdquo;
    in the mesh config. A &ldquo;from</em>registry&rdquo; can only be assigned to a
    single network.</p>
 
diff --git a/mesh/v1alpha1/network.pb.go b/mesh/v1alpha1/network.pb.go
index 078d6a2610..0db2174706 100644
--- a/mesh/v1alpha1/network.pb.go
+++ b/mesh/v1alpha1/network.pb.go
@@ -96,7 +96,7 @@ func (m *Network) GetGateways() []*Network_IstioNetworkGateway {
 //
 // 2. Explicitly:
 //
-//    a. By matching the registry name with one of the "from_registries"
+//    a. By matching the registry name with one of the "from_registry"
 //    in the mesh config. A "from_registry" can only be assigned to a
 //    single network.
 //
@@ -423,14 +423,17 @@ func _Network_IstioNetworkGateway_OneofSizer(msg proto.Message) (n int) {
 //
 // MeshNetworks(file/config map):
 // networks:
-// - network1:
+//   network1:
 //   - endpoints:
-//     - fromRegistry: registry1 #must match secret name inKubernetes
+//     - fromRegistry: registry1 #must match secret name in Kubernetes
 //     - fromCidr: 192.168.100.0/22 #a VM network for example
 //     gateways:
 //     - registryServiceName: istio-ingressgateway.istio-system.svc.cluster.local
 //       port: 15443
 //       locality: us-east-1a
+//     - address: 192.168.100.1
+//       port: 15443
+//       locality: us-east-1a
 type MeshNetworks struct {
 	// REQUIRED: The set of networks inside this mesh. Each network should
 	// have a unique name and information about how to infer the endpoints in

From cbd37b23ba3356c9f48f37cb991eb32237d1a5bd Mon Sep 17 00:00:00 2001
From: xuzhonghu <xuzhonghu@huawei.com>
Date: Mon, 11 Mar 2019 09:41:36 +0800
Subject: [PATCH 3/3] update

---
 mesh/v1alpha1/istio.mesh.v1alpha1.pb.html | 4 ++--
 mesh/v1alpha1/network.pb.go               | 2 +-
 mesh/v1alpha1/network.proto               | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
index caf9d6226d..6b97508a9b 100644
--- a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
+++ b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
@@ -763,8 +763,8 @@ <h2 id="Network-NetworkEndpoints">Network.NetworkEndpoints</h2>
 <li><p>Explicitly:</p></li>
 </ol>
 
-<p>a. By matching the registry name with one of the &ldquo;from<em>registry&rdquo;
-   in the mesh config. A &ldquo;from</em>registry&rdquo; can only be assigned to a
+<p>a. By matching the registry name with one of the &ldquo;fromRegistry&rdquo;
+   in the mesh config. A &ldquo;from_registry&rdquo; can only be assigned to a
    single network.</p>
 
 <p>b. By matching the IP against one of the CIDR ranges in a mesh
diff --git a/mesh/v1alpha1/network.pb.go b/mesh/v1alpha1/network.pb.go
index 0db2174706..2695a36a37 100644
--- a/mesh/v1alpha1/network.pb.go
+++ b/mesh/v1alpha1/network.pb.go
@@ -96,7 +96,7 @@ func (m *Network) GetGateways() []*Network_IstioNetworkGateway {
 //
 // 2. Explicitly:
 //
-//    a. By matching the registry name with one of the "from_registry"
+//    a. By matching the registry name with one of the "fromRegistry"
 //    in the mesh config. A "from_registry" can only be assigned to a
 //    single network.
 //
diff --git a/mesh/v1alpha1/network.proto b/mesh/v1alpha1/network.proto
index 1c36c9d981..aa088800f0 100644
--- a/mesh/v1alpha1/network.proto
+++ b/mesh/v1alpha1/network.proto
@@ -35,7 +35,7 @@ message Network {
   //
   // 2. Explicitly:
   //
-  //    a. By matching the registry name with one of the "from_registry"
+  //    a. By matching the registry name with one of the "fromRegistry"
   //    in the mesh config. A "from_registry" can only be assigned to a
   //    single network.
   //
@@ -113,4 +113,4 @@ message MeshNetworks {
   // have a unique name and information about how to infer the endpoints in
   // the network as well as the gateways associated with the network.
   map<string, Network> networks = 1;
-}
\ No newline at end of file
+}