Skip to content

Commit

Permalink
Bump release-1.0 (istio#572)
Browse files Browse the repository at this point in the history
* Add a Readme.md file for the MCP protocol. (istio#565)

* Add a Readme.md file for the MCP protocol.

* Add a link to the XDS protocol.

* source_ip field is bool (istio#568)

* source_ip field is bool

- on the envoy side the source_ip field is
used as an indicator to determine whether or not
to use it as the hash value.

https://github.com/envoyproxy/envoy/blob/2c3c3e7546451a03cf4b7e9036ee48dda26fe49c/api/envoy/api/v2/route/route.proto#L535

* field now called use_source_ip

* Fix typos in comments. (istio#571)
  • Loading branch information
zachgersh authored and rshriram committed Jul 5, 2018
1 parent 80b4a7b commit 7026625
Show file tree
Hide file tree
Showing 14 changed files with 202 additions and 191 deletions.
13 changes: 13 additions & 0 deletions config/mcp/Readme.md
@@ -0,0 +1,13 @@
# Mesh Configuration Protocol Protos

This folder contains the proto buffers used by the Mesh Configuration Protocol,
an [XDS](https://github.com/envoyproxy/data-plane-api/blob/master/XDS_PROTOCOL.md#streaming-grpc-subscriptions)
inspired protocol for transferring configuration among Istio components
during runtime.

The protocol buffers in this folder are not used for configuring Istio.
Instead, they define an internal protocol through which the configuration proto
instances can be delivered to components, such as Mixer and Pilot.

The server side of the protocol is implemented in Galley, Istio's config
aggregation and distribution component.
244 changes: 121 additions & 123 deletions networking/v1alpha3/destination_rule.pb.go

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion networking/v1alpha3/destination_rule.proto
Expand Up @@ -302,7 +302,7 @@ message LoadBalancerSettings {
HTTPCookie http_cookie = 2;

// Hash based on the source IP address.
string source_ip = 3;
bool use_source_ip = 3;
};

// The minimum number of virtual nodes to use for the hash
Expand Down
6 changes: 3 additions & 3 deletions networking/v1alpha3/envoy_filter.pb.go

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

6 changes: 3 additions & 3 deletions networking/v1alpha3/envoy_filter.proto
Expand Up @@ -73,7 +73,7 @@ message EnvoyFilter {
// to be applied to a listener.
message ListenerMatch {
// The service port/gateway port to which traffic is being
// sent/received. If not specified, matches all listeners. Eventhough
// sent/received. If not specified, matches all listeners. Even though
// inbound listeners are generated for the instance/pod ports, only
// service ports should be used to match listeners.
uint32 port_number = 1;
Expand Down Expand Up @@ -119,7 +119,7 @@ message EnvoyFilter {
ListenerProtocol listener_protocol = 4;

// One or more IP addresses to which the listener is bound. If
// specified, should match atleast one address in the list.
// specified, should match at least one address in the list.
repeated string address = 5;
};

Expand Down Expand Up @@ -150,7 +150,7 @@ message EnvoyFilter {

// Envoy filters to be added to a network or http filter chain.
message Filter {
// Filter will be added to the listner only if the match conditions are true.
// Filter will be added to the listener only if the match conditions are true.
// If not specified, the filters will be applied to all listeners.
ListenerMatch listener_match = 1;

Expand Down
14 changes: 7 additions & 7 deletions networking/v1alpha3/istio.networking.v1alpha3.pb.html
Expand Up @@ -766,7 +766,7 @@ <h2 id="EnvoyFilter-Filter">EnvoyFilter.Filter</h2>
<td><code>listenerMatch</code></td>
<td><code><a href="#EnvoyFilter-ListenerMatch">EnvoyFilter.ListenerMatch</a></code></td>
<td>
<p>Filter will be added to the listner only if the match conditions are true.
<p>Filter will be added to the listener only if the match conditions are true.
If not specified, the filters will be applied to all listeners.</p>

</td>
Expand Down Expand Up @@ -938,7 +938,7 @@ <h2 id="EnvoyFilter-ListenerMatch">EnvoyFilter.ListenerMatch</h2>
<td><code>uint32</code></td>
<td>
<p>The service port/gateway port to which traffic is being
sent/received. If not specified, matches all listeners. Eventhough
sent/received. If not specified, matches all listeners. Even though
inbound listeners are generated for the instance/pod ports, only
service ports should be used to match listeners.</p>

Expand Down Expand Up @@ -981,7 +981,7 @@ <h2 id="EnvoyFilter-ListenerMatch">EnvoyFilter.ListenerMatch</h2>
<td><code>string[]</code></td>
<td>
<p>One or more IP addresses to which the listener is bound. If
specified, should match atleast one address in the list.</p>
specified, should match at least one address in the list.</p>

</td>
</tr>
Expand Down Expand Up @@ -2000,9 +2000,9 @@ <h2 id="LoadBalancerSettings-ConsistentHashLB">LoadBalancerSettings.ConsistentHa

</td>
</tr>
<tr id="LoadBalancerSettings-ConsistentHashLB-source_ip" class="oneof">
<td><code>sourceIp</code></td>
<td><code>string (oneof)</code></td>
<tr id="LoadBalancerSettings-ConsistentHashLB-use_source_ip" class="oneof">
<td><code>useSourceIp</code></td>
<td><code>bool (oneof)</code></td>
<td>
<p>Hash based on the source IP address.</p>

Expand Down Expand Up @@ -2782,7 +2782,7 @@ <h2 id="ServiceEntry">ServiceEntry</h2>
the destination will be identified based on the HTTP Host/Authority
header. For non-HTTP protocols such as mongo/opaque TCP/even HTTPS,
the hosts will be ignored. If one or more IP addresses are specified,
the incoming traffic will be idenfified as belonging to this service
the incoming traffic will be identified as belonging to this service
if the destination IP matches the IP/CIDRs specified in the addresses
field. If the Addresses field is empty, traffic will be identified
solely based on the destination port. In such scenarios, the port on
Expand Down
2 changes: 1 addition & 1 deletion networking/v1alpha3/service_entry.pb.go

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

2 changes: 1 addition & 1 deletion networking/v1alpha3/service_entry.proto
Expand Up @@ -298,7 +298,7 @@ message ServiceEntry {
// the destination will be identified based on the HTTP Host/Authority
// header. For non-HTTP protocols such as mongo/opaque TCP/even HTTPS,
// the hosts will be ignored. If one or more IP addresses are specified,
// the incoming traffic will be idenfified as belonging to this service
// the incoming traffic will be identified as belonging to this service
// if the destination IP matches the IP/CIDRs specified in the addresses
// field. If the Addresses field is empty, traffic will be identified
// solely based on the destination port. In such scenarios, the port on
Expand Down
48 changes: 24 additions & 24 deletions python/istio_api/networking/v1alpha3/destination_rule_pb2.py

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

0 comments on commit 7026625

Please sign in to comment.