Skip to content

fix MeshNetworks demo #841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 17, 2019
Merged

fix MeshNetworks demo #841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8cb1000
fix MeshNetworks demo
hzxuzhonghu Mar 9, 2019
3cc8d22
generate
hzxuzhonghu Mar 9, 2019
cbd37b2
update
hzxuzhonghu Mar 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions mesh/v1alpha1/network.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 7 additions & 4 deletions mesh/v1alpha1/network.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
//
Expand Down Expand Up @@ -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<string, Network> networks = 1;
}
}