diff --git a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html index d4d0be852ae..6b97508a9b8 100644 --- a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html +++ b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html @@ -620,12 +620,15 @@
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
@@ -760,8 +763,8 @@Explicitly:
a. By matching the registry name with one of the “fromregistries” - in the mesh config. A “fromregistry” can only be assigned to a +
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.
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 078d6a26104..2695a36a370 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 "fromRegistry"
// 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
diff --git a/mesh/v1alpha1/network.proto b/mesh/v1alpha1/network.proto
index a55c416cfe5..aa088800f02 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 "fromRegistry"
// in the mesh config. A "from_registry" can only be assigned to a
// single network.
//
@@ -97,17 +97,20 @@ 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
// the network as well as the gateways associated with the network.
map