grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xds: update envoy to 89eb31bcbe2308bf1e9073620e843bf472363495 (#5972) 

* xds: update envoy to 89eb31bcbe2308bf1e9073620e843bf472363495

* run import.sh
This commit is contained in:
ZHANG Dapeng 2019-07-09 21:19:53 -07:00 committed by Chengyuan Zhang
parent d974bea4b1
commit d648e8f2df
17 changed files with 56 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xds/third_party/envoy/import.sh vendored
View File

@ -20,7 +20,7 @@
set -e set -e
BRANCH=master BRANCH=master
# import VERSION from one of the google internal CLs # import VERSION from one of the google internal CLs
VERSION=eefcd0e6fcbeba446454bd5396a34c69348338eb VERSION=89eb31bcbe2308bf1e9073620e843bf472363495
GIT_REPO="https://github.com/envoyproxy/envoy.git" GIT_REPO="https://github.com/envoyproxy/envoy.git"
GIT_BASE_DIR=envoy GIT_BASE_DIR=envoy
SOURCE_PROTO_BASE_DIR=envoy/api SOURCE_PROTO_BASE_DIR=envoy/api

4
xds/third_party/envoy/src/main/proto/envoy/api/v2/auth/cert.proto vendored
View File

@ -13,9 +13,9 @@ import "envoy/api/v2/core/config_source.proto";
import "google/protobuf/wrappers.proto"; import "google/protobuf/wrappers.proto";
import "validate/validate.proto"; import "validate/validate.proto";
import "gogoproto/gogo.proto";
option (gogoproto.equal_all) = true;
// [#protodoc-title: Common TLS configuration] // [#protodoc-title: Common TLS configuration]

14
xds/third_party/envoy/src/main/proto/envoy/api/v2/cds.proto vendored
View File

@ -27,10 +27,10 @@ import "google/protobuf/struct.proto";
import "google/protobuf/wrappers.proto"; import "google/protobuf/wrappers.proto";
import "validate/validate.proto"; import "validate/validate.proto";
import "gogoproto/gogo.proto";
option (gogoproto.equal_all) = true;
option (gogoproto.stable_marshaler_all) = true;
// Return list of all clusters this proxy will load balance to. // Return list of all clusters this proxy will load balance to.
service ClusterDiscoveryService { service ClusterDiscoveryService {
@ -127,7 +127,9 @@ message Cluster {
// The timeout for new network connections to hosts in the cluster. // The timeout for new network connections to hosts in the cluster.
google.protobuf.Duration connect_timeout = 4 [ google.protobuf.Duration connect_timeout = 4 [
(validate.rules).duration.gt = {} (validate.rules).duration.gt = {},
(gogoproto.stdduration) = true,
(gogoproto.nullable) = false
]; ];
// Soft limit on size of the cluster’s connections read and write buffers. If // Soft limit on size of the cluster’s connections read and write buffers. If
@ -270,7 +272,7 @@ message Cluster {
// and :ref:`LOGICAL_DNS<envoy_api_enum_value_Cluster.DiscoveryType.LOGICAL_DNS>` // and :ref:`LOGICAL_DNS<envoy_api_enum_value_Cluster.DiscoveryType.LOGICAL_DNS>`
// this setting is ignored. // this setting is ignored.
google.protobuf.Duration dns_refresh_rate = 16 google.protobuf.Duration dns_refresh_rate = 16
[(validate.rules).duration.gt = {}]; [(validate.rules).duration.gt = {}, (gogoproto.stdduration) = true];
// When V4_ONLY is selected, the DNS resolver will only perform a lookup for // When V4_ONLY is selected, the DNS resolver will only perform a lookup for
// addresses in the IPv4 family. If V6_ONLY is selected, the DNS resolver will // addresses in the IPv4 family. If V6_ONLY is selected, the DNS resolver will
@ -324,7 +326,7 @@ message Cluster {
// :ref:`ORIGINAL_DST<envoy_api_enum_value_Cluster.DiscoveryType.ORIGINAL_DST>` // :ref:`ORIGINAL_DST<envoy_api_enum_value_Cluster.DiscoveryType.ORIGINAL_DST>`
// this setting is ignored. // this setting is ignored.
google.protobuf.Duration cleanup_interval = 20 google.protobuf.Duration cleanup_interval = 20
[(validate.rules).duration.gt = {}]; [(validate.rules).duration.gt = {}, (gogoproto.stdduration) = true];
// Optional configuration used to bind newly established upstream connections. // Optional configuration used to bind newly established upstream connections.
// This overrides any bind_config specified in the bootstrap proto. // This overrides any bind_config specified in the bootstrap proto.

4
xds/third_party/envoy/src/main/proto/envoy/api/v2/cluster/circuit_breaker.proto vendored
View File

@ -13,9 +13,9 @@ import "envoy/api/v2/core/base.proto";
import "google/protobuf/wrappers.proto"; import "google/protobuf/wrappers.proto";
import "gogoproto/gogo.proto";
option (gogoproto.equal_all) = true;
// [#protodoc-title: Circuit breakers] // [#protodoc-title: Circuit breakers]

4
xds/third_party/envoy/src/main/proto/envoy/api/v2/cluster/outlier_detection.proto vendored
View File

@ -12,9 +12,9 @@ import "google/protobuf/duration.proto";
import "google/protobuf/wrappers.proto"; import "google/protobuf/wrappers.proto";
import "validate/validate.proto"; import "validate/validate.proto";
import "gogoproto/gogo.proto";
option (gogoproto.equal_all) = true;
// [#protodoc-title: Outlier detection] // [#protodoc-title: Outlier detection]

7
xds/third_party/envoy/src/main/proto/envoy/api/v2/core/address.proto vendored
View File

@ -11,9 +11,9 @@ import "envoy/api/v2/core/base.proto";
import "google/protobuf/wrappers.proto"; import "google/protobuf/wrappers.proto";
import "validate/validate.proto"; import "validate/validate.proto";
import "gogoproto/gogo.proto";
option (gogoproto.equal_all) = true;
// [#protodoc-title: Network addresses] // [#protodoc-title: Network addresses]
@ -27,6 +27,7 @@ message Pipe {
message SocketAddress { message SocketAddress {
enum Protocol { enum Protocol {
option (gogoproto.goproto_enum_prefix) = false;
TCP = 0; TCP = 0;
// [#not-implemented-hide:] // [#not-implemented-hide:]
UDP = 1; UDP = 1;
@ -83,7 +84,7 @@ message TcpKeepalive {
message BindConfig { message BindConfig {
// The address to bind to when creating a socket. // The address to bind to when creating a socket.
SocketAddress source_address = 1 SocketAddress source_address = 1
[(validate.rules).message.required = true]; [(validate.rules).message.required = true, (gogoproto.nullable) = false];
// Whether to set the *IP_FREEBIND* option when creating the socket. When this // Whether to set the *IP_FREEBIND* option when creating the socket. When this
// flag is set to true, allows the :ref:`source_address // flag is set to true, allows the :ref:`source_address

9
xds/third_party/envoy/src/main/proto/envoy/api/v2/core/base.proto vendored
View File

@ -12,12 +12,12 @@ import "google/protobuf/struct.proto";
import "google/protobuf/wrappers.proto"; import "google/protobuf/wrappers.proto";
import "validate/validate.proto"; import "validate/validate.proto";
import "gogoproto/gogo.proto";
import "envoy/type/percent.proto"; import "envoy/type/percent.proto";
option (gogoproto.equal_all) = true;
option (gogoproto.stable_marshaler_all) = true;
// [#protodoc-title: Common types] // [#protodoc-title: Common types]
@ -130,7 +130,7 @@ enum RoutingPriority {
// HTTP request method. // HTTP request method.
enum RequestMethod { enum RequestMethod {
option (gogoproto.goproto_enum_prefix) = false;
METHOD_UNSPECIFIED = 0; METHOD_UNSPECIFIED = 0;
GET = 1; GET = 1;
HEAD = 2; HEAD = 2;
@ -224,6 +224,7 @@ message SocketOption {
bytes buf_value = 5; bytes buf_value = 5;
} }
enum SocketState { enum SocketState {
option (gogoproto.goproto_enum_prefix) = false;
// Socket options are applied after socket creation but before binding the socket to a port // Socket options are applied after socket creation but before binding the socket to a port
STATE_PREBIND = 0; STATE_PREBIND = 0;
// Socket options are applied after binding the socket to a port but before calling listen() // Socket options are applied after binding the socket to a port but before calling listen()

8
xds/third_party/envoy/src/main/proto/envoy/api/v2/core/config_source.proto vendored
View File

@ -12,9 +12,9 @@ import "google/protobuf/duration.proto";
import "google/protobuf/wrappers.proto"; import "google/protobuf/wrappers.proto";
import "validate/validate.proto"; import "validate/validate.proto";
import "gogoproto/gogo.proto";
option (gogoproto.equal_all) = true;
// [#protodoc-title: Configuration sources] // [#protodoc-title: Configuration sources]
@ -56,11 +56,11 @@ message ApiConfigSource {
repeated GrpcService grpc_services = 4; repeated GrpcService grpc_services = 4;
// For REST APIs, the delay between successive polls. // For REST APIs, the delay between successive polls.
google.protobuf.Duration refresh_delay = 3; google.protobuf.Duration refresh_delay = 3 [(gogoproto.stdduration) = true];
// For REST APIs, the request timeout. If not set, a default value of 1s will be used. // For REST APIs, the request timeout. If not set, a default value of 1s will be used.
google.protobuf.Duration request_timeout = 5 google.protobuf.Duration request_timeout = 5
[(validate.rules).duration.gt.seconds = 0]; [(validate.rules).duration.gt.seconds = 0, (gogoproto.stdduration) = true];
// For GRPC APIs, the rate limit settings. If present, discovery requests made by Envoy will be // For GRPC APIs, the rate limit settings. If present, discovery requests made by Envoy will be
// rate limited. // rate limited.

4
xds/third_party/envoy/src/main/proto/envoy/api/v2/core/grpc_service.proto vendored
View File

@ -14,9 +14,9 @@ import "google/protobuf/struct.proto";
import "google/protobuf/empty.proto"; import "google/protobuf/empty.proto";
import "validate/validate.proto"; import "validate/validate.proto";
import "gogoproto/gogo.proto";
option (gogoproto.equal_all) = true;
// [#protodoc-title: gRPC services] // [#protodoc-title: gRPC services]

10
xds/third_party/envoy/src/main/proto/envoy/api/v2/core/health_check.proto vendored
View File

@ -15,9 +15,9 @@ import "google/protobuf/struct.proto";
import "google/protobuf/wrappers.proto"; import "google/protobuf/wrappers.proto";
import "validate/validate.proto"; import "validate/validate.proto";
import "gogoproto/gogo.proto";
option (gogoproto.equal_all) = true;
// [#protodoc-title: Health check] // [#protodoc-title: Health check]
// * Health checking :ref:`architecture overview <arch_overview_health_checking>`. // * Health checking :ref:`architecture overview <arch_overview_health_checking>`.
@ -31,7 +31,8 @@ message HealthCheck {
(validate.rules).duration = { (validate.rules).duration = {
required: true, required: true,
gt: {seconds: 0} gt: {seconds: 0}
} },
(gogoproto.stdduration) = true
]; ];
// The interval between health checks. // The interval between health checks.
@ -39,7 +40,8 @@ message HealthCheck {
(validate.rules).duration = { (validate.rules).duration = {
required: true, required: true,
gt: {seconds: 0} gt: {seconds: 0}
} },
(gogoproto.stdduration) = true
]; ];
// An optional jitter amount in milliseconds. If specified, Envoy will start health // An optional jitter amount in milliseconds. If specified, Envoy will start health

6
xds/third_party/envoy/src/main/proto/envoy/api/v2/core/protocol.proto vendored
View File

@ -12,9 +12,9 @@ import "google/protobuf/duration.proto";
import "google/protobuf/wrappers.proto"; import "google/protobuf/wrappers.proto";
import "validate/validate.proto"; import "validate/validate.proto";
import "gogoproto/gogo.proto";
option (gogoproto.equal_all) = true;
// [#protodoc-title: Protocol options] // [#protodoc-title: Protocol options]
@ -27,7 +27,7 @@ message HttpProtocolOptions {
// period in which there are no active requests. If not set, there is no idle timeout. When the // period in which there are no active requests. If not set, there is no idle timeout. When the
// idle timeout is reached the connection will be closed. Note that request based timeouts mean // idle timeout is reached the connection will be closed. Note that request based timeouts mean
// that HTTP/2 PINGs will not keep the connection alive. // that HTTP/2 PINGs will not keep the connection alive.
google.protobuf.Duration idle_timeout = 1; google.protobuf.Duration idle_timeout = 1 [(gogoproto.stdduration) = true];
} }
message Http1ProtocolOptions { message Http1ProtocolOptions {

10
xds/third_party/envoy/src/main/proto/envoy/api/v2/discovery.proto vendored
View File

@ -11,10 +11,10 @@ import "envoy/api/v2/core/base.proto";
import "google/protobuf/any.proto"; import "google/protobuf/any.proto";
import "google/rpc/status.proto"; import "google/rpc/status.proto";
import "gogoproto/gogo.proto";
option (gogoproto.equal_all) = true;
option (gogoproto.stable_marshaler_all) = true;
// [#protodoc-title: Common discovery API components] // [#protodoc-title: Common discovery API components]
@ -65,7 +65,7 @@ message DiscoveryResponse {
string version_info = 1; string version_info = 1;
// The response resources. These resources are typed and depend on the API being called. // The response resources. These resources are typed and depend on the API being called.
repeated google.protobuf.Any resources = 2; repeated google.protobuf.Any resources = 2 [(gogoproto.nullable) = false];
// [#not-implemented-hide:] // [#not-implemented-hide:]
// Canary is used to support two Envoy command line flags: // Canary is used to support two Envoy command line flags:
@ -196,7 +196,7 @@ message DeltaDiscoveryResponse {
// The response resources. These are typed resources, whose types must match // The response resources. These are typed resources, whose types must match
// the type_url field. // the type_url field.
repeated Resource resources = 2; repeated Resource resources = 2 [(gogoproto.nullable) = false];
// field id 3 IS available! // field id 3 IS available!

8
xds/third_party/envoy/src/main/proto/envoy/api/v2/eds.proto vendored
View File

@ -15,12 +15,12 @@ import "envoy/type/percent.proto";
import "google/api/annotations.proto"; import "google/api/annotations.proto";
import "validate/validate.proto"; import "validate/validate.proto";
import "gogoproto/gogo.proto";
import "google/protobuf/wrappers.proto"; import "google/protobuf/wrappers.proto";
import "google/protobuf/duration.proto"; import "google/protobuf/duration.proto";
option (gogoproto.equal_all) = true;
option (gogoproto.stable_marshaler_all) = true;
// [#protodoc-title: EDS] // [#protodoc-title: EDS]
// Endpoint discovery :ref:`architecture overview <arch_overview_service_discovery_types_eds>` // Endpoint discovery :ref:`architecture overview <arch_overview_service_discovery_types_eds>`
@ -59,7 +59,7 @@ message ClusterLoadAssignment {
string cluster_name = 1 [(validate.rules).string.min_bytes = 1]; string cluster_name = 1 [(validate.rules).string.min_bytes = 1];
// List of endpoints to load balance to. // List of endpoints to load balance to.
repeated endpoint.LocalityLbEndpoints endpoints = 2; repeated endpoint.LocalityLbEndpoints endpoints = 2 [(gogoproto.nullable) = false];
// Map of named endpoints that can be referenced in LocalityLbEndpoints. // Map of named endpoints that can be referenced in LocalityLbEndpoints.
map<string, endpoint.Endpoint> named_endpoints = 5; map<string, endpoint.Endpoint> named_endpoints = 5;

6
xds/third_party/envoy/src/main/proto/envoy/api/v2/endpoint/endpoint.proto vendored
View File

@ -14,9 +14,9 @@ import "envoy/api/v2/core/health_check.proto";
import "google/protobuf/wrappers.proto"; import "google/protobuf/wrappers.proto";
import "validate/validate.proto"; import "validate/validate.proto";
import "gogoproto/gogo.proto";
option (gogoproto.equal_all) = true;
// [#protodoc-title: Endpoints] // [#protodoc-title: Endpoints]
@ -101,7 +101,7 @@ message LocalityLbEndpoints {
core.Locality locality = 1; core.Locality locality = 1;
// The group of endpoints belonging to the locality specified. // The group of endpoints belonging to the locality specified.
repeated LbEndpoint lb_endpoints = 2; repeated LbEndpoint lb_endpoints = 2 [(gogoproto.nullable) = false];
// Optional: Per priority/region/zone/sub_zone weight - range 1-128. The load // Optional: Per priority/region/zone/sub_zone weight - range 1-128. The load
// balancing weight for a locality is divided by the sum of the weights of all // balancing weight for a locality is divided by the sum of the weights of all

2
xds/third_party/envoy/src/main/proto/envoy/api/v2/endpoint/load_report.proto vendored
View File

@ -13,7 +13,7 @@ import "google/protobuf/duration.proto";
import "google/protobuf/struct.proto"; import "google/protobuf/struct.proto";
import "validate/validate.proto"; import "validate/validate.proto";
import "gogoproto/gogo.proto";
// These are stats Envoy reports to GLB every so often. Report frequency is // These are stats Envoy reports to GLB every so often. Report frequency is
// defined by // defined by

4
xds/third_party/envoy/src/main/proto/envoy/type/percent.proto vendored
View File

@ -7,9 +7,9 @@ option java_multiple_files = true;
option java_package = "io.envoyproxy.envoy.type"; option java_package = "io.envoyproxy.envoy.type";
import "validate/validate.proto"; import "validate/validate.proto";
import "gogoproto/gogo.proto";
option (gogoproto.equal_all) = true;
// [#protodoc-title: Percent] // [#protodoc-title: Percent]

4
xds/third_party/envoy/src/main/proto/envoy/type/range.proto vendored
View File

@ -7,9 +7,9 @@ option java_multiple_files = true;
option java_package = "io.envoyproxy.envoy.type"; option java_package = "io.envoyproxy.envoy.type";
option go_package = "envoy_type"; option go_package = "envoy_type";
import "gogoproto/gogo.proto";
option (gogoproto.equal_all) = true;
// [#protodoc-title: Range] // [#protodoc-title: Range]