diff --git a/kubernetes/customresourcedefinitions.gen.yaml b/kubernetes/customresourcedefinitions.gen.yaml index faddc02a754..a6a7f99a876 100644 --- a/kubernetes/customresourcedefinitions.gen.yaml +++ b/kubernetes/customresourcedefinitions.gen.yaml @@ -90,14 +90,14 @@ spec: to a destination. format: int32 type: integer - http2MaxRequests: - description: Maximum number of requests to a backend. - format: int32 - type: integer idleTimeout: description: The idle timeout for upstream connection pool connections. type: string + maxRequests: + description: Maximum number of requests to a backend. + format: int32 + type: integer maxRequestsPerConnection: description: Maximum number of requests per connection to a backend. @@ -324,15 +324,15 @@ spec: requests to a destination. format: int32 type: integer - http2MaxRequests: - description: Maximum number of requests to a - backend. - format: int32 - type: integer idleTimeout: description: The idle timeout for upstream connection pool connections. type: string + maxRequests: + description: Maximum number of requests to a + backend. + format: int32 + type: integer maxRequestsPerConnection: description: Maximum number of requests per connection to a backend. @@ -643,14 +643,14 @@ spec: a destination. format: int32 type: integer - http2MaxRequests: - description: Maximum number of requests to a backend. - format: int32 - type: integer idleTimeout: description: The idle timeout for upstream connection pool connections. type: string + maxRequests: + description: Maximum number of requests to a backend. + format: int32 + type: integer maxRequestsPerConnection: description: Maximum number of requests per connection to a backend. @@ -874,14 +874,14 @@ spec: to a destination. format: int32 type: integer - http2MaxRequests: - description: Maximum number of requests to a backend. - format: int32 - type: integer idleTimeout: description: The idle timeout for upstream connection pool connections. type: string + maxRequests: + description: Maximum number of requests to a backend. + format: int32 + type: integer maxRequestsPerConnection: description: Maximum number of requests per connection to a backend. diff --git a/networking/v1alpha3/destination_rule.gen.json b/networking/v1alpha3/destination_rule.gen.json index efbdacda7d2..717f69fe19b 100644 --- a/networking/v1alpha3/destination_rule.gen.json +++ b/networking/v1alpha3/destination_rule.gen.json @@ -454,7 +454,7 @@ "type": "integer", "format": "int32" }, - "http2MaxRequests": { + "maxRequests": { "description": "Maximum number of requests to a backend. Default 2^32-1.", "type": "integer", "format": "int32" diff --git a/networking/v1alpha3/destination_rule.pb.go b/networking/v1alpha3/destination_rule.pb.go index 30bb257745b..f75f62e8110 100644 --- a/networking/v1alpha3/destination_rule.pb.go +++ b/networking/v1alpha3/destination_rule.pb.go @@ -1373,7 +1373,7 @@ type ConnectionPoolSettings_HTTPSettings struct { // Maximum number of pending HTTP requests to a destination. Default 2^32-1. Http1MaxPendingRequests int32 `protobuf:"varint,1,opt,name=http1_max_pending_requests,json=http1MaxPendingRequests,proto3" json:"http1_max_pending_requests,omitempty"` // Maximum number of requests to a backend. Default 2^32-1. - Http2MaxRequests int32 `protobuf:"varint,2,opt,name=http2_max_requests,json=http2MaxRequests,proto3" json:"http2_max_requests,omitempty"` + MaxRequests int32 `protobuf:"varint,2,opt,name=max_requests,json=maxRequests,proto3" json:"max_requests,omitempty"` // Maximum number of requests per connection to a backend. Setting this // parameter to 1 disables keep alive. Default 0, meaning "unlimited", // up to 2^29. @@ -1440,9 +1440,9 @@ func (m *ConnectionPoolSettings_HTTPSettings) GetHttp1MaxPendingRequests() int32 return 0 } -func (m *ConnectionPoolSettings_HTTPSettings) GetHttp2MaxRequests() int32 { +func (m *ConnectionPoolSettings_HTTPSettings) GetMaxRequests() int32 { if m != nil { - return m.Http2MaxRequests + return m.MaxRequests } return 0 } @@ -1512,7 +1512,7 @@ func (m *ConnectionPoolSettings_HTTPSettings) GetUseClientProtocol() bool { // tcp: // maxConnections: 100 // http: -// http2MaxRequests: 1000 +// maxRequests: 1000 // maxRequestsPerConnection: 10 // outlierDetection: // consecutiveErrors: 7 @@ -1534,7 +1534,7 @@ func (m *ConnectionPoolSettings_HTTPSettings) GetUseClientProtocol() bool { // tcp: // maxConnections: 100 // http: -// http2MaxRequests: 1000 +// maxRequests: 1000 // maxRequestsPerConnection: 10 // outlierDetection: // consecutiveErrors: 7 @@ -2207,121 +2207,121 @@ func init() { } var fileDescriptor_12899beb695152c8 = []byte{ - // 1823 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xcd, 0x73, 0x1b, 0x49, - 0x15, 0xb7, 0x3e, 0x2c, 0xdb, 0x4f, 0xfe, 0x90, 0x3a, 0xae, 0xa0, 0x28, 0x54, 0xd6, 0xa8, 0xa8, - 0x5a, 0x13, 0x36, 0x63, 0xec, 0x6c, 0xa8, 0x65, 0xc3, 0x7e, 0x48, 0xb6, 0x37, 0x32, 0x91, 0x25, - 0xd1, 0x92, 0x29, 0x08, 0x87, 0xa9, 0xd6, 0xa8, 0x2d, 0xf5, 0x7a, 0x34, 0x3d, 0xdb, 0xd3, 0xa3, - 0xc8, 0x39, 0xc3, 0x8d, 0x3f, 0x81, 0xbf, 0x82, 0x13, 0x57, 0x6e, 0x1c, 0xe1, 0x00, 0x67, 0x2a, - 0x07, 0xfe, 0x03, 0xaa, 0x28, 0x4e, 0x54, 0xf7, 0xf4, 0x48, 0xe3, 0xd8, 0x91, 0xe3, 0x78, 0xf7, - 0xd6, 0xfd, 0x3e, 0x7e, 0xfd, 0xfa, 0xf5, 0xef, 0x75, 0xbf, 0x19, 0x78, 0xe8, 0x51, 0xf9, 0x92, - 0x8b, 0x33, 0xe6, 0x0d, 0x76, 0xc6, 0xbb, 0xc4, 0xf5, 0x87, 0xe4, 0xf1, 0x4e, 0x9f, 0x06, 0x92, - 0x79, 0x44, 0x32, 0xee, 0xd9, 0x22, 0x74, 0xa9, 0xe5, 0x0b, 0x2e, 0x39, 0xba, 0xc7, 0x02, 0xc9, - 0xb8, 0x35, 0xf3, 0xb0, 0x62, 0x8f, 0xf2, 0x07, 0x03, 0xce, 0x07, 0x2e, 0xdd, 0x21, 0x3e, 0xdb, - 0x39, 0x65, 0xd4, 0xed, 0xdb, 0x3d, 0x3a, 0x24, 0x63, 0xc6, 0x45, 0xe4, 0x5b, 0x7e, 0x60, 0x0c, - 0xf4, 0xac, 0x17, 0x9e, 0xee, 0xf4, 0x43, 0xa1, 0x17, 0x78, 0x9b, 0xfe, 0xa5, 0x20, 0xbe, 0x4f, - 0x45, 0x60, 0xf4, 0x3f, 0xba, 0x2a, 0xce, 0x31, 0x13, 0x32, 0x24, 0xae, 0x1d, 0x50, 0x31, 0x66, - 0x8e, 0x09, 0xb3, 0xbc, 0x39, 0xe0, 0x03, 0xae, 0x87, 0x3b, 0x6a, 0x14, 0x49, 0x2b, 0xff, 0x4c, - 0xc1, 0xc6, 0xc1, 0x6c, 0x5f, 0x38, 0x74, 0x29, 0x2a, 0x41, 0x76, 0xc8, 0x03, 0x59, 0x4a, 0x6d, - 0xa5, 0xb6, 0x57, 0x6a, 0xd9, 0xd7, 0xd5, 0x54, 0x1a, 0x6b, 0x09, 0x6a, 0xc1, 0xba, 0x14, 0xe4, - 0xf4, 0x94, 0x39, 0xb6, 0xcf, 0x5d, 0xe6, 0x9c, 0x97, 0xd2, 0x5b, 0xa9, 0xed, 0xfc, 0xde, 0xb6, - 0xf5, 0xd6, 0x1c, 0x58, 0xdd, 0xc8, 0xa1, 0xad, 0xed, 0xf1, 0x9a, 0x4c, 0x4e, 0xd1, 0x53, 0x58, - 0x0a, 0xc2, 0x5e, 0x40, 0x65, 0x50, 0xca, 0x6c, 0x65, 0xb6, 0xf3, 0x7b, 0x3f, 0x98, 0x83, 0xd4, - 0xd1, 0x96, 0x38, 0xf6, 0x40, 0xf7, 0x61, 0x85, 0x4e, 0x7c, 0x2e, 0xa4, 0x2d, 0x79, 0x29, 0xbb, - 0x95, 0xd9, 0x5e, 0xc1, 0xcb, 0x91, 0xa0, 0xcb, 0x2b, 0xff, 0xce, 0xc1, 0xda, 0x85, 0xa5, 0x51, - 0x17, 0xd6, 0x5c, 0x4e, 0xfa, 0x76, 0x8f, 0xb8, 0xc4, 0x73, 0xa8, 0xd0, 0xfb, 0xcb, 0xef, 0xed, - 0xcc, 0x59, 0xb1, 0xc1, 0x49, 0xbf, 0x66, 0xcc, 0x3b, 0x54, 0x4a, 0xe6, 0x0d, 0x02, 0xbc, 0xea, - 0x26, 0xa4, 0xe8, 0x05, 0x6c, 0x38, 0xdc, 0xf3, 0xa8, 0xa3, 0x69, 0xe1, 0x73, 0xee, 0x9a, 0x9c, - 0xec, 0xce, 0xc1, 0xdd, 0x9f, 0x7a, 0xb4, 0x39, 0x77, 0xa7, 0xc8, 0xeb, 0xce, 0x05, 0x39, 0xfa, - 0x35, 0x14, 0x79, 0x28, 0x5d, 0x46, 0x85, 0xdd, 0xa7, 0x32, 0x52, 0x94, 0x32, 0x1a, 0xfd, 0xc7, - 0x73, 0xd0, 0x5b, 0x91, 0xcf, 0x41, 0xec, 0x82, 0x0b, 0xfc, 0x0d, 0x09, 0xfa, 0x1c, 0x32, 0xd2, - 0x0d, 0x4a, 0x59, 0x8d, 0xf5, 0xd1, 0xbc, 0x48, 0x5d, 0x46, 0x3d, 0xd9, 0x6d, 0x74, 0xa6, 0x41, - 0x2a, 0x47, 0xf4, 0x35, 0xdc, 0xd1, 0x89, 0x77, 0xe9, 0x98, 0x2a, 0xa2, 0x45, 0xba, 0xd2, 0xa2, - 0x3e, 0xc3, 0x4f, 0xdf, 0x95, 0x0d, 0x56, 0x5b, 0x9d, 0xd5, 0x05, 0x7e, 0x14, 0x15, 0x6c, 0x43, - 0xa1, 0xc6, 0x0b, 0x96, 0xff, 0x98, 0x81, 0xe2, 0x25, 0x43, 0xf4, 0x14, 0xb2, 0xca, 0xd4, 0x1c, - 0xe2, 0x87, 0x73, 0x96, 0x54, 0xbe, 0x1d, 0xea, 0x52, 0x47, 0x72, 0x81, 0xb5, 0xd3, 0x65, 0x2a, - 0xa4, 0xbf, 0x23, 0x2a, 0x64, 0xbe, 0x53, 0x2a, 0x64, 0xbf, 0x45, 0x2a, 0x2c, 0xbe, 0x27, 0x15, - 0x2a, 0xff, 0x49, 0x41, 0x2e, 0xaa, 0x4c, 0x75, 0x71, 0x78, 0x64, 0x44, 0x2f, 0x5e, 0x1c, 0x4a, - 0x82, 0x0e, 0x21, 0xe7, 0x92, 0x1e, 0x75, 0x83, 0x52, 0x5a, 0x53, 0xe4, 0xd1, 0xb5, 0x65, 0x6e, - 0x35, 0xb4, 0xfd, 0xa1, 0x27, 0xc5, 0x39, 0x36, 0xce, 0x57, 0xdc, 0x3f, 0x99, 0x5b, 0xdd, 0x3f, - 0xe5, 0x9f, 0x41, 0x3e, 0xb1, 0x0e, 0x2a, 0x40, 0xe6, 0x8c, 0x9e, 0x47, 0xf1, 0x63, 0x35, 0x44, - 0x9b, 0xb0, 0x38, 0x26, 0x6e, 0x48, 0x35, 0x43, 0x56, 0x70, 0x34, 0xf9, 0x34, 0xfd, 0x49, 0xaa, - 0xf2, 0xf7, 0x1c, 0x6c, 0x5e, 0x45, 0x0a, 0x84, 0x21, 0x17, 0xb0, 0x91, 0xef, 0x46, 0x79, 0x58, - 0xdf, 0xfb, 0xe4, 0x86, 0xac, 0xb2, 0x3a, 0xda, 0xbb, 0x51, 0xab, 0x2f, 0x60, 0x83, 0x84, 0xce, - 0x34, 0xb5, 0x02, 0x16, 0x48, 0xea, 0x49, 0x7b, 0x48, 0x82, 0xa1, 0xa1, 0xec, 0x97, 0x37, 0x05, - 0xdf, 0x9f, 0xc2, 0xd4, 0x49, 0x30, 0xd4, 0x8b, 0xac, 0x3b, 0x17, 0x64, 0xe8, 0x14, 0xee, 0xb8, - 0xdc, 0x21, 0x2e, 0x93, 0xe7, 0xb6, 0xdb, 0x8b, 0xab, 0xdb, 0xa4, 0xfa, 0xa7, 0x73, 0x17, 0x8c, - 0xbc, 0xae, 0x58, 0x18, 0x17, 0x63, 0xc8, 0x46, 0xcf, 0x88, 0xca, 0x7f, 0xce, 0x40, 0xe1, 0xcd, - 0x70, 0xd0, 0x43, 0x28, 0x0c, 0xa5, 0xf4, 0xed, 0x21, 0x25, 0x7d, 0x2a, 0xec, 0x19, 0x9f, 0x54, - 0xa0, 0x4a, 0x53, 0xd7, 0x8a, 0xa6, 0x62, 0x95, 0x07, 0x79, 0x6d, 0xeb, 0x70, 0x7e, 0xc6, 0xa8, - 0xc9, 0xc8, 0xf3, 0xdb, 0x66, 0xc4, 0xaa, 0x77, 0xbb, 0xed, 0x7d, 0x0d, 0x59, 0x5f, 0xc0, 0xa0, - 0x56, 0x88, 0x66, 0xe8, 0x87, 0xb0, 0x16, 0x06, 0xd4, 0x0e, 0x78, 0x28, 0x1c, 0x6a, 0x33, 0x5f, - 0xa7, 0x64, 0xb9, 0xbe, 0x80, 0xf3, 0x61, 0x40, 0x3b, 0x5a, 0x7a, 0xe4, 0xa3, 0xa7, 0x70, 0x4f, - 0x47, 0xf5, 0x4d, 0x48, 0xc5, 0xb9, 0xed, 0x13, 0x41, 0x46, 0x54, 0xc6, 0x5b, 0x59, 0x34, 0x5b, - 0xb9, 0xab, 0x4c, 0x7e, 0xa9, 0x2c, 0xda, 0xb1, 0x81, 0xde, 0xd2, 0x43, 0x28, 0x8e, 0x98, 0xc7, - 0x46, 0xe1, 0xc8, 0x16, 0xcc, 0x1b, 0xd8, 0x01, 0x7b, 0x45, 0x75, 0x9d, 0x67, 0xf1, 0x86, 0x51, - 0x60, 0xe6, 0x0d, 0x3a, 0xec, 0x15, 0x2d, 0x8f, 0x00, 0x66, 0xa1, 0xce, 0x29, 0x3e, 0x04, 0x59, - 0x9f, 0xc8, 0xa1, 0xa1, 0xb0, 0x1e, 0xa3, 0x5d, 0xc8, 0x48, 0x19, 0xdf, 0x4f, 0xf7, 0xac, 0xa8, - 0xcd, 0xb0, 0xe2, 0x36, 0xc3, 0x3a, 0x30, 0x6d, 0x88, 0xc1, 0x51, 0xb6, 0x35, 0x80, 0x65, 0x45, - 0x3c, 0xfb, 0x8c, 0x9e, 0x57, 0xea, 0xb0, 0x1c, 0xb3, 0x14, 0x6d, 0x40, 0x1e, 0xb7, 0x4e, 0x9a, - 0x07, 0x36, 0x6e, 0xd5, 0x8e, 0x9a, 0x85, 0x05, 0xb4, 0x0e, 0xd0, 0x38, 0xac, 0x76, 0xba, 0xf6, - 0x7e, 0xab, 0xd9, 0x2c, 0xa4, 0x10, 0x40, 0x0e, 0x57, 0x9b, 0x07, 0xad, 0xe3, 0x42, 0x5a, 0x19, - 0xb7, 0xab, 0x9d, 0x4e, 0xb7, 0x8e, 0x5b, 0x27, 0xcf, 0xea, 0x85, 0x4c, 0x2d, 0x0f, 0x2b, 0x6e, - 0xcf, 0x54, 0x73, 0xe5, 0x2f, 0xcb, 0x70, 0xf7, 0xea, 0x0b, 0x11, 0xb5, 0x20, 0x23, 0x1d, 0xdf, - 0x5c, 0xf7, 0x9f, 0xdd, 0xf8, 0x42, 0xb5, 0xba, 0xfb, 0xed, 0xc4, 0xbd, 0xe5, 0xf8, 0x08, 0x43, - 0x56, 0x9d, 0x81, 0x61, 0xcd, 0xe7, 0x37, 0x47, 0x54, 0xb9, 0x9f, 0x42, 0x6a, 0xac, 0xf2, 0xff, - 0xd2, 0x90, 0x4f, 0x2c, 0x84, 0x3e, 0x84, 0x8d, 0x11, 0x99, 0xd8, 0xb3, 0xbb, 0x3c, 0xd0, 0x1b, - 0x58, 0xc4, 0xeb, 0x23, 0x32, 0x99, 0xc1, 0x06, 0xa8, 0x36, 0x7d, 0x3a, 0x6c, 0xc9, 0x46, 0x94, - 0x87, 0xd2, 0xc4, 0xf5, 0xf6, 0xa3, 0x99, 0x3e, 0x11, 0xdd, 0xc8, 0x01, 0x71, 0x58, 0x93, 0x8e, - 0x6f, 0x9f, 0x51, 0xea, 0x13, 0x97, 0x8d, 0xa9, 0x39, 0xdc, 0x5f, 0xdc, 0x2a, 0x57, 0x56, 0xd7, - 0xf1, 0x9f, 0xc7, 0x88, 0x78, 0x55, 0x26, 0x66, 0xe5, 0x3f, 0xa4, 0x60, 0x35, 0xa9, 0x46, 0x77, - 0x21, 0xe7, 0x0b, 0xde, 0xa3, 0xd1, 0x2e, 0xd7, 0xb0, 0x99, 0xa1, 0x47, 0x90, 0x55, 0xbb, 0xba, - 0x7e, 0x4b, 0xda, 0x0c, 0x3d, 0x81, 0x65, 0xe6, 0x49, 0x2a, 0xc6, 0xe4, 0x7a, 0x82, 0xe2, 0xa9, - 0x69, 0xf9, 0x77, 0x59, 0x58, 0x4d, 0x9e, 0x09, 0x7a, 0x0a, 0x65, 0x75, 0x2a, 0xbb, 0xb6, 0x3a, - 0x03, 0x9f, 0x7a, 0x7d, 0x55, 0x50, 0x82, 0x7e, 0x13, 0xd2, 0x40, 0xc6, 0x07, 0xf1, 0x3d, 0x6d, - 0x71, 0x4c, 0x26, 0xed, 0x48, 0x8f, 0x8d, 0x1a, 0x7d, 0x04, 0x48, 0xa9, 0xf6, 0xb4, 0xf3, 0xd4, - 0x29, 0xad, 0x9d, 0xf4, 0x0d, 0xb5, 0x77, 0x4c, 0x26, 0x53, 0xeb, 0xcf, 0xe0, 0x7e, 0xd2, 0xce, - 0xf6, 0xa9, 0x48, 0x9c, 0xba, 0xde, 0xc5, 0x22, 0x2e, 0x8d, 0x66, 0x1e, 0x6d, 0x2a, 0x66, 0xc9, - 0x47, 0x1f, 0x40, 0x3e, 0x72, 0x97, 0x82, 0xd1, 0xa8, 0x2d, 0x5b, 0xc4, 0xa0, 0xcd, 0xb5, 0x04, - 0xfd, 0x1c, 0x56, 0x59, 0xdf, 0xa5, 0x53, 0x72, 0x2c, 0x5e, 0x97, 0x96, 0xbc, 0x32, 0x8f, 0x99, - 0xf1, 0x0a, 0x8a, 0xc3, 0x3d, 0x3b, 0xf4, 0x07, 0x82, 0xf4, 0x69, 0xfc, 0x72, 0xe6, 0xf4, 0xe3, - 0xd4, 0xbc, 0x1d, 0xef, 0xad, 0xfa, 0xde, 0x49, 0x04, 0x6b, 0xde, 0xd7, 0x8d, 0xe1, 0x45, 0x01, - 0xb2, 0xe0, 0x8e, 0xba, 0x33, 0x1d, 0xdd, 0x3c, 0xd8, 0x3a, 0x50, 0x87, 0xbb, 0xa5, 0x25, 0x75, - 0x73, 0xe2, 0x62, 0x18, 0xd0, 0xa8, 0xad, 0x68, 0x1b, 0x45, 0xe5, 0x0b, 0xd8, 0x78, 0x03, 0x13, - 0xe5, 0x61, 0xe9, 0xe0, 0xf0, 0xab, 0xea, 0x49, 0xa3, 0x5b, 0x58, 0x40, 0x08, 0xd6, 0x0f, 0x5a, - 0x76, 0xb3, 0xd5, 0xb5, 0x4f, 0xda, 0xcf, 0x70, 0xf5, 0xe0, 0xb0, 0x90, 0x52, 0x06, 0xf1, 0x24, - 0x5d, 0xf9, 0x47, 0x06, 0x0a, 0x6f, 0xb6, 0x3d, 0x68, 0x17, 0x90, 0x7a, 0xe4, 0xa8, 0x13, 0x4a, - 0x36, 0xa6, 0x36, 0x15, 0x82, 0x0b, 0x43, 0x81, 0x5a, 0xba, 0x94, 0xc2, 0xc5, 0x84, 0xf6, 0x50, - 0x2b, 0xd1, 0x0b, 0x28, 0x27, 0x5d, 0x06, 0x44, 0xd2, 0x97, 0xe4, 0x3c, 0x76, 0xcd, 0xe9, 0x03, - 0xf8, 0xfe, 0xa5, 0x03, 0x38, 0x39, 0xf2, 0xe4, 0xe3, 0xbd, 0x5f, 0xa9, 0x2e, 0x01, 0x97, 0x12, - 0xfe, 0xcf, 0x22, 0x77, 0x83, 0x8d, 0xe1, 0x6e, 0x12, 0xfb, 0xc9, 0x64, 0x12, 0xe3, 0x2e, 0xbd, - 0x03, 0xee, 0x66, 0xc2, 0xf7, 0xc9, 0x64, 0x62, 0x30, 0x93, 0x55, 0x93, 0x7e, 0xe7, 0xaa, 0x41, - 0xcf, 0x00, 0xf5, 0x48, 0x40, 0x6d, 0xfa, 0xb5, 0xe9, 0x5b, 0x75, 0xa5, 0x5e, 0x5b, 0x76, 0x05, - 0xe5, 0x74, 0x68, 0x7c, 0x14, 0xcf, 0xd0, 0x4f, 0x60, 0x53, 0x71, 0x78, 0x8a, 0xe3, 0x53, 0xe1, - 0x50, 0x4f, 0x1a, 0x32, 0xa3, 0x11, 0x99, 0xc4, 0xe6, 0xed, 0x48, 0xa3, 0x4a, 0x6c, 0xc4, 0x3c, - 0xf5, 0xd2, 0xbb, 0x72, 0x38, 0xb5, 0x5f, 0x8c, 0x4a, 0x6c, 0xc4, 0xbc, 0xba, 0x56, 0x18, 0xeb, - 0xca, 0xef, 0x33, 0x50, 0xbc, 0xd4, 0x82, 0xa2, 0x26, 0x64, 0x47, 0xbc, 0x1f, 0xb7, 0x5a, 0x1f, - 0xdf, 0xa4, 0x7d, 0xb5, 0xba, 0x8d, 0x8e, 0xf2, 0x8d, 0xdf, 0x4a, 0x35, 0x46, 0x8f, 0x00, 0x19, - 0xaa, 0x3a, 0x54, 0x48, 0x76, 0xca, 0x1c, 0x22, 0xe3, 0xe6, 0xaf, 0x18, 0x69, 0xf6, 0x67, 0x0a, - 0x55, 0xb8, 0xbe, 0x60, 0x63, 0x22, 0xa9, 0x7a, 0x16, 0x75, 0xda, 0x56, 0x30, 0x18, 0xd1, 0x73, - 0x7a, 0xae, 0x5e, 0x00, 0x87, 0x24, 0xb1, 0xa2, 0xea, 0x5e, 0xc1, 0xeb, 0x0e, 0x49, 0x00, 0xe9, - 0xa7, 0xc2, 0x11, 0xb4, 0x4f, 0x3d, 0xc9, 0x88, 0x1b, 0xf5, 0x0a, 0x4b, 0xc6, 0x70, 0x2a, 0x8e, - 0x3b, 0x84, 0x20, 0xec, 0xa9, 0x54, 0xda, 0xc4, 0x95, 0xda, 0x32, 0xfa, 0xf0, 0x5a, 0xc1, 0x1b, - 0x46, 0x51, 0x75, 0xa5, 0x32, 0x0d, 0x54, 0x3f, 0x1b, 0x78, 0x4c, 0x93, 0x75, 0x05, 0xab, 0x61, - 0xe5, 0x4b, 0x58, 0x32, 0xdb, 0xd6, 0x65, 0x75, 0xd4, 0xa9, 0xd6, 0x1a, 0x87, 0x85, 0x05, 0xf5, - 0x46, 0x77, 0x8e, 0x8e, 0xdb, 0x8d, 0xc3, 0xe8, 0xbd, 0x3e, 0x3e, 0xe9, 0x9e, 0x54, 0x1b, 0x85, - 0x34, 0x2a, 0xc0, 0xea, 0x51, 0xa7, 0x7b, 0xd4, 0xb2, 0x8d, 0x24, 0x53, 0xf9, 0x6f, 0x06, 0xee, - 0xcf, 0x69, 0xf4, 0x10, 0x01, 0xe8, 0xb3, 0x40, 0x0a, 0xd6, 0x0b, 0xa5, 0x3a, 0x17, 0xd5, 0xee, - 0x57, 0xdf, 0xaf, 0x69, 0xb4, 0x0e, 0xa6, 0x40, 0x38, 0x01, 0x8a, 0x7e, 0x0b, 0xcb, 0xa7, 0x84, - 0xb9, 0x7c, 0xac, 0xbf, 0xdc, 0xd4, 0x02, 0x5f, 0xbc, 0xe7, 0x02, 0x5f, 0x19, 0x18, 0x3c, 0x05, - 0x44, 0x1f, 0xc3, 0x12, 0xf5, 0x48, 0xcf, 0xa5, 0x7d, 0x53, 0x05, 0xe5, 0x4b, 0x55, 0x50, 0xe3, - 0xdc, 0x8d, 0x4a, 0x31, 0x36, 0x2d, 0xff, 0x29, 0x05, 0x30, 0x8b, 0x56, 0xb5, 0x5c, 0xa7, 0x82, - 0x8f, 0xcc, 0x97, 0x84, 0x1e, 0xa3, 0xdf, 0x40, 0x5a, 0x72, 0x13, 0xef, 0xd1, 0xad, 0x13, 0x62, - 0x75, 0x79, 0xf4, 0x6d, 0x94, 0x96, 0xbc, 0xfc, 0x04, 0x96, 0xcc, 0xf4, 0xba, 0x4f, 0x98, 0xb5, - 0xc4, 0x27, 0x4c, 0xd9, 0x82, 0xe5, 0x38, 0x01, 0x57, 0x46, 0xbc, 0x6e, 0x22, 0x56, 0x92, 0xb4, - 0xe4, 0x35, 0xeb, 0xaf, 0xaf, 0x1f, 0xa4, 0xfe, 0xf6, 0xfa, 0x41, 0xea, 0x5f, 0xaf, 0x1f, 0xa4, - 0x5e, 0x6c, 0x45, 0x5b, 0x60, 0x5c, 0xff, 0xde, 0xba, 0xe2, 0x47, 0x54, 0x2f, 0xa7, 0x33, 0xf6, - 0xf8, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0xd8, 0xe3, 0xe7, 0xba, 0x4e, 0x13, 0x00, 0x00, + // 1818 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x4f, 0x73, 0x1b, 0x49, + 0x15, 0xb7, 0x34, 0xb2, 0x6c, 0x3f, 0xf9, 0x8f, 0xd4, 0x49, 0x05, 0x45, 0xa1, 0xb2, 0x5e, 0x15, + 0x55, 0x6b, 0xc2, 0x66, 0x8c, 0x9d, 0x0d, 0xb5, 0x6c, 0xd8, 0x3f, 0x92, 0xed, 0x8d, 0x4c, 0x14, + 0x4b, 0xb4, 0x64, 0x0a, 0xc2, 0x61, 0xaa, 0x35, 0x6a, 0x4b, 0xbd, 0x1e, 0x4d, 0xcf, 0xf6, 0xf4, + 0x28, 0x72, 0xee, 0xdc, 0xf8, 0x08, 0x7c, 0x0a, 0x0e, 0x14, 0x1f, 0x81, 0x23, 0x1c, 0xe0, 0x4c, + 0xe5, 0xc0, 0x37, 0xa0, 0x0a, 0x38, 0x51, 0xdd, 0xd3, 0x23, 0x8d, 0x63, 0x47, 0x8e, 0x63, 0xf6, + 0x36, 0xfd, 0xde, 0xef, 0xfd, 0xfa, 0xf5, 0xfb, 0xd3, 0xfd, 0x24, 0x78, 0xe0, 0x53, 0xf9, 0x92, + 0x8b, 0x53, 0xe6, 0x0f, 0xb6, 0xc7, 0x3b, 0xc4, 0x0b, 0x86, 0xe4, 0xd1, 0x76, 0x9f, 0x86, 0x92, + 0xf9, 0x44, 0x32, 0xee, 0x3b, 0x22, 0xf2, 0xa8, 0x1d, 0x08, 0x2e, 0x39, 0xba, 0xcb, 0x42, 0xc9, + 0xb8, 0x3d, 0xb3, 0xb0, 0x13, 0x8b, 0xca, 0x07, 0x03, 0xce, 0x07, 0x1e, 0xdd, 0x26, 0x01, 0xdb, + 0x3e, 0x61, 0xd4, 0xeb, 0x3b, 0x3d, 0x3a, 0x24, 0x63, 0xc6, 0x45, 0x6c, 0x5b, 0xb9, 0x6f, 0x00, + 0x7a, 0xd5, 0x8b, 0x4e, 0xb6, 0xfb, 0x91, 0xd0, 0x1b, 0xbc, 0x4d, 0xff, 0x52, 0x90, 0x20, 0xa0, + 0x22, 0x34, 0xfa, 0x1f, 0x5e, 0xe6, 0xe7, 0x98, 0x09, 0x19, 0x11, 0xcf, 0x09, 0xa9, 0x18, 0x33, + 0xd7, 0xb8, 0x59, 0xb9, 0x3d, 0xe0, 0x03, 0xae, 0x3f, 0xb7, 0xd5, 0x57, 0x2c, 0xad, 0xfe, 0x3d, + 0x03, 0x1b, 0xfb, 0xb3, 0x73, 0xe1, 0xc8, 0xa3, 0xa8, 0x0c, 0xb9, 0x21, 0x0f, 0x65, 0x39, 0xb3, + 0x99, 0xd9, 0x5a, 0xa9, 0xe7, 0x5e, 0xd7, 0x32, 0x59, 0xac, 0x25, 0xa8, 0x05, 0xeb, 0x52, 0x90, + 0x93, 0x13, 0xe6, 0x3a, 0x01, 0xf7, 0x98, 0x7b, 0x56, 0xce, 0x6e, 0x66, 0xb6, 0x0a, 0xbb, 0x5b, + 0xf6, 0x5b, 0x63, 0x60, 0x77, 0x63, 0x83, 0xb6, 0xc6, 0xe3, 0x35, 0x99, 0x5e, 0xa2, 0x27, 0xb0, + 0x14, 0x46, 0xbd, 0x90, 0xca, 0xb0, 0x6c, 0x6d, 0x5a, 0x5b, 0x85, 0xdd, 0x0f, 0xe7, 0x30, 0x75, + 0x34, 0x12, 0x27, 0x16, 0xe8, 0x1e, 0xac, 0xd0, 0x49, 0xc0, 0x85, 0x74, 0x24, 0x2f, 0xe7, 0x36, + 0xad, 0xad, 0x15, 0xbc, 0x1c, 0x0b, 0xba, 0xbc, 0xfa, 0xcf, 0x3c, 0xac, 0x9d, 0xdb, 0x1a, 0x75, + 0x61, 0xcd, 0xe3, 0xa4, 0xef, 0xf4, 0x88, 0x47, 0x7c, 0x97, 0x0a, 0x7d, 0xbe, 0xc2, 0xee, 0xf6, + 0x9c, 0x1d, 0x9b, 0x9c, 0xf4, 0xeb, 0x06, 0xde, 0xa1, 0x52, 0x32, 0x7f, 0x10, 0xe2, 0x55, 0x2f, + 0x25, 0x45, 0x2f, 0x60, 0xc3, 0xe5, 0xbe, 0x4f, 0x5d, 0x5d, 0x16, 0x01, 0xe7, 0x9e, 0x89, 0xc9, + 0xce, 0x1c, 0xde, 0xbd, 0xa9, 0x45, 0x9b, 0x73, 0x6f, 0xca, 0xbc, 0xee, 0x9e, 0x93, 0xa3, 0x5f, + 0x41, 0x89, 0x47, 0xd2, 0x63, 0x54, 0x38, 0x7d, 0x2a, 0x63, 0x45, 0xd9, 0xd2, 0xec, 0x3f, 0x9a, + 0xc3, 0xde, 0x8a, 0x6d, 0xf6, 0x13, 0x13, 0x5c, 0xe4, 0x6f, 0x48, 0xd0, 0x17, 0x60, 0x49, 0x2f, + 0x2c, 0xe7, 0x34, 0xd7, 0xc7, 0xf3, 0x3c, 0xf5, 0x18, 0xf5, 0x65, 0xb7, 0xd9, 0x99, 0x3a, 0xa9, + 0x0c, 0xd1, 0x37, 0x70, 0x4b, 0x07, 0xde, 0xa3, 0x63, 0xaa, 0x0a, 0x2d, 0xd6, 0x95, 0x17, 0x75, + 0x0e, 0x3f, 0x7b, 0xd7, 0x6a, 0xb0, 0xdb, 0x2a, 0x57, 0xe7, 0xea, 0xa3, 0xa4, 0x68, 0x9b, 0x8a, + 0x35, 0xd9, 0xb0, 0xf2, 0x7b, 0x0b, 0x4a, 0x17, 0x80, 0xe8, 0x09, 0xe4, 0x14, 0xd4, 0x24, 0xf1, + 0xa3, 0x39, 0x5b, 0x2a, 0xdb, 0x0e, 0xf5, 0xa8, 0x2b, 0xb9, 0xc0, 0xda, 0xe8, 0x62, 0x29, 0x64, + 0xbf, 0xa3, 0x52, 0xb0, 0xbe, 0xd3, 0x52, 0xc8, 0xfd, 0x1f, 0x4b, 0x61, 0xf1, 0x3d, 0x4b, 0xa1, + 0xfa, 0xaf, 0x0c, 0xe4, 0xe3, 0xce, 0x54, 0x17, 0x87, 0x4f, 0x46, 0xf4, 0xfc, 0xc5, 0xa1, 0x24, + 0xe8, 0x00, 0xf2, 0x1e, 0xe9, 0x51, 0x2f, 0x2c, 0x67, 0x75, 0x89, 0x3c, 0xbc, 0xb2, 0xcd, 0xed, + 0xa6, 0xc6, 0x1f, 0xf8, 0x52, 0x9c, 0x61, 0x63, 0x7c, 0xc9, 0xfd, 0x63, 0xdd, 0xe8, 0xfe, 0xa9, + 0xfc, 0x14, 0x0a, 0xa9, 0x7d, 0x50, 0x11, 0xac, 0x53, 0x7a, 0x16, 0xfb, 0x8f, 0xd5, 0x27, 0xba, + 0x0d, 0x8b, 0x63, 0xe2, 0x45, 0x54, 0x57, 0xc8, 0x0a, 0x8e, 0x17, 0x9f, 0x65, 0x3f, 0xcd, 0x54, + 0xff, 0x9a, 0x87, 0xdb, 0x97, 0x15, 0x05, 0xc2, 0x90, 0x0f, 0xd9, 0x28, 0xf0, 0xe2, 0x38, 0xac, + 0xef, 0x7e, 0x7a, 0xcd, 0xaa, 0xb2, 0x3b, 0xda, 0xba, 0x59, 0x6f, 0x2c, 0x60, 0xc3, 0x84, 0x4e, + 0x75, 0x69, 0x85, 0x2c, 0x94, 0xd4, 0x97, 0xce, 0x90, 0x84, 0x43, 0x53, 0xb2, 0x5f, 0x5d, 0x97, + 0x7c, 0x6f, 0x4a, 0xd3, 0x20, 0xe1, 0x50, 0x6f, 0xb2, 0xee, 0x9e, 0x93, 0xa1, 0x13, 0xb8, 0xe5, + 0x71, 0x97, 0x78, 0x4c, 0x9e, 0x39, 0x5e, 0x2f, 0xe9, 0x6e, 0x13, 0xea, 0x9f, 0xcc, 0xdd, 0x30, + 0xb6, 0xba, 0x64, 0x63, 0x5c, 0x4a, 0x28, 0x9b, 0x3d, 0x23, 0xaa, 0xfc, 0xc9, 0x82, 0xe2, 0x9b, + 0xee, 0xa0, 0x07, 0x50, 0x1c, 0x4a, 0x19, 0x38, 0x43, 0x4a, 0xfa, 0x54, 0x38, 0xb3, 0x7a, 0x52, + 0x8e, 0x2a, 0x4d, 0x43, 0x2b, 0x8e, 0x54, 0x55, 0xf9, 0x50, 0xd0, 0x58, 0x97, 0xf3, 0x53, 0x46, + 0x4d, 0x44, 0x9e, 0xdd, 0x34, 0x22, 0x76, 0xa3, 0xdb, 0x6d, 0xef, 0x69, 0xca, 0xc6, 0x02, 0x06, + 0xb5, 0x43, 0xbc, 0x42, 0x3f, 0x80, 0xb5, 0x28, 0xa4, 0x4e, 0xc8, 0x23, 0xe1, 0x52, 0x87, 0x05, + 0x3a, 0x24, 0xcb, 0x8d, 0x05, 0x5c, 0x88, 0x42, 0xda, 0xd1, 0xd2, 0xc3, 0x00, 0x3d, 0x81, 0xbb, + 0xda, 0xab, 0x6f, 0x23, 0x2a, 0xce, 0x9c, 0x80, 0x08, 0x32, 0xa2, 0x32, 0x39, 0xca, 0xa2, 0x39, + 0xca, 0x1d, 0x05, 0xf9, 0x85, 0x42, 0xb4, 0x13, 0x80, 0x3e, 0xd2, 0x03, 0x28, 0x8d, 0x98, 0xcf, + 0x46, 0xd1, 0xc8, 0x11, 0xcc, 0x1f, 0x38, 0x21, 0x7b, 0x45, 0x75, 0x9f, 0xe7, 0xf0, 0x86, 0x51, + 0x60, 0xe6, 0x0f, 0x3a, 0xec, 0x15, 0xad, 0x8c, 0x00, 0x66, 0xae, 0xce, 0x69, 0x3e, 0x04, 0xb9, + 0x80, 0xc8, 0xa1, 0x29, 0x61, 0xfd, 0x8d, 0x76, 0xc0, 0x92, 0x32, 0xb9, 0x9f, 0xee, 0xda, 0xf1, + 0x98, 0x61, 0x27, 0x63, 0x86, 0xbd, 0x6f, 0xc6, 0x10, 0xc3, 0xa3, 0xb0, 0x75, 0x80, 0x65, 0x55, + 0x78, 0xce, 0x29, 0x3d, 0xab, 0x36, 0x60, 0x39, 0xa9, 0x52, 0xb4, 0x01, 0x05, 0xdc, 0x3a, 0x3e, + 0xda, 0x77, 0x70, 0xab, 0x7e, 0x78, 0x54, 0x5c, 0x40, 0xeb, 0x00, 0xcd, 0x83, 0x5a, 0xa7, 0xeb, + 0xec, 0xb5, 0x8e, 0x8e, 0x8a, 0x19, 0x04, 0x90, 0xc7, 0xb5, 0xa3, 0xfd, 0xd6, 0xf3, 0x62, 0x56, + 0x81, 0xdb, 0xb5, 0x4e, 0xa7, 0xdb, 0xc0, 0xad, 0xe3, 0xa7, 0x8d, 0xa2, 0x55, 0x2f, 0xc0, 0x8a, + 0xd7, 0x33, 0xdd, 0x5c, 0xfd, 0xe3, 0x32, 0xdc, 0xb9, 0xfc, 0x42, 0x44, 0x2d, 0xb0, 0xa4, 0x1b, + 0x98, 0xeb, 0xfe, 0xf3, 0x6b, 0x5f, 0xa8, 0x76, 0x77, 0xaf, 0x9d, 0xba, 0xb7, 0xdc, 0x00, 0x61, + 0xc8, 0xa9, 0x1c, 0x98, 0xaa, 0xf9, 0xe2, 0xfa, 0x8c, 0x2a, 0xf6, 0x53, 0x4a, 0xcd, 0x55, 0xf9, + 0x6f, 0x16, 0x0a, 0xa9, 0x8d, 0xd0, 0x47, 0xb0, 0x31, 0x22, 0x13, 0x67, 0x76, 0x97, 0x87, 0xfa, + 0x00, 0x8b, 0x78, 0x7d, 0x44, 0x26, 0x33, 0xda, 0x10, 0xd5, 0xa7, 0x4f, 0x87, 0x23, 0xd9, 0x88, + 0xf2, 0x48, 0x1a, 0xbf, 0xde, 0x9e, 0x9a, 0xe9, 0x13, 0xd1, 0x8d, 0x0d, 0x10, 0x87, 0x35, 0xe9, + 0x06, 0xce, 0x29, 0xa5, 0x01, 0xf1, 0xd8, 0x98, 0x9a, 0xe4, 0xfe, 0xfc, 0x46, 0xb1, 0xb2, 0xbb, + 0x6e, 0xf0, 0x2c, 0x61, 0xc4, 0xab, 0x32, 0xb5, 0xaa, 0xfc, 0x2e, 0x03, 0xab, 0x69, 0x35, 0xba, + 0x03, 0xf9, 0x40, 0xf0, 0x1e, 0x8d, 0x4f, 0xb9, 0x86, 0xcd, 0x0a, 0x3d, 0x84, 0x9c, 0x3a, 0xd5, + 0xd5, 0x47, 0xd2, 0x30, 0xf4, 0x18, 0x96, 0x99, 0x2f, 0xa9, 0x18, 0x93, 0xab, 0x0b, 0x14, 0x4f, + 0xa1, 0x95, 0xff, 0x58, 0xb0, 0x9a, 0xce, 0x09, 0x7a, 0x02, 0x15, 0x95, 0x95, 0x1d, 0x47, 0xe5, + 0x20, 0xa0, 0x7e, 0x5f, 0x35, 0x94, 0xa0, 0xdf, 0x46, 0x34, 0x94, 0x49, 0x22, 0xbe, 0xa7, 0x11, + 0xcf, 0xc9, 0xa4, 0x1d, 0xeb, 0xb1, 0x51, 0xa3, 0x0f, 0x61, 0x55, 0x99, 0x4d, 0xe1, 0x59, 0x0d, + 0x2f, 0x8c, 0xc8, 0x64, 0x0a, 0xf9, 0x1c, 0xee, 0xa5, 0x21, 0x4e, 0x40, 0x45, 0x2a, 0xd5, 0xda, + 0xf5, 0x45, 0x5c, 0x4e, 0x59, 0xb4, 0xa9, 0x98, 0x45, 0x1c, 0x7d, 0x00, 0x85, 0xd8, 0x5c, 0x0a, + 0x46, 0xe3, 0x59, 0x6c, 0x11, 0x83, 0x86, 0x6b, 0x09, 0xfa, 0x19, 0xac, 0xb2, 0xbe, 0x47, 0xa7, + 0x15, 0xb1, 0x78, 0x55, 0x2c, 0x0a, 0x0a, 0x9e, 0x94, 0xc3, 0x2b, 0x28, 0x0d, 0x77, 0x9d, 0x28, + 0x18, 0x08, 0xd2, 0xa7, 0xc9, 0x73, 0x99, 0xd7, 0x2f, 0xd2, 0xd1, 0xcd, 0x8a, 0xdd, 0x6e, 0xec, + 0x1e, 0xc7, 0xb4, 0xe6, 0x51, 0xdd, 0x18, 0x9e, 0x17, 0x20, 0x1b, 0x6e, 0xa9, 0x8b, 0xd2, 0xd5, + 0x13, 0x83, 0xa3, 0x1d, 0x75, 0xb9, 0x57, 0x5e, 0x52, 0xd7, 0x25, 0x2e, 0x45, 0x21, 0x8d, 0x67, + 0x89, 0xb6, 0x51, 0x54, 0xbf, 0x84, 0x8d, 0x37, 0x38, 0x51, 0x01, 0x96, 0xf6, 0x0f, 0xbe, 0xae, + 0x1d, 0x37, 0xbb, 0xc5, 0x05, 0x84, 0x60, 0x7d, 0xbf, 0xe5, 0x1c, 0xb5, 0xba, 0xce, 0x71, 0xfb, + 0x29, 0xae, 0xed, 0x1f, 0x14, 0x33, 0x0a, 0x90, 0x2c, 0xb2, 0xd5, 0xbf, 0x59, 0x50, 0x7c, 0x73, + 0xd6, 0x41, 0x3b, 0x80, 0xd4, 0xcb, 0x46, 0xdd, 0x48, 0xb2, 0x31, 0x75, 0xa8, 0x10, 0x5c, 0x98, + 0xbc, 0xd7, 0xb3, 0xe5, 0x0c, 0x2e, 0xa5, 0xb4, 0x07, 0x5a, 0x89, 0x5e, 0x40, 0x25, 0x6d, 0x32, + 0x20, 0x92, 0xbe, 0x24, 0x67, 0x89, 0x69, 0x5e, 0x27, 0xe0, 0xfb, 0x17, 0x12, 0x70, 0x7c, 0xe8, + 0xcb, 0x47, 0xbb, 0xbf, 0x54, 0xa3, 0x01, 0x2e, 0xa7, 0xec, 0x9f, 0xc6, 0xe6, 0x86, 0x1b, 0xc3, + 0x9d, 0x34, 0xf7, 0xe3, 0xc9, 0x24, 0xe1, 0x5d, 0x7a, 0x07, 0xde, 0xdb, 0x29, 0xdb, 0xc7, 0x93, + 0x89, 0xe1, 0x4c, 0xb7, 0x4a, 0xf6, 0x9d, 0x5b, 0x05, 0x3d, 0x05, 0xd4, 0x23, 0x21, 0x75, 0xe8, + 0x37, 0x66, 0x58, 0xd5, 0xed, 0x79, 0x65, 0xaf, 0x15, 0x95, 0xd1, 0x81, 0xb1, 0x51, 0x75, 0x86, + 0x7e, 0x0c, 0xb7, 0x55, 0x0d, 0x4f, 0x79, 0x02, 0x2a, 0x5c, 0xea, 0x4b, 0x53, 0xcc, 0x68, 0x44, + 0x26, 0x09, 0xbc, 0x1d, 0x6b, 0xd0, 0xc7, 0x80, 0x46, 0xcc, 0x57, 0xcf, 0xbb, 0x27, 0x87, 0x53, + 0xfc, 0xa2, 0xc6, 0x17, 0x47, 0xcc, 0x6f, 0x68, 0x85, 0x41, 0x57, 0x7f, 0x6b, 0x41, 0xe9, 0xc2, + 0xdc, 0x89, 0x8e, 0x20, 0x37, 0xe2, 0xfd, 0x64, 0xbe, 0xfa, 0xe4, 0x3a, 0x33, 0xab, 0xdd, 0x6d, + 0x76, 0x94, 0x6d, 0xf2, 0x40, 0xaa, 0x6f, 0xf4, 0x10, 0x90, 0x29, 0x55, 0x97, 0x0a, 0xc9, 0x4e, + 0x98, 0x4b, 0x64, 0x32, 0xf1, 0x95, 0x62, 0xcd, 0xde, 0x4c, 0xa1, 0x1a, 0x37, 0x10, 0x6c, 0x4c, + 0x24, 0x55, 0x6f, 0xa1, 0x0e, 0xdb, 0x0a, 0x06, 0x23, 0x7a, 0x46, 0xcf, 0xd4, 0xb5, 0xef, 0x92, + 0x34, 0x57, 0xdc, 0xdd, 0x2b, 0x78, 0xdd, 0x25, 0x29, 0x22, 0xfd, 0x3e, 0xb8, 0x82, 0xf6, 0xa9, + 0x2f, 0x19, 0xf1, 0xe2, 0x01, 0x61, 0xc9, 0x00, 0xa7, 0xe2, 0x64, 0x2c, 0x08, 0xa3, 0x9e, 0x0a, + 0xa5, 0x43, 0x3c, 0xa9, 0x91, 0xf1, 0xaf, 0xad, 0x15, 0xbc, 0x61, 0x14, 0x35, 0x4f, 0x2a, 0x68, + 0xa8, 0x86, 0xd8, 0xd0, 0x67, 0xba, 0x58, 0x57, 0xb0, 0xfa, 0xac, 0x7e, 0x05, 0x4b, 0xe6, 0xd8, + 0xba, 0xad, 0x0e, 0x3b, 0xb5, 0x7a, 0xf3, 0xa0, 0xb8, 0xa0, 0x1e, 0xe6, 0xce, 0xe1, 0xf3, 0x76, + 0xf3, 0x20, 0x7e, 0xa4, 0x9f, 0x1f, 0x77, 0x8f, 0x6b, 0xcd, 0x62, 0x16, 0x15, 0x61, 0xf5, 0xb0, + 0xd3, 0x3d, 0x6c, 0x39, 0x46, 0x62, 0x55, 0xff, 0x6d, 0xc1, 0xbd, 0x39, 0xd3, 0x1d, 0x22, 0x00, + 0x7d, 0x16, 0x4a, 0xc1, 0x7a, 0x91, 0x54, 0x79, 0x51, 0x33, 0x7e, 0xed, 0xfd, 0x26, 0x45, 0x7b, + 0x7f, 0x4a, 0x84, 0x53, 0xa4, 0xe8, 0x37, 0xb0, 0x7c, 0x42, 0x98, 0xc7, 0xc7, 0xfa, 0xe7, 0x9a, + 0xda, 0xe0, 0xcb, 0xf7, 0xdc, 0xe0, 0x6b, 0x43, 0x83, 0xa7, 0x84, 0xe8, 0x13, 0x58, 0xa2, 0x3e, + 0xe9, 0x79, 0xb4, 0x6f, 0xba, 0xa0, 0x72, 0xa1, 0x0b, 0xea, 0x9c, 0x7b, 0x71, 0x2b, 0x26, 0xd0, + 0xca, 0x1f, 0x32, 0x00, 0x33, 0x6f, 0xd5, 0x9c, 0x75, 0x22, 0xf8, 0xc8, 0xfc, 0x7c, 0xd0, 0xdf, + 0xe8, 0xd7, 0x90, 0x95, 0xdc, 0xf8, 0x7b, 0x78, 0xe3, 0x80, 0xd8, 0x5d, 0x1e, 0xff, 0x20, 0xca, + 0x4a, 0x5e, 0x79, 0x0c, 0x4b, 0x66, 0x79, 0xd5, 0xef, 0x96, 0xb5, 0xd4, 0xef, 0x96, 0x8a, 0x0d, + 0xcb, 0x49, 0x00, 0x2e, 0xf5, 0x78, 0xdd, 0x78, 0xac, 0x24, 0x59, 0xc9, 0xeb, 0xf6, 0x9f, 0x5f, + 0xdf, 0xcf, 0xfc, 0xe5, 0xf5, 0xfd, 0xcc, 0x3f, 0x5e, 0xdf, 0xcf, 0xbc, 0xd8, 0x8c, 0x8f, 0xc0, + 0xb8, 0xfe, 0x4f, 0xeb, 0x92, 0x7f, 0x9f, 0x7a, 0x79, 0x1d, 0xb1, 0x47, 0xff, 0x0b, 0x00, 0x00, + 0xff, 0xff, 0x49, 0xf7, 0xe5, 0x4f, 0x43, 0x13, 0x00, 0x00, } func (m *DestinationRule) Marshal() (dAtA []byte, err error) { @@ -3099,8 +3099,8 @@ func (m *ConnectionPoolSettings_HTTPSettings) MarshalToSizedBuffer(dAtA []byte) i-- dAtA[i] = 0x18 } - if m.Http2MaxRequests != 0 { - i = encodeVarintDestinationRule(dAtA, i, uint64(m.Http2MaxRequests)) + if m.MaxRequests != 0 { + i = encodeVarintDestinationRule(dAtA, i, uint64(m.MaxRequests)) i-- dAtA[i] = 0x10 } @@ -3772,8 +3772,8 @@ func (m *ConnectionPoolSettings_HTTPSettings) Size() (n int) { if m.Http1MaxPendingRequests != 0 { n += 1 + sovDestinationRule(uint64(m.Http1MaxPendingRequests)) } - if m.Http2MaxRequests != 0 { - n += 1 + sovDestinationRule(uint64(m.Http2MaxRequests)) + if m.MaxRequests != 0 { + n += 1 + sovDestinationRule(uint64(m.MaxRequests)) } if m.MaxRequestsPerConnection != 0 { n += 1 + sovDestinationRule(uint64(m.MaxRequestsPerConnection)) @@ -5784,9 +5784,9 @@ func (m *ConnectionPoolSettings_HTTPSettings) Unmarshal(dAtA []byte) error { } case 2: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Http2MaxRequests", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field MaxRequests", wireType) } - m.Http2MaxRequests = 0 + m.MaxRequests = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowDestinationRule @@ -5796,7 +5796,7 @@ func (m *ConnectionPoolSettings_HTTPSettings) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Http2MaxRequests |= int32(b&0x7F) << shift + m.MaxRequests |= int32(b&0x7F) << shift if b < 0x80 { break } diff --git a/networking/v1alpha3/destination_rule.pb.html b/networking/v1alpha3/destination_rule.pb.html index e9c3dd38ea5..6cf63c1d350 100644 --- a/networking/v1alpha3/destination_rule.pb.html +++ b/networking/v1alpha3/destination_rule.pb.html @@ -689,7 +689,7 @@

OutlierDetection

tcp: maxConnections: 100 http: - http2MaxRequests: 1000 + maxRequests: 1000 maxRequestsPerConnection: 10 outlierDetection: consecutiveErrors: 7 @@ -712,7 +712,7 @@

OutlierDetection

tcp: maxConnections: 100 http: - http2MaxRequests: 1000 + maxRequests: 1000 maxRequestsPerConnection: 10 outlierDetection: consecutiveErrors: 7 @@ -1452,8 +1452,8 @@

ConnectionPoolSettings.HTTPSettings No - -http2MaxRequests + +maxRequests int32

Maximum number of requests to a backend. Default 2^32-1.

diff --git a/networking/v1alpha3/destination_rule.proto b/networking/v1alpha3/destination_rule.proto index 0e47d736f34..ae8650b02ec 100644 --- a/networking/v1alpha3/destination_rule.proto +++ b/networking/v1alpha3/destination_rule.proto @@ -607,7 +607,7 @@ message ConnectionPoolSettings { int32 http1_max_pending_requests = 1; // Maximum number of requests to a backend. Default 2^32-1. - int32 http2_max_requests = 2; + int32 max_requests = 2; // Maximum number of requests per connection to a backend. Setting this // parameter to 1 disables keep alive. Default 0, meaning "unlimited", @@ -683,7 +683,7 @@ message ConnectionPoolSettings { // tcp: // maxConnections: 100 // http: -// http2MaxRequests: 1000 +// maxRequests: 1000 // maxRequestsPerConnection: 10 // outlierDetection: // consecutiveErrors: 7 @@ -705,7 +705,7 @@ message ConnectionPoolSettings { // tcp: // maxConnections: 100 // http: -// http2MaxRequests: 1000 +// maxRequests: 1000 // maxRequestsPerConnection: 10 // outlierDetection: // consecutiveErrors: 7 diff --git a/networking/v1beta1/destination_rule.gen.json b/networking/v1beta1/destination_rule.gen.json index 14f1a3ad28c..77460a6e145 100644 --- a/networking/v1beta1/destination_rule.gen.json +++ b/networking/v1beta1/destination_rule.gen.json @@ -454,7 +454,7 @@ "type": "integer", "format": "int32" }, - "http2MaxRequests": { + "maxRequests": { "description": "Maximum number of requests to a backend. Default 2^32-1.", "type": "integer", "format": "int32" diff --git a/networking/v1beta1/destination_rule.pb.go b/networking/v1beta1/destination_rule.pb.go index 390a13ced81..49502039fb6 100644 --- a/networking/v1beta1/destination_rule.pb.go +++ b/networking/v1beta1/destination_rule.pb.go @@ -1368,7 +1368,7 @@ type ConnectionPoolSettings_HTTPSettings struct { // Maximum number of pending HTTP requests to a destination. Default 2^32-1. Http1MaxPendingRequests int32 `protobuf:"varint,1,opt,name=http1_max_pending_requests,json=http1MaxPendingRequests,proto3" json:"http1_max_pending_requests,omitempty"` // Maximum number of requests to a backend. Default 2^32-1. - Http2MaxRequests int32 `protobuf:"varint,2,opt,name=http2_max_requests,json=http2MaxRequests,proto3" json:"http2_max_requests,omitempty"` + MaxRequests int32 `protobuf:"varint,2,opt,name=max_requests,json=maxRequests,proto3" json:"max_requests,omitempty"` // Maximum number of requests per connection to a backend. Setting this // parameter to 1 disables keep alive. Default 0, meaning "unlimited", // up to 2^29. @@ -1435,9 +1435,9 @@ func (m *ConnectionPoolSettings_HTTPSettings) GetHttp1MaxPendingRequests() int32 return 0 } -func (m *ConnectionPoolSettings_HTTPSettings) GetHttp2MaxRequests() int32 { +func (m *ConnectionPoolSettings_HTTPSettings) GetMaxRequests() int32 { if m != nil { - return m.Http2MaxRequests + return m.MaxRequests } return 0 } @@ -1507,7 +1507,7 @@ func (m *ConnectionPoolSettings_HTTPSettings) GetUseClientProtocol() bool { // tcp: // maxConnections: 100 // http: -// http2MaxRequests: 1000 +// maxRequests: 1000 // maxRequestsPerConnection: 10 // outlierDetection: // consecutiveErrors: 7 @@ -1529,7 +1529,7 @@ func (m *ConnectionPoolSettings_HTTPSettings) GetUseClientProtocol() bool { // tcp: // maxConnections: 100 // http: -// http2MaxRequests: 1000 +// maxRequests: 1000 // maxRequestsPerConnection: 10 // outlierDetection: // consecutiveErrors: 7 @@ -2199,121 +2199,121 @@ func init() { } var fileDescriptor_31054629b619ca4b = []byte{ - // 1822 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xcd, 0x73, 0x1b, 0xb7, - 0x15, 0x17, 0x3f, 0x44, 0x49, 0x8f, 0xfa, 0x20, 0x61, 0x8d, 0xcb, 0xd0, 0x1d, 0x5b, 0xc3, 0xe9, - 0x34, 0xaa, 0x1b, 0xaf, 0x22, 0xb9, 0x9a, 0x36, 0x4e, 0xdc, 0x44, 0x14, 0x15, 0x53, 0x0d, 0x25, - 0xd2, 0x20, 0xd5, 0x0f, 0x5f, 0xb6, 0xe0, 0x12, 0x22, 0x11, 0x2d, 0x17, 0x1b, 0x2c, 0x96, 0x26, - 0x73, 0x6d, 0x8f, 0xbd, 0xf7, 0xef, 0xe8, 0xa9, 0xa7, 0xde, 0x7b, 0xe9, 0x4c, 0x0f, 0xed, 0xad, - 0x87, 0x8e, 0xff, 0x85, 0x4e, 0x0f, 0xbd, 0x75, 0x80, 0xc5, 0x92, 0x2b, 0x4b, 0xb2, 0x2c, 0x2b, - 0xbe, 0x01, 0xef, 0xe3, 0x87, 0x87, 0x87, 0xdf, 0x03, 0xde, 0x2e, 0xfc, 0xc8, 0xa3, 0xf2, 0x25, - 0x17, 0x67, 0xcc, 0xeb, 0x6f, 0x8d, 0xb6, 0xbb, 0x54, 0x92, 0xed, 0xad, 0x1e, 0x0d, 0x24, 0xf3, - 0x88, 0x64, 0xdc, 0xb3, 0x45, 0xe8, 0x52, 0xcb, 0x17, 0x5c, 0x72, 0x54, 0x62, 0x81, 0x64, 0xdc, - 0x9a, 0x39, 0x58, 0xc6, 0xa1, 0xfc, 0xa0, 0xcf, 0x79, 0xdf, 0xa5, 0x5b, 0xc4, 0x67, 0x5b, 0xa7, - 0x8c, 0xba, 0x3d, 0xbb, 0x4b, 0x07, 0x64, 0xc4, 0xb8, 0x88, 0x5c, 0xcb, 0xf7, 0x8d, 0x81, 0x9e, - 0x75, 0xc3, 0xd3, 0xad, 0x5e, 0x28, 0x34, 0xfe, 0x55, 0xfa, 0x97, 0x82, 0xf8, 0x3e, 0x15, 0x81, - 0xd1, 0x6f, 0x5e, 0x12, 0xe5, 0x88, 0x09, 0x19, 0x12, 0xd7, 0x0e, 0xa8, 0x18, 0x31, 0xc7, 0x04, - 0x59, 0x5e, 0xef, 0xf3, 0x3e, 0xd7, 0xc3, 0x2d, 0x35, 0x8a, 0xa4, 0x95, 0x7f, 0xa4, 0x60, 0xad, - 0x36, 0xdb, 0x15, 0x0e, 0x5d, 0x8a, 0x4a, 0x90, 0x1d, 0xf0, 0x40, 0x96, 0x52, 0x1b, 0xa9, 0xcd, - 0xa5, 0x6a, 0xf6, 0xd5, 0x5e, 0x2a, 0x8d, 0xb5, 0x04, 0x1d, 0xc3, 0xaa, 0x14, 0xe4, 0xf4, 0x94, - 0x39, 0xb6, 0xcf, 0x5d, 0xe6, 0x4c, 0x4a, 0xe9, 0x8d, 0xd4, 0x66, 0x7e, 0xe7, 0x43, 0xeb, 0xaa, - 0x0c, 0x58, 0x9d, 0xc8, 0xbe, 0xa5, 0xcd, 0xf1, 0x8a, 0x4c, 0x4e, 0xd1, 0x13, 0x58, 0x08, 0xc2, - 0x6e, 0x40, 0x65, 0x50, 0xca, 0x6c, 0x64, 0x36, 0xf3, 0x3b, 0x1b, 0x57, 0x03, 0xb5, 0xb5, 0x21, - 0x8e, 0x1d, 0xd0, 0x3d, 0x58, 0xa2, 0x63, 0x9f, 0x0b, 0x69, 0x4b, 0x5e, 0xca, 0x6e, 0x64, 0x36, - 0x97, 0xf0, 0x62, 0x24, 0xe8, 0xf0, 0xca, 0xbf, 0x72, 0xb0, 0x72, 0x6e, 0x65, 0xd4, 0x86, 0x15, - 0x97, 0x93, 0x9e, 0xdd, 0x25, 0x2e, 0xf1, 0x1c, 0x2a, 0xf4, 0xee, 0xf2, 0x3b, 0xd6, 0xd5, 0x0b, - 0x36, 0x38, 0xe9, 0x55, 0x8d, 0x75, 0x9b, 0x4a, 0xc9, 0xbc, 0x7e, 0x80, 0x97, 0xdd, 0x84, 0x14, - 0xfd, 0x06, 0xd6, 0x1c, 0xee, 0x79, 0xd4, 0xd1, 0x8c, 0xf0, 0x39, 0x77, 0x4d, 0x42, 0x3e, 0xbe, - 0x1a, 0x76, 0x7f, 0xea, 0xd0, 0xe2, 0xdc, 0x9d, 0x02, 0xaf, 0x3a, 0xe7, 0xe4, 0xe8, 0x57, 0x50, - 0xe4, 0xa1, 0x74, 0x19, 0x15, 0x76, 0x8f, 0xca, 0x48, 0x51, 0xca, 0x68, 0xf0, 0x87, 0x57, 0x83, - 0x37, 0x23, 0x97, 0x5a, 0xec, 0x81, 0x0b, 0xfc, 0x35, 0x09, 0x7a, 0x0a, 0x19, 0xe9, 0x06, 0xa5, - 0xac, 0x86, 0xfa, 0xf1, 0x1b, 0xe2, 0x74, 0x19, 0xf5, 0x64, 0xa7, 0xd1, 0x9e, 0x86, 0xa8, 0xfc, - 0x10, 0x83, 0x3b, 0x3a, 0xe9, 0x2e, 0x1d, 0x51, 0x45, 0xb1, 0x48, 0x57, 0x9a, 0xd7, 0xc7, 0xf7, - 0xc9, 0x5b, 0xf2, 0xc0, 0x6a, 0xa9, 0x63, 0x3a, 0xc7, 0x8c, 0xa2, 0x42, 0x6d, 0x28, 0xd0, 0x78, - 0xbd, 0xf2, 0x1f, 0x33, 0x50, 0xbc, 0x60, 0x88, 0x9e, 0x40, 0x56, 0x99, 0x9a, 0xf3, 0xfb, 0xe1, - 0xd5, 0x2b, 0x2a, 0xd7, 0x36, 0x75, 0xa9, 0x23, 0xb9, 0xc0, 0xda, 0xe7, 0x22, 0x09, 0xd2, 0xef, - 0x87, 0x04, 0x99, 0xf7, 0x49, 0x82, 0xec, 0x77, 0x47, 0x82, 0xf9, 0x77, 0x23, 0x41, 0xe5, 0x3f, - 0x29, 0xc8, 0x45, 0xf5, 0xa8, 0x2e, 0x0b, 0x8f, 0x0c, 0xe9, 0xf9, 0xcb, 0x42, 0x49, 0x50, 0x0d, - 0x72, 0x2e, 0xe9, 0x52, 0x37, 0x28, 0xa5, 0x35, 0x39, 0x3e, 0xba, 0xae, 0xb6, 0xad, 0x86, 0x36, - 0x3f, 0xf0, 0xa4, 0x98, 0x60, 0xe3, 0x7b, 0xc9, 0x95, 0x93, 0xb9, 0xcd, 0x95, 0x53, 0xfe, 0x04, - 0xf2, 0x89, 0x65, 0x50, 0x01, 0x32, 0x67, 0x74, 0x12, 0x45, 0x8f, 0xd5, 0x10, 0xad, 0xc3, 0xfc, - 0x88, 0xb8, 0x21, 0xd5, 0xdc, 0x58, 0xc2, 0xd1, 0xe4, 0x49, 0xfa, 0x67, 0xa9, 0xca, 0xdf, 0x72, - 0xb0, 0x7e, 0x19, 0x1f, 0xd0, 0x73, 0xc8, 0x05, 0x6c, 0xe8, 0xbb, 0x51, 0x16, 0x56, 0x77, 0x7e, - 0x7a, 0x33, 0x3e, 0x59, 0x6d, 0xed, 0xdc, 0xa8, 0xd6, 0xe7, 0xb0, 0x01, 0x42, 0x5f, 0x6b, 0x52, - 0x05, 0x2c, 0x90, 0xd4, 0x93, 0xf6, 0x80, 0x04, 0x03, 0xc3, 0xd5, 0xcf, 0x6f, 0x88, 0xbd, 0x3f, - 0x45, 0xa9, 0x93, 0x60, 0xa0, 0xd7, 0x58, 0x75, 0xce, 0xc9, 0x10, 0x85, 0x3b, 0x2e, 0x77, 0x88, - 0xcb, 0xe4, 0xc4, 0x76, 0xbb, 0x71, 0x4d, 0x9b, 0x3c, 0xef, 0xbe, 0x69, 0xbd, 0xc8, 0xe9, 0x92, - 0x75, 0x71, 0x31, 0x46, 0x6c, 0x74, 0x8d, 0xa8, 0xfc, 0xe7, 0x0c, 0x14, 0x5e, 0x8f, 0x06, 0x3d, - 0x84, 0xc2, 0x40, 0x4a, 0xdf, 0x1e, 0x50, 0xd2, 0xa3, 0xc2, 0x9e, 0x51, 0x49, 0xc5, 0xa9, 0x34, - 0x75, 0xad, 0x38, 0x56, 0x84, 0x1a, 0x42, 0x5e, 0xdb, 0x3a, 0x9c, 0x9f, 0x31, 0x6a, 0xf2, 0xf1, - 0x8b, 0x5b, 0xe6, 0xc3, 0xaa, 0x77, 0x3a, 0xad, 0x7d, 0x8d, 0x58, 0x9f, 0xc3, 0xa0, 0x16, 0x88, - 0x66, 0xe8, 0x07, 0xb0, 0x12, 0x06, 0xd4, 0x0e, 0x78, 0x28, 0x1c, 0x6a, 0x33, 0x5f, 0x27, 0x64, - 0xb1, 0x3e, 0x87, 0xf3, 0x61, 0x40, 0xdb, 0x5a, 0x7a, 0xe8, 0xa3, 0x4f, 0xe1, 0x03, 0x1d, 0xd4, - 0x37, 0x21, 0x15, 0x13, 0xdb, 0x27, 0x82, 0x0c, 0xa9, 0x8c, 0x77, 0x32, 0x6f, 0x76, 0x72, 0x57, - 0x99, 0x3c, 0x57, 0x16, 0xad, 0xd8, 0x40, 0xef, 0xe8, 0x21, 0x14, 0x87, 0xcc, 0x63, 0xc3, 0x70, - 0x68, 0x0b, 0xe6, 0xf5, 0xed, 0x80, 0x7d, 0x4b, 0x75, 0x7d, 0x67, 0xf1, 0x9a, 0x51, 0x60, 0xe6, - 0xf5, 0xdb, 0xec, 0x5b, 0x5a, 0x1e, 0x02, 0xcc, 0x42, 0x7d, 0x43, 0xd9, 0x21, 0xc8, 0xfa, 0x44, - 0x0e, 0x0c, 0x7d, 0xf5, 0x18, 0x6d, 0x43, 0x46, 0xca, 0xf8, 0x5a, 0xfa, 0xc0, 0x8a, 0x7a, 0x0a, - 0x2b, 0xee, 0x29, 0xac, 0x9a, 0xe9, 0x39, 0x0c, 0x8e, 0xb2, 0xad, 0x02, 0x2c, 0x2a, 0xd6, 0xd9, - 0x67, 0x74, 0x52, 0xa9, 0xc3, 0x62, 0x4c, 0x51, 0xb4, 0x06, 0x79, 0xdc, 0x3c, 0x39, 0xae, 0xd9, - 0xb8, 0x59, 0x3d, 0x3c, 0x2e, 0xcc, 0xa1, 0x55, 0x80, 0xc6, 0xc1, 0x5e, 0xbb, 0x63, 0xef, 0x37, - 0x8f, 0x8f, 0x0b, 0x29, 0x04, 0x90, 0xc3, 0x7b, 0xc7, 0xb5, 0xe6, 0x51, 0x21, 0xad, 0x8c, 0x5b, - 0x7b, 0xed, 0x76, 0xa7, 0x8e, 0x9b, 0x27, 0xcf, 0xea, 0x85, 0x4c, 0x35, 0x0f, 0x4b, 0x6e, 0xd7, - 0x14, 0x72, 0xe5, 0x2f, 0x8b, 0x70, 0xf7, 0xf2, 0x8b, 0x10, 0x1d, 0x43, 0x46, 0x3a, 0xbe, 0xb9, - 0xe3, 0x3f, 0xbb, 0xe9, 0x3d, 0x6a, 0x75, 0xf6, 0x5b, 0x89, 0x0b, 0xcb, 0xf1, 0xd1, 0x73, 0xc8, - 0xaa, 0x23, 0x30, 0x9c, 0x79, 0x7a, 0x63, 0x40, 0x95, 0xf9, 0x29, 0xa2, 0x86, 0x2a, 0xff, 0x2f, - 0x0d, 0xf9, 0xc4, 0x3a, 0xe8, 0x43, 0x58, 0x1b, 0x92, 0xb1, 0x3d, 0xbb, 0xc1, 0x03, 0x1d, 0xfe, - 0x3c, 0x5e, 0x1d, 0x92, 0xf1, 0x0c, 0x36, 0x40, 0xd5, 0xe9, 0x7b, 0x61, 0x4b, 0x36, 0xa4, 0x3c, - 0x94, 0x26, 0xac, 0xab, 0x0f, 0x66, 0xfa, 0x30, 0x74, 0x22, 0x07, 0xe4, 0xc1, 0x8a, 0x74, 0x7c, - 0xfb, 0x8c, 0x52, 0x9f, 0xb8, 0x6c, 0x44, 0xcd, 0xd1, 0x1e, 0xde, 0x26, 0x53, 0x56, 0xc7, 0xf1, - 0xbf, 0x8a, 0x01, 0xf1, 0xb2, 0x4c, 0xcc, 0xca, 0x7f, 0x48, 0xc1, 0x72, 0x52, 0x8d, 0xee, 0x42, - 0xce, 0x17, 0xbc, 0x4b, 0xa3, 0x4d, 0xae, 0x60, 0x33, 0x43, 0x8f, 0x20, 0xab, 0x36, 0x75, 0xfd, - 0x8e, 0xb4, 0x19, 0xda, 0x85, 0x45, 0xe6, 0x49, 0x2a, 0x46, 0xe4, 0x7a, 0x76, 0xe2, 0xa9, 0x69, - 0xf9, 0x77, 0x59, 0x58, 0x4e, 0x1e, 0x09, 0xfa, 0x14, 0xca, 0xea, 0x50, 0xb6, 0x6d, 0x75, 0x04, - 0x3e, 0xf5, 0x7a, 0xaa, 0x9a, 0x04, 0xfd, 0x26, 0xa4, 0x81, 0x8c, 0xcf, 0xe1, 0x7b, 0xda, 0xe2, - 0x88, 0x8c, 0x5b, 0x91, 0x1e, 0x1b, 0x35, 0xfa, 0x08, 0x90, 0x52, 0xed, 0x68, 0xe7, 0xa9, 0x53, - 0x5a, 0x3b, 0xe9, 0xdb, 0x69, 0xe7, 0x88, 0x8c, 0xa7, 0xd6, 0x4f, 0xe1, 0x5e, 0xd2, 0xce, 0xf6, - 0xa9, 0x48, 0x1c, 0xba, 0xde, 0xc5, 0x3c, 0x2e, 0x0d, 0x67, 0x1e, 0x2d, 0x2a, 0x66, 0xc9, 0x47, - 0x0f, 0x20, 0x1f, 0xb9, 0x4b, 0xc1, 0x68, 0xd4, 0x86, 0xcd, 0x63, 0xd0, 0xe6, 0x5a, 0x82, 0x3e, - 0x83, 0x65, 0xd6, 0x73, 0xe9, 0x94, 0x1b, 0xf3, 0xd7, 0xa5, 0x25, 0xaf, 0xcc, 0x63, 0x62, 0x4c, - 0xa0, 0x38, 0xd8, 0xb1, 0x43, 0xbf, 0x2f, 0x48, 0x8f, 0xc6, 0x2f, 0x66, 0x4e, 0xbf, 0x4a, 0x47, - 0xb7, 0x62, 0xbd, 0x55, 0xdf, 0x39, 0x89, 0x50, 0xcd, 0xbb, 0xba, 0x36, 0x38, 0x2f, 0x40, 0x16, - 0xdc, 0x51, 0xf7, 0xa5, 0xa3, 0x5b, 0x06, 0x5b, 0xc7, 0xe9, 0x70, 0xb7, 0xb4, 0xa0, 0x6e, 0x4d, - 0x5c, 0x0c, 0x03, 0x1a, 0x35, 0x13, 0x2d, 0xa3, 0xa8, 0x7c, 0x0e, 0x6b, 0xaf, 0x61, 0xa2, 0x3c, - 0x2c, 0xd4, 0x0e, 0xbe, 0xdc, 0x3b, 0x69, 0x74, 0x0a, 0x73, 0x08, 0xc1, 0x6a, 0xad, 0x69, 0x1f, - 0x37, 0x3b, 0xf6, 0x49, 0xeb, 0x19, 0xde, 0xab, 0x1d, 0x14, 0x52, 0xca, 0x20, 0x9e, 0xa4, 0x2b, - 0xff, 0xcc, 0x40, 0xe1, 0xf5, 0x5e, 0x07, 0x6d, 0x03, 0x52, 0xcf, 0x1b, 0x75, 0x42, 0xc9, 0x46, - 0xd4, 0xa6, 0x42, 0x70, 0x61, 0x18, 0x50, 0x4d, 0x97, 0x52, 0xb8, 0x98, 0xd0, 0x1e, 0x68, 0x25, - 0x7a, 0x01, 0xe5, 0xa4, 0x4b, 0x9f, 0x48, 0xfa, 0x92, 0x4c, 0x62, 0xd7, 0x9c, 0xce, 0xff, 0xf7, - 0x2f, 0xe4, 0xff, 0xe4, 0xd0, 0x93, 0x8f, 0x77, 0x7e, 0xa9, 0xba, 0x03, 0x5c, 0x4a, 0xf8, 0x3f, - 0x8b, 0xdc, 0x0d, 0x36, 0x86, 0xbb, 0x49, 0xec, 0xdd, 0xf1, 0x38, 0xc6, 0x5d, 0x78, 0x0b, 0xdc, - 0xf5, 0x84, 0xef, 0xee, 0x78, 0x6c, 0x30, 0x93, 0x45, 0x93, 0x7e, 0xeb, 0xa2, 0x41, 0xcf, 0x00, - 0x75, 0x49, 0x40, 0x6d, 0xfa, 0xb5, 0x69, 0x55, 0x75, 0xa1, 0x5e, 0x5b, 0x75, 0x05, 0xe5, 0x74, - 0x60, 0x7c, 0x14, 0xcd, 0xd0, 0xc7, 0xb0, 0xae, 0x28, 0x3c, 0xc5, 0xf1, 0xa9, 0x70, 0xa8, 0x27, - 0x0d, 0x97, 0xd1, 0x90, 0x8c, 0x63, 0xf3, 0x56, 0xa4, 0x51, 0x15, 0x36, 0x64, 0x9e, 0x7a, 0xe4, - 0x5d, 0x39, 0x98, 0xda, 0xcf, 0x47, 0x15, 0x36, 0x64, 0x5e, 0x5d, 0x2b, 0x8c, 0x75, 0xe5, 0xf7, - 0x19, 0x28, 0x5e, 0x68, 0x3c, 0xd1, 0x11, 0x64, 0x87, 0xbc, 0x17, 0xb7, 0x58, 0x8f, 0x6f, 0xd0, - 0xb3, 0x5a, 0x9d, 0x46, 0x5b, 0xb9, 0xc6, 0xcf, 0xa4, 0x1a, 0xa3, 0x47, 0x80, 0x0c, 0x53, 0x1d, - 0x2a, 0x24, 0x3b, 0x65, 0x0e, 0x91, 0x71, 0xcf, 0x57, 0x8c, 0x34, 0xfb, 0x33, 0x85, 0x2a, 0x5b, - 0x5f, 0xb0, 0x11, 0x91, 0x54, 0xbd, 0x88, 0x3a, 0x6b, 0x4b, 0x18, 0x8c, 0xe8, 0x2b, 0x3a, 0x51, - 0xd7, 0xbf, 0x43, 0x92, 0x58, 0x51, 0x6d, 0x2f, 0xe1, 0x55, 0x87, 0x24, 0x80, 0xf4, 0x3b, 0xe1, - 0x08, 0xda, 0xa3, 0x9e, 0x64, 0xc4, 0x8d, 0xda, 0x84, 0x05, 0x63, 0x38, 0x15, 0xc7, 0xcd, 0x41, - 0x10, 0x76, 0x55, 0x26, 0x6d, 0xe2, 0x4a, 0x6d, 0x19, 0x7d, 0x67, 0x2d, 0xe1, 0x35, 0xa3, 0xd8, - 0x73, 0xa5, 0x32, 0x0d, 0x54, 0x1b, 0x1b, 0x78, 0x4c, 0x73, 0x75, 0x09, 0xab, 0x61, 0xe5, 0x0b, - 0x58, 0x30, 0xdb, 0xd6, 0x55, 0x75, 0xd8, 0xde, 0xab, 0x36, 0x0e, 0x0a, 0x73, 0xea, 0x79, 0x6e, - 0x1f, 0x1e, 0xb5, 0x1a, 0x07, 0xd1, 0x53, 0x7d, 0x74, 0xd2, 0x39, 0xd9, 0x6b, 0x14, 0xd2, 0xa8, - 0x00, 0xcb, 0x87, 0xed, 0xce, 0x61, 0xd3, 0x36, 0x92, 0x4c, 0xe5, 0xbf, 0x19, 0xb8, 0xf7, 0x86, - 0x16, 0x0f, 0xfd, 0x16, 0xa0, 0xc7, 0x02, 0x29, 0x58, 0x37, 0x94, 0xea, 0x58, 0x54, 0x8f, 0xff, - 0xc5, 0x3b, 0x75, 0x8b, 0x56, 0x6d, 0x8a, 0x83, 0x13, 0x98, 0xe8, 0x05, 0x2c, 0x9e, 0x12, 0xe6, - 0xf2, 0x91, 0xfe, 0x52, 0x53, 0xf8, 0x3f, 0x7f, 0x37, 0xfc, 0x2f, 0x0d, 0x0a, 0x9e, 0xe2, 0xa1, - 0x9f, 0xc0, 0x02, 0xf5, 0x48, 0xd7, 0xa5, 0x3d, 0x53, 0x02, 0xe5, 0x0b, 0x25, 0x50, 0xe5, 0xdc, - 0x8d, 0xea, 0x30, 0x36, 0x2d, 0xff, 0x29, 0x05, 0x30, 0x0b, 0x56, 0xf5, 0x5a, 0xa7, 0x82, 0x0f, - 0xcd, 0xe7, 0x83, 0x1e, 0xa3, 0x5f, 0x43, 0x5a, 0x72, 0x13, 0x6e, 0xfd, 0xb6, 0xe9, 0xb0, 0x3a, - 0x3c, 0xfa, 0x1c, 0x4a, 0x4b, 0x5e, 0xde, 0x85, 0x05, 0x33, 0xbd, 0xee, 0xb3, 0x65, 0x25, 0xf1, - 0xd9, 0x52, 0xb6, 0x60, 0x31, 0xde, 0xff, 0xa5, 0x01, 0xaf, 0x9a, 0x80, 0x95, 0x24, 0x2d, 0x79, - 0xf5, 0xd1, 0x5f, 0x5f, 0xdd, 0x4f, 0xfd, 0xfd, 0xd5, 0xfd, 0xd4, 0xbf, 0x5f, 0xdd, 0x4f, 0xbd, - 0x78, 0x10, 0xed, 0x80, 0x71, 0xfd, 0x0f, 0xeb, 0xe2, 0xdf, 0xa6, 0x6e, 0x4e, 0xe7, 0xeb, 0xf1, - 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0xb6, 0x58, 0xca, 0x88, 0x30, 0x13, 0x00, 0x00, + // 1818 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xcd, 0x72, 0x1b, 0xb9, + 0x11, 0x16, 0x39, 0x14, 0x25, 0x35, 0xf5, 0x43, 0xc2, 0x2a, 0x87, 0x4b, 0xa7, 0x6c, 0x85, 0x95, + 0xca, 0x2a, 0xce, 0x7a, 0xb4, 0x92, 0xa3, 0x4a, 0xd6, 0xbb, 0xce, 0xae, 0x28, 0x6a, 0x4d, 0x65, + 0x29, 0x89, 0x06, 0xa9, 0xfc, 0xf8, 0x32, 0x01, 0x87, 0x10, 0x89, 0xd5, 0x70, 0x30, 0x8b, 0xc1, + 0xd0, 0xd4, 0x9e, 0x73, 0xcc, 0x3d, 0xcf, 0x91, 0x5c, 0xf2, 0x0a, 0xb9, 0xa4, 0x2a, 0x87, 0xe4, + 0x96, 0x43, 0xca, 0xaf, 0x90, 0x4a, 0x55, 0x72, 0x4b, 0x01, 0x83, 0x21, 0x47, 0x96, 0x64, 0x59, + 0x56, 0x7c, 0x03, 0xba, 0xbf, 0xfe, 0xd0, 0x68, 0x74, 0x03, 0x3d, 0x03, 0x3f, 0xf4, 0xa9, 0x7c, + 0xc9, 0xc5, 0x29, 0xf3, 0xfb, 0x1b, 0xa3, 0xcd, 0x2e, 0x95, 0x64, 0x73, 0xa3, 0x47, 0x43, 0xc9, + 0x7c, 0x22, 0x19, 0xf7, 0x1d, 0x11, 0x79, 0xd4, 0x0e, 0x04, 0x97, 0x1c, 0x95, 0x59, 0x28, 0x19, + 0xb7, 0xa7, 0x06, 0xb6, 0x31, 0xa8, 0x3c, 0xe8, 0x73, 0xde, 0xf7, 0xe8, 0x06, 0x09, 0xd8, 0xc6, + 0x09, 0xa3, 0x5e, 0xcf, 0xe9, 0xd2, 0x01, 0x19, 0x31, 0x2e, 0x62, 0xd3, 0xca, 0x7d, 0x03, 0xd0, + 0xb3, 0x6e, 0x74, 0xb2, 0xd1, 0x8b, 0x84, 0xe6, 0xbf, 0x4a, 0xff, 0x52, 0x90, 0x20, 0xa0, 0x22, + 0x34, 0xfa, 0xf5, 0x4b, 0xbc, 0x1c, 0x31, 0x21, 0x23, 0xe2, 0x39, 0x21, 0x15, 0x23, 0xe6, 0x1a, + 0x27, 0x2b, 0xab, 0x7d, 0xde, 0xe7, 0x7a, 0xb8, 0xa1, 0x46, 0xb1, 0xb4, 0xfa, 0xb7, 0x0c, 0xac, + 0xd4, 0xa7, 0xbb, 0xc2, 0x91, 0x47, 0x51, 0x19, 0x72, 0x03, 0x1e, 0xca, 0x72, 0x66, 0x2d, 0xb3, + 0xbe, 0x50, 0xcb, 0xbd, 0xda, 0xc9, 0x64, 0xb1, 0x96, 0xa0, 0x43, 0x58, 0x96, 0x82, 0x9c, 0x9c, + 0x30, 0xd7, 0x09, 0xb8, 0xc7, 0xdc, 0xb3, 0x72, 0x76, 0x2d, 0xb3, 0x5e, 0xd8, 0xfa, 0xd0, 0xbe, + 0x2a, 0x02, 0x76, 0x27, 0xc6, 0xb7, 0x34, 0x1c, 0x2f, 0xc9, 0xf4, 0x14, 0x3d, 0x81, 0xb9, 0x30, + 0xea, 0x86, 0x54, 0x86, 0x65, 0x6b, 0xcd, 0x5a, 0x2f, 0x6c, 0xad, 0x5d, 0x4d, 0xd4, 0xd6, 0x40, + 0x9c, 0x18, 0xa0, 0x7b, 0xb0, 0x40, 0xc7, 0x01, 0x17, 0xd2, 0x91, 0xbc, 0x9c, 0x5b, 0xb3, 0xd6, + 0x17, 0xf0, 0x7c, 0x2c, 0xe8, 0xf0, 0xea, 0x3f, 0xf2, 0xb0, 0x74, 0x6e, 0x65, 0xd4, 0x86, 0x25, + 0x8f, 0x93, 0x9e, 0xd3, 0x25, 0x1e, 0xf1, 0x5d, 0x2a, 0xf4, 0xee, 0x0a, 0x5b, 0xf6, 0xd5, 0x0b, + 0x36, 0x39, 0xe9, 0xd5, 0x0c, 0xba, 0x4d, 0xa5, 0x64, 0x7e, 0x3f, 0xc4, 0x8b, 0x5e, 0x4a, 0x8a, + 0x7e, 0x0d, 0x2b, 0x2e, 0xf7, 0x7d, 0xea, 0xea, 0x8c, 0x08, 0x38, 0xf7, 0x4c, 0x40, 0x3e, 0xbe, + 0x9a, 0x76, 0x77, 0x62, 0xd0, 0xe2, 0xdc, 0x9b, 0x10, 0x2f, 0xbb, 0xe7, 0xe4, 0xe8, 0x97, 0x50, + 0xe2, 0x91, 0xf4, 0x18, 0x15, 0x4e, 0x8f, 0xca, 0x58, 0x51, 0xb6, 0x34, 0xf9, 0xc3, 0xab, 0xc9, + 0x8f, 0x62, 0x93, 0x7a, 0x62, 0x81, 0x8b, 0xfc, 0x35, 0x09, 0x7a, 0x0a, 0x96, 0xf4, 0xc2, 0x72, + 0x4e, 0x53, 0xfd, 0xe8, 0x0d, 0x7e, 0x7a, 0x8c, 0xfa, 0xb2, 0xd3, 0x6c, 0x4f, 0x5c, 0x54, 0x76, + 0x88, 0xc1, 0x1d, 0x1d, 0x74, 0x8f, 0x8e, 0xa8, 0x4a, 0xb1, 0x58, 0x57, 0x9e, 0xd5, 0xc7, 0xf7, + 0xc9, 0x5b, 0xe6, 0x81, 0xdd, 0x52, 0xc7, 0x74, 0x2e, 0x33, 0x4a, 0x8a, 0xb5, 0xa9, 0x48, 0x93, + 0xf5, 0x2a, 0xbf, 0xb7, 0xa0, 0x74, 0x01, 0x88, 0x9e, 0x40, 0x4e, 0x41, 0xcd, 0xf9, 0xfd, 0xe0, + 0xea, 0x15, 0x95, 0x69, 0x9b, 0x7a, 0xd4, 0x95, 0x5c, 0x60, 0x6d, 0x73, 0x31, 0x09, 0xb2, 0xef, + 0x27, 0x09, 0xac, 0xf7, 0x99, 0x04, 0xb9, 0xff, 0x5f, 0x12, 0xcc, 0xbe, 0x5b, 0x12, 0x54, 0xff, + 0x95, 0x81, 0x7c, 0x5c, 0x8f, 0xea, 0xb2, 0xf0, 0xc9, 0x90, 0x9e, 0xbf, 0x2c, 0x94, 0x04, 0xd5, + 0x21, 0xef, 0x91, 0x2e, 0xf5, 0xc2, 0x72, 0x56, 0x27, 0xc7, 0x47, 0xd7, 0xd5, 0xb6, 0xdd, 0xd4, + 0xf0, 0x3d, 0x5f, 0x8a, 0x33, 0x6c, 0x6c, 0x2f, 0xb9, 0x72, 0xac, 0xdb, 0x5c, 0x39, 0x95, 0x4f, + 0xa0, 0x90, 0x5a, 0x06, 0x15, 0xc1, 0x3a, 0xa5, 0x67, 0xb1, 0xf7, 0x58, 0x0d, 0xd1, 0x2a, 0xcc, + 0x8e, 0x88, 0x17, 0x51, 0x9d, 0x1b, 0x0b, 0x38, 0x9e, 0x3c, 0xc9, 0xfe, 0x34, 0x53, 0xfd, 0x4b, + 0x1e, 0x56, 0x2f, 0xcb, 0x07, 0xf4, 0x1c, 0xf2, 0x21, 0x1b, 0x06, 0x5e, 0x1c, 0x85, 0xe5, 0xad, + 0x9f, 0xdc, 0x2c, 0x9f, 0xec, 0xb6, 0x36, 0x6e, 0xd6, 0x1a, 0x33, 0xd8, 0x10, 0xa1, 0xaf, 0x75, + 0x52, 0x85, 0x2c, 0x94, 0xd4, 0x97, 0xce, 0x80, 0x84, 0x03, 0x93, 0xab, 0x9f, 0xdf, 0x90, 0x7b, + 0x77, 0xc2, 0xd2, 0x20, 0xe1, 0x40, 0xaf, 0xb1, 0xec, 0x9e, 0x93, 0x21, 0x0a, 0x77, 0x3c, 0xee, + 0x12, 0x8f, 0xc9, 0x33, 0xc7, 0xeb, 0x26, 0x35, 0x6d, 0xe2, 0xbc, 0xfd, 0xa6, 0xf5, 0x62, 0xa3, + 0x4b, 0xd6, 0xc5, 0xa5, 0x84, 0xb1, 0xd9, 0x35, 0xa2, 0xca, 0x9f, 0x2c, 0x28, 0xbe, 0xee, 0x0d, + 0x7a, 0x08, 0xc5, 0x81, 0x94, 0x81, 0x33, 0xa0, 0xa4, 0x47, 0x85, 0x33, 0x4d, 0x25, 0xe5, 0xa7, + 0xd2, 0x34, 0xb4, 0xe2, 0x50, 0x25, 0xd4, 0x10, 0x0a, 0x1a, 0xeb, 0x72, 0x7e, 0xca, 0xa8, 0x89, + 0xc7, 0xcf, 0x6f, 0x19, 0x0f, 0xbb, 0xd1, 0xe9, 0xb4, 0x76, 0x35, 0x63, 0x63, 0x06, 0x83, 0x5a, + 0x20, 0x9e, 0xa1, 0xef, 0xc3, 0x52, 0x14, 0x52, 0x27, 0xe4, 0x91, 0x70, 0xa9, 0xc3, 0x02, 0x1d, + 0x90, 0xf9, 0xc6, 0x0c, 0x2e, 0x44, 0x21, 0x6d, 0x6b, 0xe9, 0x7e, 0x80, 0x3e, 0x85, 0x0f, 0xb4, + 0x53, 0xdf, 0x44, 0x54, 0x9c, 0x39, 0x01, 0x11, 0x64, 0x48, 0x65, 0xb2, 0x93, 0x59, 0xb3, 0x93, + 0xbb, 0x0a, 0xf2, 0x5c, 0x21, 0x5a, 0x09, 0x40, 0xef, 0xe8, 0x21, 0x94, 0x86, 0xcc, 0x67, 0xc3, + 0x68, 0xe8, 0x08, 0xe6, 0xf7, 0x9d, 0x90, 0x7d, 0x4b, 0x75, 0x7d, 0xe7, 0xf0, 0x8a, 0x51, 0x60, + 0xe6, 0xf7, 0xdb, 0xec, 0x5b, 0x5a, 0x19, 0x02, 0x4c, 0x5d, 0x7d, 0x43, 0xd9, 0x21, 0xc8, 0x05, + 0x44, 0x0e, 0x4c, 0xfa, 0xea, 0x31, 0xda, 0x04, 0x4b, 0xca, 0xe4, 0x5a, 0xfa, 0xc0, 0x8e, 0x7b, + 0x0a, 0x3b, 0xe9, 0x29, 0xec, 0xba, 0xe9, 0x39, 0x0c, 0x8f, 0xc2, 0xd6, 0x00, 0xe6, 0x55, 0xd6, + 0x39, 0xa7, 0xf4, 0xac, 0xda, 0x80, 0xf9, 0x24, 0x45, 0xd1, 0x0a, 0x14, 0xf0, 0xd1, 0xf1, 0x61, + 0xdd, 0xc1, 0x47, 0xb5, 0xfd, 0xc3, 0xe2, 0x0c, 0x5a, 0x06, 0x68, 0xee, 0xed, 0xb4, 0x3b, 0xce, + 0xee, 0xd1, 0xe1, 0x61, 0x31, 0x83, 0x00, 0xf2, 0x78, 0xe7, 0xb0, 0x7e, 0x74, 0x50, 0xcc, 0x2a, + 0x70, 0x6b, 0xa7, 0xdd, 0xee, 0x34, 0xf0, 0xd1, 0xf1, 0xb3, 0x46, 0xd1, 0xaa, 0x15, 0x60, 0xc1, + 0xeb, 0x9a, 0x42, 0xae, 0xfe, 0x71, 0x1e, 0xee, 0x5e, 0x7e, 0x11, 0xa2, 0x43, 0xb0, 0xa4, 0x1b, + 0x98, 0x3b, 0xfe, 0xb3, 0x9b, 0xde, 0xa3, 0x76, 0x67, 0xb7, 0x95, 0xba, 0xb0, 0xdc, 0x00, 0x3d, + 0x87, 0x9c, 0x3a, 0x02, 0x93, 0x33, 0x4f, 0x6f, 0x4c, 0xa8, 0x22, 0x3f, 0x61, 0xd4, 0x54, 0x95, + 0xff, 0x66, 0xa1, 0x90, 0x5a, 0x07, 0x7d, 0x08, 0x2b, 0x43, 0x32, 0x76, 0xa6, 0x37, 0x78, 0xa8, + 0xdd, 0x9f, 0xc5, 0xcb, 0x43, 0x32, 0x9e, 0xd2, 0x86, 0xa8, 0x36, 0x79, 0x2f, 0x1c, 0xc9, 0x86, + 0x94, 0x47, 0xd2, 0xb8, 0x75, 0xf5, 0xc1, 0x4c, 0x1e, 0x86, 0x4e, 0x6c, 0x80, 0x7c, 0x58, 0x92, + 0x6e, 0xe0, 0x9c, 0x52, 0x1a, 0x10, 0x8f, 0x8d, 0xa8, 0x39, 0xda, 0xfd, 0xdb, 0x44, 0xca, 0xee, + 0xb8, 0xc1, 0x57, 0x09, 0x21, 0x5e, 0x94, 0xa9, 0x59, 0xe5, 0x77, 0x19, 0x58, 0x4c, 0xab, 0xd1, + 0x5d, 0xc8, 0x07, 0x82, 0x77, 0x69, 0xbc, 0xc9, 0x25, 0x6c, 0x66, 0xe8, 0x11, 0xe4, 0xd4, 0xa6, + 0xae, 0xdf, 0x91, 0x86, 0xa1, 0x6d, 0x98, 0x67, 0xbe, 0xa4, 0x62, 0x44, 0xae, 0xcf, 0x4e, 0x3c, + 0x81, 0x56, 0xfe, 0x63, 0xc1, 0x62, 0xfa, 0x48, 0xd0, 0xa7, 0x50, 0x51, 0x87, 0xb2, 0xe9, 0xa8, + 0x23, 0x08, 0xa8, 0xdf, 0x53, 0xd5, 0x24, 0xe8, 0x37, 0x11, 0x0d, 0x65, 0x72, 0x0e, 0xdf, 0xd1, + 0x88, 0x03, 0x32, 0x6e, 0xc5, 0x7a, 0x6c, 0xd4, 0xe8, 0x7b, 0xb0, 0xa8, 0xcc, 0x26, 0xf0, 0xac, + 0x86, 0x17, 0x86, 0x64, 0x3c, 0x81, 0x3c, 0x85, 0x7b, 0x69, 0x88, 0x13, 0x50, 0x91, 0x3a, 0x69, + 0xed, 0xfa, 0x2c, 0x2e, 0xa7, 0x2c, 0x5a, 0x54, 0x4c, 0x23, 0x8e, 0x1e, 0x40, 0x21, 0x36, 0x97, + 0x82, 0xd1, 0xb8, 0xf7, 0x9a, 0xc5, 0xa0, 0xe1, 0x5a, 0x82, 0x3e, 0x83, 0x45, 0xd6, 0xf3, 0xe8, + 0x24, 0x21, 0x66, 0xaf, 0x8b, 0x45, 0x41, 0xc1, 0x93, 0x6c, 0x38, 0x83, 0xd2, 0x60, 0xcb, 0x89, + 0x82, 0xbe, 0x20, 0x3d, 0x9a, 0x3c, 0x93, 0x79, 0xfd, 0x14, 0x1d, 0xdc, 0x2a, 0xd5, 0xed, 0xc6, + 0xd6, 0x71, 0xcc, 0x6a, 0x1e, 0xd3, 0x95, 0xc1, 0x79, 0x01, 0xb2, 0xe1, 0x8e, 0xba, 0x24, 0x5d, + 0xdd, 0x27, 0x38, 0xda, 0x4f, 0x97, 0x7b, 0xe5, 0x39, 0x75, 0x55, 0xe2, 0x52, 0x14, 0xd2, 0xb8, + 0x83, 0x68, 0x19, 0x45, 0xf5, 0x73, 0x58, 0x79, 0x8d, 0x13, 0x15, 0x60, 0xae, 0xbe, 0xf7, 0xe5, + 0xce, 0x71, 0xb3, 0x53, 0x9c, 0x41, 0x08, 0x96, 0xeb, 0x47, 0xce, 0xe1, 0x51, 0xc7, 0x39, 0x6e, + 0x3d, 0xc3, 0x3b, 0xf5, 0xbd, 0x62, 0x46, 0x01, 0x92, 0x49, 0xb6, 0xfa, 0x77, 0x0b, 0x8a, 0xaf, + 0x37, 0x38, 0x68, 0x13, 0x90, 0x7a, 0xd3, 0xa8, 0x1b, 0x49, 0x36, 0xa2, 0x0e, 0x15, 0x82, 0x0b, + 0x73, 0xec, 0xb5, 0x6c, 0x39, 0x83, 0x4b, 0x29, 0xed, 0x9e, 0x56, 0xa2, 0x17, 0x50, 0x49, 0x9b, + 0xf4, 0x89, 0xa4, 0x2f, 0xc9, 0x59, 0x62, 0x9a, 0xd7, 0xf1, 0xff, 0xee, 0x85, 0xf8, 0x1f, 0xef, + 0xfb, 0xf2, 0xf1, 0xd6, 0x2f, 0x54, 0x4b, 0x80, 0xcb, 0x29, 0xfb, 0x67, 0xb1, 0xb9, 0xe1, 0xc6, + 0x70, 0x37, 0xcd, 0xbd, 0x3d, 0x1e, 0x27, 0xbc, 0x73, 0x6f, 0xc1, 0xbb, 0x9a, 0xb2, 0xdd, 0x1e, + 0x8f, 0x0d, 0x67, 0xba, 0x52, 0xb2, 0x6f, 0x5d, 0x29, 0xe8, 0x19, 0xa0, 0x2e, 0x09, 0xa9, 0x43, + 0xbf, 0x36, 0xfd, 0xa9, 0xae, 0xce, 0x6b, 0x4b, 0xad, 0xa8, 0x8c, 0xf6, 0x8c, 0x8d, 0x4a, 0x33, + 0xf4, 0x31, 0xac, 0xaa, 0x14, 0x9e, 0xf0, 0x04, 0x54, 0xb8, 0xd4, 0x97, 0x26, 0x97, 0xd1, 0x90, + 0x8c, 0x13, 0x78, 0x2b, 0xd6, 0xa0, 0x8f, 0x00, 0x0d, 0x99, 0xaf, 0x5e, 0x76, 0x4f, 0x0e, 0x26, + 0xf8, 0x59, 0x8d, 0x2f, 0x0e, 0x99, 0xdf, 0xd0, 0x0a, 0x83, 0xae, 0xfe, 0xd6, 0x82, 0xd2, 0x85, + 0x6e, 0x13, 0x1d, 0x40, 0x6e, 0xc8, 0x7b, 0x49, 0x5f, 0xf5, 0xf8, 0x06, 0x8d, 0xaa, 0xdd, 0x69, + 0xb6, 0x95, 0x69, 0xf2, 0x36, 0xaa, 0x31, 0x7a, 0x04, 0xc8, 0x64, 0xaa, 0x4b, 0x85, 0x64, 0x27, + 0xcc, 0x25, 0x32, 0x69, 0xf4, 0x4a, 0xb1, 0x66, 0x77, 0xaa, 0x50, 0x65, 0x1b, 0x08, 0x36, 0x22, + 0x92, 0xaa, 0x67, 0x50, 0x47, 0x6d, 0x01, 0x83, 0x11, 0x7d, 0x45, 0xcf, 0xd4, 0x9d, 0xef, 0x92, + 0x34, 0x57, 0x5c, 0xdb, 0x0b, 0x78, 0xd9, 0x25, 0x29, 0x22, 0xfd, 0x38, 0xb8, 0x82, 0xf6, 0xa8, + 0x2f, 0x19, 0xf1, 0xe2, 0xde, 0x60, 0xce, 0x00, 0x27, 0xe2, 0xa4, 0x23, 0x08, 0xa3, 0xae, 0x8a, + 0xa4, 0x43, 0x3c, 0xa9, 0x91, 0xf1, 0xc7, 0xd5, 0x02, 0x5e, 0x31, 0x8a, 0x1d, 0x4f, 0x2a, 0x68, + 0xa8, 0x7a, 0xd7, 0xd0, 0x67, 0x3a, 0x57, 0x17, 0xb0, 0x1a, 0x56, 0xbf, 0x80, 0x39, 0xb3, 0x6d, + 0x5d, 0x55, 0xfb, 0xed, 0x9d, 0x5a, 0x73, 0xaf, 0x38, 0xa3, 0xde, 0xe4, 0xf6, 0xfe, 0x41, 0xab, + 0xb9, 0x17, 0xbf, 0xcf, 0x07, 0xc7, 0x9d, 0xe3, 0x9d, 0x66, 0x31, 0x8b, 0x8a, 0xb0, 0xb8, 0xdf, + 0xee, 0xec, 0x1f, 0x39, 0x46, 0x62, 0x55, 0xff, 0x6d, 0xc1, 0xbd, 0x37, 0xf4, 0x75, 0xe8, 0x37, + 0x00, 0x3d, 0x16, 0x4a, 0xc1, 0xba, 0x91, 0x54, 0xc7, 0xa2, 0x1a, 0xfb, 0x2f, 0xde, 0xa9, 0x45, + 0xb4, 0xeb, 0x13, 0x1e, 0x9c, 0xe2, 0x44, 0x2f, 0x60, 0xfe, 0x84, 0x30, 0x8f, 0x8f, 0xf4, 0xe7, + 0x99, 0xe2, 0xff, 0xd9, 0xbb, 0xf1, 0x7f, 0x69, 0x58, 0xf0, 0x84, 0x0f, 0xfd, 0x18, 0xe6, 0xa8, + 0x4f, 0xba, 0x1e, 0xed, 0x99, 0x12, 0xa8, 0x5c, 0x28, 0x81, 0x1a, 0xe7, 0x5e, 0x5c, 0x87, 0x09, + 0xb4, 0xf2, 0x87, 0x0c, 0xc0, 0xd4, 0x59, 0xd5, 0x60, 0x9d, 0x08, 0x3e, 0x34, 0xdf, 0x0c, 0x7a, + 0x8c, 0x7e, 0x05, 0x59, 0xc9, 0x8d, 0xbb, 0x8d, 0xdb, 0x86, 0xc3, 0xee, 0xf0, 0xf8, 0x1b, 0x28, + 0x2b, 0x79, 0x65, 0x1b, 0xe6, 0xcc, 0xf4, 0xba, 0x6f, 0x95, 0xa5, 0xd4, 0xb7, 0x4a, 0xc5, 0x86, + 0xf9, 0x64, 0xff, 0x97, 0x3a, 0xbc, 0x6c, 0x1c, 0x56, 0x92, 0xac, 0xe4, 0xb5, 0x47, 0x7f, 0x7e, + 0x75, 0x3f, 0xf3, 0xd7, 0x57, 0xf7, 0x33, 0xff, 0x7c, 0x75, 0x3f, 0xf3, 0xe2, 0x41, 0xbc, 0x03, + 0xc6, 0xf5, 0x8f, 0xab, 0x8b, 0xbf, 0x98, 0xba, 0x79, 0x1d, 0xaf, 0xc7, 0xff, 0x0b, 0x00, 0x00, + 0xff, 0xff, 0xc4, 0x81, 0xab, 0xca, 0x25, 0x13, 0x00, 0x00, } func (m *DestinationRule) Marshal() (dAtA []byte, err error) { @@ -3091,8 +3091,8 @@ func (m *ConnectionPoolSettings_HTTPSettings) MarshalToSizedBuffer(dAtA []byte) i-- dAtA[i] = 0x18 } - if m.Http2MaxRequests != 0 { - i = encodeVarintDestinationRule(dAtA, i, uint64(m.Http2MaxRequests)) + if m.MaxRequests != 0 { + i = encodeVarintDestinationRule(dAtA, i, uint64(m.MaxRequests)) i-- dAtA[i] = 0x10 } @@ -3764,8 +3764,8 @@ func (m *ConnectionPoolSettings_HTTPSettings) Size() (n int) { if m.Http1MaxPendingRequests != 0 { n += 1 + sovDestinationRule(uint64(m.Http1MaxPendingRequests)) } - if m.Http2MaxRequests != 0 { - n += 1 + sovDestinationRule(uint64(m.Http2MaxRequests)) + if m.MaxRequests != 0 { + n += 1 + sovDestinationRule(uint64(m.MaxRequests)) } if m.MaxRequestsPerConnection != 0 { n += 1 + sovDestinationRule(uint64(m.MaxRequestsPerConnection)) @@ -5776,9 +5776,9 @@ func (m *ConnectionPoolSettings_HTTPSettings) Unmarshal(dAtA []byte) error { } case 2: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Http2MaxRequests", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field MaxRequests", wireType) } - m.Http2MaxRequests = 0 + m.MaxRequests = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowDestinationRule @@ -5788,7 +5788,7 @@ func (m *ConnectionPoolSettings_HTTPSettings) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Http2MaxRequests |= int32(b&0x7F) << shift + m.MaxRequests |= int32(b&0x7F) << shift if b < 0x80 { break } diff --git a/networking/v1beta1/destination_rule.proto b/networking/v1beta1/destination_rule.proto index e1d620ddb5f..b4962f73c5f 100644 --- a/networking/v1beta1/destination_rule.proto +++ b/networking/v1beta1/destination_rule.proto @@ -603,7 +603,7 @@ message ConnectionPoolSettings { int32 http1_max_pending_requests = 1; // Maximum number of requests to a backend. Default 2^32-1. - int32 http2_max_requests = 2; + int32 max_requests = 2; // Maximum number of requests per connection to a backend. Setting this // parameter to 1 disables keep alive. Default 0, meaning "unlimited", @@ -679,7 +679,7 @@ message ConnectionPoolSettings { // tcp: // maxConnections: 100 // http: -// http2MaxRequests: 1000 +// maxRequests: 1000 // maxRequestsPerConnection: 10 // outlierDetection: // consecutiveErrors: 7 @@ -701,7 +701,7 @@ message ConnectionPoolSettings { // tcp: // maxConnections: 100 // http: -// http2MaxRequests: 1000 +// maxRequests: 1000 // maxRequestsPerConnection: 10 // outlierDetection: // consecutiveErrors: 7 diff --git a/proto.lock b/proto.lock index b8778c0ed02..8ef071e1d25 100644 --- a/proto.lock +++ b/proto.lock @@ -34395,7 +34395,7 @@ }, { "id": 2, - "name": "http2_max_requests", + "name": "max_requests", "type": "int32" }, { @@ -37090,7 +37090,7 @@ }, { "id": 2, - "name": "http2_max_requests", + "name": "max_requests", "type": "int32" }, { diff --git a/python/istio_api/networking/v1alpha3/destination_rule_pb2.py b/python/istio_api/networking/v1alpha3/destination_rule_pb2.py index 10697ceb9ea..41fdd6547df 100644 --- a/python/istio_api/networking/v1alpha3/destination_rule_pb2.py +++ b/python/istio_api/networking/v1alpha3/destination_rule_pb2.py @@ -25,7 +25,7 @@ package='istio.networking.v1alpha3', syntax='proto3', serialized_options=_b('Z istio.io/api/networking/v1alpha3'), - serialized_pb=_b('\n*networking/v1alpha3/destination_rule.proto\x12\x19istio.networking.v1alpha3\x1a\x1fgoogle/api/field_behavior.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1egoogle/protobuf/wrappers.proto\x1a)networking/v1alpha3/virtual_service.proto\x1a\x14gogoproto/gogo.proto\"\xd6\x01\n\x0f\x44\x65stinationRule\x12\x18\n\x04host\x18\x01 \x01(\tB\x04\xe2\x41\x01\x02R\x04host\x12O\n\x0etraffic_policy\x18\x02 \x01(\x0b\x32(.istio.networking.v1alpha3.TrafficPolicyR\rtrafficPolicy\x12;\n\x07subsets\x18\x03 \x03(\x0b\x32!.istio.networking.v1alpha3.SubsetR\x07subsets\x12\x1b\n\texport_to\x18\x04 \x03(\tR\x08\x65xportTo\"\xe6\x06\n\rTrafficPolicy\x12T\n\rload_balancer\x18\x01 \x01(\x0b\x32/.istio.networking.v1alpha3.LoadBalancerSettingsR\x0cloadBalancer\x12Z\n\x0f\x63onnection_pool\x18\x02 \x01(\x0b\x32\x31.istio.networking.v1alpha3.ConnectionPoolSettingsR\x0e\x63onnectionPool\x12X\n\x11outlier_detection\x18\x03 \x01(\x0b\x32+.istio.networking.v1alpha3.OutlierDetectionR\x10outlierDetection\x12>\n\x03tls\x18\x04 \x01(\x0b\x32,.istio.networking.v1alpha3.ClientTLSSettingsR\x03tls\x12j\n\x13port_level_settings\x18\x05 \x03(\x0b\x32:.istio.networking.v1alpha3.TrafficPolicy.PortTrafficPolicyR\x11portLevelSettings\x1a\x9c\x03\n\x11PortTrafficPolicy\x12;\n\x04port\x18\x01 \x01(\x0b\x32\'.istio.networking.v1alpha3.PortSelectorR\x04port\x12T\n\rload_balancer\x18\x02 \x01(\x0b\x32/.istio.networking.v1alpha3.LoadBalancerSettingsR\x0cloadBalancer\x12Z\n\x0f\x63onnection_pool\x18\x03 \x01(\x0b\x32\x31.istio.networking.v1alpha3.ConnectionPoolSettingsR\x0e\x63onnectionPool\x12X\n\x11outlier_detection\x18\x04 \x01(\x0b\x32+.istio.networking.v1alpha3.OutlierDetectionR\x10outlierDetection\x12>\n\x03tls\x18\x05 \x01(\x0b\x32,.istio.networking.v1alpha3.ClientTLSSettingsR\x03tls\"\xf5\x01\n\x06Subset\x12\x18\n\x04name\x18\x01 \x01(\tB\x04\xe2\x41\x01\x02R\x04name\x12\x45\n\x06labels\x18\x02 \x03(\x0b\x32-.istio.networking.v1alpha3.Subset.LabelsEntryR\x06labels\x12O\n\x0etraffic_policy\x18\x03 \x01(\x0b\x32(.istio.networking.v1alpha3.TrafficPolicyR\rtrafficPolicy\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\xd1\x06\n\x14LoadBalancerSettings\x12R\n\x06simple\x18\x01 \x01(\x0e\x32\x38.istio.networking.v1alpha3.LoadBalancerSettings.SimpleLBH\x00R\x06simple\x12k\n\x0f\x63onsistent_hash\x18\x02 \x01(\x0b\x32@.istio.networking.v1alpha3.LoadBalancerSettings.ConsistentHashLBH\x00R\x0e\x63onsistentHash\x12\x66\n\x13locality_lb_setting\x18\x03 \x01(\x0b\x32\x36.istio.networking.v1alpha3.LocalityLoadBalancerSettingR\x11localityLbSetting\x1a\xb8\x03\n\x10\x43onsistentHashLB\x12*\n\x10http_header_name\x18\x01 \x01(\tH\x00R\x0ehttpHeaderName\x12n\n\x0bhttp_cookie\x18\x02 \x01(\x0b\x32K.istio.networking.v1alpha3.LoadBalancerSettings.ConsistentHashLB.HTTPCookieH\x00R\nhttpCookie\x12$\n\ruse_source_ip\x18\x03 \x01(\x08H\x00R\x0buseSourceIp\x12;\n\x19http_query_parameter_name\x18\x05 \x01(\tH\x00R\x16httpQueryParameterName\x12*\n\x11minimum_ring_size\x18\x04 \x01(\x04R\x0fminimumRingSize\x1am\n\nHTTPCookie\x12\x18\n\x04name\x18\x01 \x01(\tB\x04\xe2\x41\x01\x02R\x04name\x12\x12\n\x04path\x18\x02 \x01(\tR\x04path\x12\x31\n\x03ttl\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationB\x04\xe2\x41\x01\x02R\x03ttlB\n\n\x08hash_key\"H\n\x08SimpleLB\x12\x0f\n\x0bROUND_ROBIN\x10\x00\x12\x0e\n\nLEAST_CONN\x10\x01\x12\n\n\x06RANDOM\x10\x02\x12\x0f\n\x0bPASSTHROUGH\x10\x03\x42\x0b\n\tlb_policy\"\xc1\x08\n\x16\x43onnectionPoolSettings\x12O\n\x03tcp\x18\x01 \x01(\x0b\x32=.istio.networking.v1alpha3.ConnectionPoolSettings.TCPSettingsR\x03tcp\x12R\n\x04http\x18\x02 \x01(\x0b\x32>.istio.networking.v1alpha3.ConnectionPoolSettings.HTTPSettingsR\x04http\x1a\xfa\x02\n\x0bTCPSettings\x12\'\n\x0fmax_connections\x18\x01 \x01(\x05R\x0emaxConnections\x12\x42\n\x0f\x63onnect_timeout\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationR\x0e\x63onnectTimeout\x12o\n\rtcp_keepalive\x18\x03 \x01(\x0b\x32J.istio.networking.v1alpha3.ConnectionPoolSettings.TCPSettings.TcpKeepaliveR\x0ctcpKeepalive\x1a\x8c\x01\n\x0cTcpKeepalive\x12\x16\n\x06probes\x18\x01 \x01(\rR\x06probes\x12-\n\x04time\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationR\x04time\x12\x35\n\x08interval\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationR\x08interval\x1a\x84\x04\n\x0cHTTPSettings\x12;\n\x1ahttp1_max_pending_requests\x18\x01 \x01(\x05R\x17http1MaxPendingRequests\x12,\n\x12http2_max_requests\x18\x02 \x01(\x05R\x10http2MaxRequests\x12=\n\x1bmax_requests_per_connection\x18\x03 \x01(\x05R\x18maxRequestsPerConnection\x12\x1f\n\x0bmax_retries\x18\x04 \x01(\x05R\nmaxRetries\x12<\n\x0cidle_timeout\x18\x05 \x01(\x0b\x32\x19.google.protobuf.DurationR\x0bidleTimeout\x12z\n\x11h2_upgrade_policy\x18\x06 \x01(\x0e\x32N.istio.networking.v1alpha3.ConnectionPoolSettings.HTTPSettings.H2UpgradePolicyR\x0fh2UpgradePolicy\x12.\n\x13use_client_protocol\x18\x07 \x01(\x08R\x11useClientProtocol\"?\n\x0fH2UpgradePolicy\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10\x00\x12\x12\n\x0e\x44O_NOT_UPGRADE\x10\x01\x12\x0b\n\x07UPGRADE\x10\x02\"\xd5\x03\n\x10OutlierDetection\x12\x31\n\x12\x63onsecutive_errors\x18\x01 \x01(\x05\x42\x02\x18\x01R\x11\x63onsecutiveErrors\x12Z\n\x1a\x63onsecutive_gateway_errors\x18\x06 \x01(\x0b\x32\x1c.google.protobuf.UInt32ValueR\x18\x63onsecutiveGatewayErrors\x12R\n\x16\x63onsecutive_5xx_errors\x18\x07 \x01(\x0b\x32\x1c.google.protobuf.UInt32ValueR\x14\x63onsecutive5xxErrors\x12\x35\n\x08interval\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationR\x08interval\x12G\n\x12\x62\x61se_ejection_time\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationR\x10\x62\x61seEjectionTime\x12\x30\n\x14max_ejection_percent\x18\x04 \x01(\x05R\x12maxEjectionPercent\x12,\n\x12min_health_percent\x18\x05 \x01(\x05R\x10minHealthPercent\"\x85\x03\n\x11\x43lientTLSSettings\x12N\n\x04mode\x18\x01 \x01(\x0e\x32\x34.istio.networking.v1alpha3.ClientTLSSettings.TLSmodeB\x04\xe2\x41\x01\x02R\x04mode\x12-\n\x12\x63lient_certificate\x18\x02 \x01(\tR\x11\x63lientCertificate\x12\x1f\n\x0bprivate_key\x18\x03 \x01(\tR\nprivateKey\x12\'\n\x0f\x63\x61_certificates\x18\x04 \x01(\tR\x0e\x63\x61\x43\x65rtificates\x12\'\n\x0f\x63redential_name\x18\x07 \x01(\tR\x0e\x63redentialName\x12*\n\x11subject_alt_names\x18\x05 \x03(\tR\x0fsubjectAltNames\x12\x10\n\x03sni\x18\x06 \x01(\tR\x03sni\"@\n\x07TLSmode\x12\x0b\n\x07\x44ISABLE\x10\x00\x12\n\n\x06SIMPLE\x10\x01\x12\n\n\x06MUTUAL\x10\x02\x12\x10\n\x0cISTIO_MUTUAL\x10\x03\"\xf8\x03\n\x1bLocalityLoadBalancerSetting\x12\x61\n\ndistribute\x18\x01 \x03(\x0b\x32\x41.istio.networking.v1alpha3.LocalityLoadBalancerSetting.DistributeR\ndistribute\x12[\n\x08\x66\x61ilover\x18\x02 \x03(\x0b\x32?.istio.networking.v1alpha3.LocalityLoadBalancerSetting.FailoverR\x08\x66\x61ilover\x12\x34\n\x07\x65nabled\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.BoolValueR\x07\x65nabled\x1a\xb2\x01\n\nDistribute\x12\x12\n\x04\x66rom\x18\x01 \x01(\tR\x04\x66rom\x12Y\n\x02to\x18\x02 \x03(\x0b\x32I.istio.networking.v1alpha3.LocalityLoadBalancerSetting.Distribute.ToEntryR\x02to\x1a\x35\n\x07ToEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\rR\x05value:\x02\x38\x01\x1a.\n\x08\x46\x61ilover\x12\x12\n\x04\x66rom\x18\x01 \x01(\tR\x04\x66rom\x12\x0e\n\x02to\x18\x02 \x01(\tR\x02toB\"Z istio.io/api/networking/v1alpha3b\x06proto3') + serialized_pb=_b('\n*networking/v1alpha3/destination_rule.proto\x12\x19istio.networking.v1alpha3\x1a\x1fgoogle/api/field_behavior.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1egoogle/protobuf/wrappers.proto\x1a)networking/v1alpha3/virtual_service.proto\x1a\x14gogoproto/gogo.proto\"\xd6\x01\n\x0f\x44\x65stinationRule\x12\x18\n\x04host\x18\x01 \x01(\tB\x04\xe2\x41\x01\x02R\x04host\x12O\n\x0etraffic_policy\x18\x02 \x01(\x0b\x32(.istio.networking.v1alpha3.TrafficPolicyR\rtrafficPolicy\x12;\n\x07subsets\x18\x03 \x03(\x0b\x32!.istio.networking.v1alpha3.SubsetR\x07subsets\x12\x1b\n\texport_to\x18\x04 \x03(\tR\x08\x65xportTo\"\xe6\x06\n\rTrafficPolicy\x12T\n\rload_balancer\x18\x01 \x01(\x0b\x32/.istio.networking.v1alpha3.LoadBalancerSettingsR\x0cloadBalancer\x12Z\n\x0f\x63onnection_pool\x18\x02 \x01(\x0b\x32\x31.istio.networking.v1alpha3.ConnectionPoolSettingsR\x0e\x63onnectionPool\x12X\n\x11outlier_detection\x18\x03 \x01(\x0b\x32+.istio.networking.v1alpha3.OutlierDetectionR\x10outlierDetection\x12>\n\x03tls\x18\x04 \x01(\x0b\x32,.istio.networking.v1alpha3.ClientTLSSettingsR\x03tls\x12j\n\x13port_level_settings\x18\x05 \x03(\x0b\x32:.istio.networking.v1alpha3.TrafficPolicy.PortTrafficPolicyR\x11portLevelSettings\x1a\x9c\x03\n\x11PortTrafficPolicy\x12;\n\x04port\x18\x01 \x01(\x0b\x32\'.istio.networking.v1alpha3.PortSelectorR\x04port\x12T\n\rload_balancer\x18\x02 \x01(\x0b\x32/.istio.networking.v1alpha3.LoadBalancerSettingsR\x0cloadBalancer\x12Z\n\x0f\x63onnection_pool\x18\x03 \x01(\x0b\x32\x31.istio.networking.v1alpha3.ConnectionPoolSettingsR\x0e\x63onnectionPool\x12X\n\x11outlier_detection\x18\x04 \x01(\x0b\x32+.istio.networking.v1alpha3.OutlierDetectionR\x10outlierDetection\x12>\n\x03tls\x18\x05 \x01(\x0b\x32,.istio.networking.v1alpha3.ClientTLSSettingsR\x03tls\"\xf5\x01\n\x06Subset\x12\x18\n\x04name\x18\x01 \x01(\tB\x04\xe2\x41\x01\x02R\x04name\x12\x45\n\x06labels\x18\x02 \x03(\x0b\x32-.istio.networking.v1alpha3.Subset.LabelsEntryR\x06labels\x12O\n\x0etraffic_policy\x18\x03 \x01(\x0b\x32(.istio.networking.v1alpha3.TrafficPolicyR\rtrafficPolicy\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\xd1\x06\n\x14LoadBalancerSettings\x12R\n\x06simple\x18\x01 \x01(\x0e\x32\x38.istio.networking.v1alpha3.LoadBalancerSettings.SimpleLBH\x00R\x06simple\x12k\n\x0f\x63onsistent_hash\x18\x02 \x01(\x0b\x32@.istio.networking.v1alpha3.LoadBalancerSettings.ConsistentHashLBH\x00R\x0e\x63onsistentHash\x12\x66\n\x13locality_lb_setting\x18\x03 \x01(\x0b\x32\x36.istio.networking.v1alpha3.LocalityLoadBalancerSettingR\x11localityLbSetting\x1a\xb8\x03\n\x10\x43onsistentHashLB\x12*\n\x10http_header_name\x18\x01 \x01(\tH\x00R\x0ehttpHeaderName\x12n\n\x0bhttp_cookie\x18\x02 \x01(\x0b\x32K.istio.networking.v1alpha3.LoadBalancerSettings.ConsistentHashLB.HTTPCookieH\x00R\nhttpCookie\x12$\n\ruse_source_ip\x18\x03 \x01(\x08H\x00R\x0buseSourceIp\x12;\n\x19http_query_parameter_name\x18\x05 \x01(\tH\x00R\x16httpQueryParameterName\x12*\n\x11minimum_ring_size\x18\x04 \x01(\x04R\x0fminimumRingSize\x1am\n\nHTTPCookie\x12\x18\n\x04name\x18\x01 \x01(\tB\x04\xe2\x41\x01\x02R\x04name\x12\x12\n\x04path\x18\x02 \x01(\tR\x04path\x12\x31\n\x03ttl\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationB\x04\xe2\x41\x01\x02R\x03ttlB\n\n\x08hash_key\"H\n\x08SimpleLB\x12\x0f\n\x0bROUND_ROBIN\x10\x00\x12\x0e\n\nLEAST_CONN\x10\x01\x12\n\n\x06RANDOM\x10\x02\x12\x0f\n\x0bPASSTHROUGH\x10\x03\x42\x0b\n\tlb_policy\"\xb6\x08\n\x16\x43onnectionPoolSettings\x12O\n\x03tcp\x18\x01 \x01(\x0b\x32=.istio.networking.v1alpha3.ConnectionPoolSettings.TCPSettingsR\x03tcp\x12R\n\x04http\x18\x02 \x01(\x0b\x32>.istio.networking.v1alpha3.ConnectionPoolSettings.HTTPSettingsR\x04http\x1a\xfa\x02\n\x0bTCPSettings\x12\'\n\x0fmax_connections\x18\x01 \x01(\x05R\x0emaxConnections\x12\x42\n\x0f\x63onnect_timeout\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationR\x0e\x63onnectTimeout\x12o\n\rtcp_keepalive\x18\x03 \x01(\x0b\x32J.istio.networking.v1alpha3.ConnectionPoolSettings.TCPSettings.TcpKeepaliveR\x0ctcpKeepalive\x1a\x8c\x01\n\x0cTcpKeepalive\x12\x16\n\x06probes\x18\x01 \x01(\rR\x06probes\x12-\n\x04time\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationR\x04time\x12\x35\n\x08interval\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationR\x08interval\x1a\xf9\x03\n\x0cHTTPSettings\x12;\n\x1ahttp1_max_pending_requests\x18\x01 \x01(\x05R\x17http1MaxPendingRequests\x12!\n\x0cmax_requests\x18\x02 \x01(\x05R\x0bmaxRequests\x12=\n\x1bmax_requests_per_connection\x18\x03 \x01(\x05R\x18maxRequestsPerConnection\x12\x1f\n\x0bmax_retries\x18\x04 \x01(\x05R\nmaxRetries\x12<\n\x0cidle_timeout\x18\x05 \x01(\x0b\x32\x19.google.protobuf.DurationR\x0bidleTimeout\x12z\n\x11h2_upgrade_policy\x18\x06 \x01(\x0e\x32N.istio.networking.v1alpha3.ConnectionPoolSettings.HTTPSettings.H2UpgradePolicyR\x0fh2UpgradePolicy\x12.\n\x13use_client_protocol\x18\x07 \x01(\x08R\x11useClientProtocol\"?\n\x0fH2UpgradePolicy\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10\x00\x12\x12\n\x0e\x44O_NOT_UPGRADE\x10\x01\x12\x0b\n\x07UPGRADE\x10\x02\"\xd5\x03\n\x10OutlierDetection\x12\x31\n\x12\x63onsecutive_errors\x18\x01 \x01(\x05\x42\x02\x18\x01R\x11\x63onsecutiveErrors\x12Z\n\x1a\x63onsecutive_gateway_errors\x18\x06 \x01(\x0b\x32\x1c.google.protobuf.UInt32ValueR\x18\x63onsecutiveGatewayErrors\x12R\n\x16\x63onsecutive_5xx_errors\x18\x07 \x01(\x0b\x32\x1c.google.protobuf.UInt32ValueR\x14\x63onsecutive5xxErrors\x12\x35\n\x08interval\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationR\x08interval\x12G\n\x12\x62\x61se_ejection_time\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationR\x10\x62\x61seEjectionTime\x12\x30\n\x14max_ejection_percent\x18\x04 \x01(\x05R\x12maxEjectionPercent\x12,\n\x12min_health_percent\x18\x05 \x01(\x05R\x10minHealthPercent\"\x85\x03\n\x11\x43lientTLSSettings\x12N\n\x04mode\x18\x01 \x01(\x0e\x32\x34.istio.networking.v1alpha3.ClientTLSSettings.TLSmodeB\x04\xe2\x41\x01\x02R\x04mode\x12-\n\x12\x63lient_certificate\x18\x02 \x01(\tR\x11\x63lientCertificate\x12\x1f\n\x0bprivate_key\x18\x03 \x01(\tR\nprivateKey\x12\'\n\x0f\x63\x61_certificates\x18\x04 \x01(\tR\x0e\x63\x61\x43\x65rtificates\x12\'\n\x0f\x63redential_name\x18\x07 \x01(\tR\x0e\x63redentialName\x12*\n\x11subject_alt_names\x18\x05 \x03(\tR\x0fsubjectAltNames\x12\x10\n\x03sni\x18\x06 \x01(\tR\x03sni\"@\n\x07TLSmode\x12\x0b\n\x07\x44ISABLE\x10\x00\x12\n\n\x06SIMPLE\x10\x01\x12\n\n\x06MUTUAL\x10\x02\x12\x10\n\x0cISTIO_MUTUAL\x10\x03\"\xf8\x03\n\x1bLocalityLoadBalancerSetting\x12\x61\n\ndistribute\x18\x01 \x03(\x0b\x32\x41.istio.networking.v1alpha3.LocalityLoadBalancerSetting.DistributeR\ndistribute\x12[\n\x08\x66\x61ilover\x18\x02 \x03(\x0b\x32?.istio.networking.v1alpha3.LocalityLoadBalancerSetting.FailoverR\x08\x66\x61ilover\x12\x34\n\x07\x65nabled\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.BoolValueR\x07\x65nabled\x1a\xb2\x01\n\nDistribute\x12\x12\n\x04\x66rom\x18\x01 \x01(\tR\x04\x66rom\x12Y\n\x02to\x18\x02 \x03(\x0b\x32I.istio.networking.v1alpha3.LocalityLoadBalancerSetting.Distribute.ToEntryR\x02to\x1a\x35\n\x07ToEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\rR\x05value:\x02\x38\x01\x1a.\n\x08\x46\x61ilover\x12\x12\n\x04\x66rom\x18\x01 \x01(\tR\x04\x66rom\x12\x0e\n\x02to\x18\x02 \x01(\tR\x02toB\"Z istio.io/api/networking/v1alpha3b\x06proto3') , dependencies=[google_dot_api_dot_field__behavior__pb2.DESCRIPTOR,google_dot_protobuf_dot_duration__pb2.DESCRIPTOR,google_dot_protobuf_dot_wrappers__pb2.DESCRIPTOR,networking_dot_v1alpha3_dot_virtual__service__pb2.DESCRIPTOR,gogoproto_dot_gogo__pb2.DESCRIPTOR,]) @@ -82,8 +82,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=3452, - serialized_end=3515, + serialized_start=3441, + serialized_end=3504, ) _sym_db.RegisterEnumDescriptor(_CONNECTIONPOOLSETTINGS_HTTPSETTINGS_H2UPGRADEPOLICY) @@ -112,8 +112,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=4315, - serialized_end=4379, + serialized_start=4304, + serialized_end=4368, ) _sym_db.RegisterEnumDescriptor(_CLIENTTLSSETTINGS_TLSMODE) @@ -626,12 +626,12 @@ is_extension=False, extension_scope=None, serialized_options=None, json_name='http1MaxPendingRequests', file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='http2_max_requests', full_name='istio.networking.v1alpha3.ConnectionPoolSettings.HTTPSettings.http2_max_requests', index=1, + name='max_requests', full_name='istio.networking.v1alpha3.ConnectionPoolSettings.HTTPSettings.max_requests', index=1, number=2, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, json_name='http2MaxRequests', file=DESCRIPTOR), + serialized_options=None, json_name='maxRequests', file=DESCRIPTOR), _descriptor.FieldDescriptor( name='max_requests_per_connection', full_name='istio.networking.v1alpha3.ConnectionPoolSettings.HTTPSettings.max_requests_per_connection', index=2, number=3, type=5, cpp_type=1, label=1, @@ -681,7 +681,7 @@ oneofs=[ ], serialized_start=2999, - serialized_end=3515, + serialized_end=3504, ) _CONNECTIONPOOLSETTINGS = _descriptor.Descriptor( @@ -718,7 +718,7 @@ oneofs=[ ], serialized_start=2426, - serialized_end=3515, + serialized_end=3504, ) @@ -790,8 +790,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3518, - serialized_end=3987, + serialized_start=3507, + serialized_end=3976, ) @@ -864,8 +864,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3990, - serialized_end=4379, + serialized_start=3979, + serialized_end=4368, ) @@ -902,8 +902,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=4785, - serialized_end=4838, + serialized_start=4774, + serialized_end=4827, ) _LOCALITYLOADBALANCERSETTING_DISTRIBUTE = _descriptor.Descriptor( @@ -939,8 +939,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=4660, - serialized_end=4838, + serialized_start=4649, + serialized_end=4827, ) _LOCALITYLOADBALANCERSETTING_FAILOVER = _descriptor.Descriptor( @@ -976,8 +976,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=4840, - serialized_end=4886, + serialized_start=4829, + serialized_end=4875, ) _LOCALITYLOADBALANCERSETTING = _descriptor.Descriptor( @@ -1020,8 +1020,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=4382, - serialized_end=4886, + serialized_start=4371, + serialized_end=4875, ) _DESTINATIONRULE.fields_by_name['traffic_policy'].message_type = _TRAFFICPOLICY diff --git a/python/istio_api/networking/v1beta1/destination_rule_pb2.py b/python/istio_api/networking/v1beta1/destination_rule_pb2.py index 8335d203e09..75ddac8d0ba 100644 --- a/python/istio_api/networking/v1beta1/destination_rule_pb2.py +++ b/python/istio_api/networking/v1beta1/destination_rule_pb2.py @@ -25,7 +25,7 @@ package='istio.networking.v1beta1', syntax='proto3', serialized_options=_b('Z\037istio.io/api/networking/v1beta1'), - serialized_pb=_b('\n)networking/v1beta1/destination_rule.proto\x12\x18istio.networking.v1beta1\x1a\x1fgoogle/api/field_behavior.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1egoogle/protobuf/wrappers.proto\x1a(networking/v1beta1/virtual_service.proto\x1a\x14gogoproto/gogo.proto\"\xd4\x01\n\x0f\x44\x65stinationRule\x12\x18\n\x04host\x18\x01 \x01(\tB\x04\xe2\x41\x01\x02R\x04host\x12N\n\x0etraffic_policy\x18\x02 \x01(\x0b\x32\'.istio.networking.v1beta1.TrafficPolicyR\rtrafficPolicy\x12:\n\x07subsets\x18\x03 \x03(\x0b\x32 .istio.networking.v1beta1.SubsetR\x07subsets\x12\x1b\n\texport_to\x18\x04 \x03(\tR\x08\x65xportTo\"\xdc\x06\n\rTrafficPolicy\x12S\n\rload_balancer\x18\x01 \x01(\x0b\x32..istio.networking.v1beta1.LoadBalancerSettingsR\x0cloadBalancer\x12Y\n\x0f\x63onnection_pool\x18\x02 \x01(\x0b\x32\x30.istio.networking.v1beta1.ConnectionPoolSettingsR\x0e\x63onnectionPool\x12W\n\x11outlier_detection\x18\x03 \x01(\x0b\x32*.istio.networking.v1beta1.OutlierDetectionR\x10outlierDetection\x12=\n\x03tls\x18\x04 \x01(\x0b\x32+.istio.networking.v1beta1.ClientTLSSettingsR\x03tls\x12i\n\x13port_level_settings\x18\x05 \x03(\x0b\x32\x39.istio.networking.v1beta1.TrafficPolicy.PortTrafficPolicyR\x11portLevelSettings\x1a\x97\x03\n\x11PortTrafficPolicy\x12:\n\x04port\x18\x01 \x01(\x0b\x32&.istio.networking.v1beta1.PortSelectorR\x04port\x12S\n\rload_balancer\x18\x02 \x01(\x0b\x32..istio.networking.v1beta1.LoadBalancerSettingsR\x0cloadBalancer\x12Y\n\x0f\x63onnection_pool\x18\x03 \x01(\x0b\x32\x30.istio.networking.v1beta1.ConnectionPoolSettingsR\x0e\x63onnectionPool\x12W\n\x11outlier_detection\x18\x04 \x01(\x0b\x32*.istio.networking.v1beta1.OutlierDetectionR\x10outlierDetection\x12=\n\x03tls\x18\x05 \x01(\x0b\x32+.istio.networking.v1beta1.ClientTLSSettingsR\x03tls\"\xf3\x01\n\x06Subset\x12\x18\n\x04name\x18\x01 \x01(\tB\x04\xe2\x41\x01\x02R\x04name\x12\x44\n\x06labels\x18\x02 \x03(\x0b\x32,.istio.networking.v1beta1.Subset.LabelsEntryR\x06labels\x12N\n\x0etraffic_policy\x18\x03 \x01(\x0b\x32\'.istio.networking.v1beta1.TrafficPolicyR\rtrafficPolicy\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\xcd\x06\n\x14LoadBalancerSettings\x12Q\n\x06simple\x18\x01 \x01(\x0e\x32\x37.istio.networking.v1beta1.LoadBalancerSettings.SimpleLBH\x00R\x06simple\x12j\n\x0f\x63onsistent_hash\x18\x02 \x01(\x0b\x32?.istio.networking.v1beta1.LoadBalancerSettings.ConsistentHashLBH\x00R\x0e\x63onsistentHash\x12\x65\n\x13locality_lb_setting\x18\x03 \x01(\x0b\x32\x35.istio.networking.v1beta1.LocalityLoadBalancerSettingR\x11localityLbSetting\x1a\xb7\x03\n\x10\x43onsistentHashLB\x12*\n\x10http_header_name\x18\x01 \x01(\tH\x00R\x0ehttpHeaderName\x12m\n\x0bhttp_cookie\x18\x02 \x01(\x0b\x32J.istio.networking.v1beta1.LoadBalancerSettings.ConsistentHashLB.HTTPCookieH\x00R\nhttpCookie\x12$\n\ruse_source_ip\x18\x03 \x01(\x08H\x00R\x0buseSourceIp\x12;\n\x19http_query_parameter_name\x18\x05 \x01(\tH\x00R\x16httpQueryParameterName\x12*\n\x11minimum_ring_size\x18\x04 \x01(\x04R\x0fminimumRingSize\x1am\n\nHTTPCookie\x12\x18\n\x04name\x18\x01 \x01(\tB\x04\xe2\x41\x01\x02R\x04name\x12\x12\n\x04path\x18\x02 \x01(\tR\x04path\x12\x31\n\x03ttl\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationB\x04\xe2\x41\x01\x02R\x03ttlB\n\n\x08hash_key\"H\n\x08SimpleLB\x12\x0f\n\x0bROUND_ROBIN\x10\x00\x12\x0e\n\nLEAST_CONN\x10\x01\x12\n\n\x06RANDOM\x10\x02\x12\x0f\n\x0bPASSTHROUGH\x10\x03\x42\x0b\n\tlb_policy\"\xbd\x08\n\x16\x43onnectionPoolSettings\x12N\n\x03tcp\x18\x01 \x01(\x0b\x32<.istio.networking.v1beta1.ConnectionPoolSettings.TCPSettingsR\x03tcp\x12Q\n\x04http\x18\x02 \x01(\x0b\x32=.istio.networking.v1beta1.ConnectionPoolSettings.HTTPSettingsR\x04http\x1a\xf9\x02\n\x0bTCPSettings\x12\'\n\x0fmax_connections\x18\x01 \x01(\x05R\x0emaxConnections\x12\x42\n\x0f\x63onnect_timeout\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationR\x0e\x63onnectTimeout\x12n\n\rtcp_keepalive\x18\x03 \x01(\x0b\x32I.istio.networking.v1beta1.ConnectionPoolSettings.TCPSettings.TcpKeepaliveR\x0ctcpKeepalive\x1a\x8c\x01\n\x0cTcpKeepalive\x12\x16\n\x06probes\x18\x01 \x01(\rR\x06probes\x12-\n\x04time\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationR\x04time\x12\x35\n\x08interval\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationR\x08interval\x1a\x83\x04\n\x0cHTTPSettings\x12;\n\x1ahttp1_max_pending_requests\x18\x01 \x01(\x05R\x17http1MaxPendingRequests\x12,\n\x12http2_max_requests\x18\x02 \x01(\x05R\x10http2MaxRequests\x12=\n\x1bmax_requests_per_connection\x18\x03 \x01(\x05R\x18maxRequestsPerConnection\x12\x1f\n\x0bmax_retries\x18\x04 \x01(\x05R\nmaxRetries\x12<\n\x0cidle_timeout\x18\x05 \x01(\x0b\x32\x19.google.protobuf.DurationR\x0bidleTimeout\x12y\n\x11h2_upgrade_policy\x18\x06 \x01(\x0e\x32M.istio.networking.v1beta1.ConnectionPoolSettings.HTTPSettings.H2UpgradePolicyR\x0fh2UpgradePolicy\x12.\n\x13use_client_protocol\x18\x07 \x01(\x08R\x11useClientProtocol\"?\n\x0fH2UpgradePolicy\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10\x00\x12\x12\n\x0e\x44O_NOT_UPGRADE\x10\x01\x12\x0b\n\x07UPGRADE\x10\x02\"\xd5\x03\n\x10OutlierDetection\x12\x31\n\x12\x63onsecutive_errors\x18\x01 \x01(\x05\x42\x02\x18\x01R\x11\x63onsecutiveErrors\x12Z\n\x1a\x63onsecutive_gateway_errors\x18\x06 \x01(\x0b\x32\x1c.google.protobuf.UInt32ValueR\x18\x63onsecutiveGatewayErrors\x12R\n\x16\x63onsecutive_5xx_errors\x18\x07 \x01(\x0b\x32\x1c.google.protobuf.UInt32ValueR\x14\x63onsecutive5xxErrors\x12\x35\n\x08interval\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationR\x08interval\x12G\n\x12\x62\x61se_ejection_time\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationR\x10\x62\x61seEjectionTime\x12\x30\n\x14max_ejection_percent\x18\x04 \x01(\x05R\x12maxEjectionPercent\x12,\n\x12min_health_percent\x18\x05 \x01(\x05R\x10minHealthPercent\"\x84\x03\n\x11\x43lientTLSSettings\x12M\n\x04mode\x18\x01 \x01(\x0e\x32\x33.istio.networking.v1beta1.ClientTLSSettings.TLSmodeB\x04\xe2\x41\x01\x02R\x04mode\x12-\n\x12\x63lient_certificate\x18\x02 \x01(\tR\x11\x63lientCertificate\x12\x1f\n\x0bprivate_key\x18\x03 \x01(\tR\nprivateKey\x12\'\n\x0f\x63\x61_certificates\x18\x04 \x01(\tR\x0e\x63\x61\x43\x65rtificates\x12\'\n\x0f\x63redential_name\x18\x07 \x01(\tR\x0e\x63redentialName\x12*\n\x11subject_alt_names\x18\x05 \x03(\tR\x0fsubjectAltNames\x12\x10\n\x03sni\x18\x06 \x01(\tR\x03sni\"@\n\x07TLSmode\x12\x0b\n\x07\x44ISABLE\x10\x00\x12\n\n\x06SIMPLE\x10\x01\x12\n\n\x06MUTUAL\x10\x02\x12\x10\n\x0cISTIO_MUTUAL\x10\x03\"\xf5\x03\n\x1bLocalityLoadBalancerSetting\x12`\n\ndistribute\x18\x01 \x03(\x0b\x32@.istio.networking.v1beta1.LocalityLoadBalancerSetting.DistributeR\ndistribute\x12Z\n\x08\x66\x61ilover\x18\x02 \x03(\x0b\x32>.istio.networking.v1beta1.LocalityLoadBalancerSetting.FailoverR\x08\x66\x61ilover\x12\x34\n\x07\x65nabled\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.BoolValueR\x07\x65nabled\x1a\xb1\x01\n\nDistribute\x12\x12\n\x04\x66rom\x18\x01 \x01(\tR\x04\x66rom\x12X\n\x02to\x18\x02 \x03(\x0b\x32H.istio.networking.v1beta1.LocalityLoadBalancerSetting.Distribute.ToEntryR\x02to\x1a\x35\n\x07ToEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\rR\x05value:\x02\x38\x01\x1a.\n\x08\x46\x61ilover\x12\x12\n\x04\x66rom\x18\x01 \x01(\tR\x04\x66rom\x12\x0e\n\x02to\x18\x02 \x01(\tR\x02toB!Z\x1fistio.io/api/networking/v1beta1b\x06proto3') + serialized_pb=_b('\n)networking/v1beta1/destination_rule.proto\x12\x18istio.networking.v1beta1\x1a\x1fgoogle/api/field_behavior.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1egoogle/protobuf/wrappers.proto\x1a(networking/v1beta1/virtual_service.proto\x1a\x14gogoproto/gogo.proto\"\xd4\x01\n\x0f\x44\x65stinationRule\x12\x18\n\x04host\x18\x01 \x01(\tB\x04\xe2\x41\x01\x02R\x04host\x12N\n\x0etraffic_policy\x18\x02 \x01(\x0b\x32\'.istio.networking.v1beta1.TrafficPolicyR\rtrafficPolicy\x12:\n\x07subsets\x18\x03 \x03(\x0b\x32 .istio.networking.v1beta1.SubsetR\x07subsets\x12\x1b\n\texport_to\x18\x04 \x03(\tR\x08\x65xportTo\"\xdc\x06\n\rTrafficPolicy\x12S\n\rload_balancer\x18\x01 \x01(\x0b\x32..istio.networking.v1beta1.LoadBalancerSettingsR\x0cloadBalancer\x12Y\n\x0f\x63onnection_pool\x18\x02 \x01(\x0b\x32\x30.istio.networking.v1beta1.ConnectionPoolSettingsR\x0e\x63onnectionPool\x12W\n\x11outlier_detection\x18\x03 \x01(\x0b\x32*.istio.networking.v1beta1.OutlierDetectionR\x10outlierDetection\x12=\n\x03tls\x18\x04 \x01(\x0b\x32+.istio.networking.v1beta1.ClientTLSSettingsR\x03tls\x12i\n\x13port_level_settings\x18\x05 \x03(\x0b\x32\x39.istio.networking.v1beta1.TrafficPolicy.PortTrafficPolicyR\x11portLevelSettings\x1a\x97\x03\n\x11PortTrafficPolicy\x12:\n\x04port\x18\x01 \x01(\x0b\x32&.istio.networking.v1beta1.PortSelectorR\x04port\x12S\n\rload_balancer\x18\x02 \x01(\x0b\x32..istio.networking.v1beta1.LoadBalancerSettingsR\x0cloadBalancer\x12Y\n\x0f\x63onnection_pool\x18\x03 \x01(\x0b\x32\x30.istio.networking.v1beta1.ConnectionPoolSettingsR\x0e\x63onnectionPool\x12W\n\x11outlier_detection\x18\x04 \x01(\x0b\x32*.istio.networking.v1beta1.OutlierDetectionR\x10outlierDetection\x12=\n\x03tls\x18\x05 \x01(\x0b\x32+.istio.networking.v1beta1.ClientTLSSettingsR\x03tls\"\xf3\x01\n\x06Subset\x12\x18\n\x04name\x18\x01 \x01(\tB\x04\xe2\x41\x01\x02R\x04name\x12\x44\n\x06labels\x18\x02 \x03(\x0b\x32,.istio.networking.v1beta1.Subset.LabelsEntryR\x06labels\x12N\n\x0etraffic_policy\x18\x03 \x01(\x0b\x32\'.istio.networking.v1beta1.TrafficPolicyR\rtrafficPolicy\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\xcd\x06\n\x14LoadBalancerSettings\x12Q\n\x06simple\x18\x01 \x01(\x0e\x32\x37.istio.networking.v1beta1.LoadBalancerSettings.SimpleLBH\x00R\x06simple\x12j\n\x0f\x63onsistent_hash\x18\x02 \x01(\x0b\x32?.istio.networking.v1beta1.LoadBalancerSettings.ConsistentHashLBH\x00R\x0e\x63onsistentHash\x12\x65\n\x13locality_lb_setting\x18\x03 \x01(\x0b\x32\x35.istio.networking.v1beta1.LocalityLoadBalancerSettingR\x11localityLbSetting\x1a\xb7\x03\n\x10\x43onsistentHashLB\x12*\n\x10http_header_name\x18\x01 \x01(\tH\x00R\x0ehttpHeaderName\x12m\n\x0bhttp_cookie\x18\x02 \x01(\x0b\x32J.istio.networking.v1beta1.LoadBalancerSettings.ConsistentHashLB.HTTPCookieH\x00R\nhttpCookie\x12$\n\ruse_source_ip\x18\x03 \x01(\x08H\x00R\x0buseSourceIp\x12;\n\x19http_query_parameter_name\x18\x05 \x01(\tH\x00R\x16httpQueryParameterName\x12*\n\x11minimum_ring_size\x18\x04 \x01(\x04R\x0fminimumRingSize\x1am\n\nHTTPCookie\x12\x18\n\x04name\x18\x01 \x01(\tB\x04\xe2\x41\x01\x02R\x04name\x12\x12\n\x04path\x18\x02 \x01(\tR\x04path\x12\x31\n\x03ttl\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationB\x04\xe2\x41\x01\x02R\x03ttlB\n\n\x08hash_key\"H\n\x08SimpleLB\x12\x0f\n\x0bROUND_ROBIN\x10\x00\x12\x0e\n\nLEAST_CONN\x10\x01\x12\n\n\x06RANDOM\x10\x02\x12\x0f\n\x0bPASSTHROUGH\x10\x03\x42\x0b\n\tlb_policy\"\xb2\x08\n\x16\x43onnectionPoolSettings\x12N\n\x03tcp\x18\x01 \x01(\x0b\x32<.istio.networking.v1beta1.ConnectionPoolSettings.TCPSettingsR\x03tcp\x12Q\n\x04http\x18\x02 \x01(\x0b\x32=.istio.networking.v1beta1.ConnectionPoolSettings.HTTPSettingsR\x04http\x1a\xf9\x02\n\x0bTCPSettings\x12\'\n\x0fmax_connections\x18\x01 \x01(\x05R\x0emaxConnections\x12\x42\n\x0f\x63onnect_timeout\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationR\x0e\x63onnectTimeout\x12n\n\rtcp_keepalive\x18\x03 \x01(\x0b\x32I.istio.networking.v1beta1.ConnectionPoolSettings.TCPSettings.TcpKeepaliveR\x0ctcpKeepalive\x1a\x8c\x01\n\x0cTcpKeepalive\x12\x16\n\x06probes\x18\x01 \x01(\rR\x06probes\x12-\n\x04time\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationR\x04time\x12\x35\n\x08interval\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationR\x08interval\x1a\xf8\x03\n\x0cHTTPSettings\x12;\n\x1ahttp1_max_pending_requests\x18\x01 \x01(\x05R\x17http1MaxPendingRequests\x12!\n\x0cmax_requests\x18\x02 \x01(\x05R\x0bmaxRequests\x12=\n\x1bmax_requests_per_connection\x18\x03 \x01(\x05R\x18maxRequestsPerConnection\x12\x1f\n\x0bmax_retries\x18\x04 \x01(\x05R\nmaxRetries\x12<\n\x0cidle_timeout\x18\x05 \x01(\x0b\x32\x19.google.protobuf.DurationR\x0bidleTimeout\x12y\n\x11h2_upgrade_policy\x18\x06 \x01(\x0e\x32M.istio.networking.v1beta1.ConnectionPoolSettings.HTTPSettings.H2UpgradePolicyR\x0fh2UpgradePolicy\x12.\n\x13use_client_protocol\x18\x07 \x01(\x08R\x11useClientProtocol\"?\n\x0fH2UpgradePolicy\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10\x00\x12\x12\n\x0e\x44O_NOT_UPGRADE\x10\x01\x12\x0b\n\x07UPGRADE\x10\x02\"\xd5\x03\n\x10OutlierDetection\x12\x31\n\x12\x63onsecutive_errors\x18\x01 \x01(\x05\x42\x02\x18\x01R\x11\x63onsecutiveErrors\x12Z\n\x1a\x63onsecutive_gateway_errors\x18\x06 \x01(\x0b\x32\x1c.google.protobuf.UInt32ValueR\x18\x63onsecutiveGatewayErrors\x12R\n\x16\x63onsecutive_5xx_errors\x18\x07 \x01(\x0b\x32\x1c.google.protobuf.UInt32ValueR\x14\x63onsecutive5xxErrors\x12\x35\n\x08interval\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationR\x08interval\x12G\n\x12\x62\x61se_ejection_time\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationR\x10\x62\x61seEjectionTime\x12\x30\n\x14max_ejection_percent\x18\x04 \x01(\x05R\x12maxEjectionPercent\x12,\n\x12min_health_percent\x18\x05 \x01(\x05R\x10minHealthPercent\"\x84\x03\n\x11\x43lientTLSSettings\x12M\n\x04mode\x18\x01 \x01(\x0e\x32\x33.istio.networking.v1beta1.ClientTLSSettings.TLSmodeB\x04\xe2\x41\x01\x02R\x04mode\x12-\n\x12\x63lient_certificate\x18\x02 \x01(\tR\x11\x63lientCertificate\x12\x1f\n\x0bprivate_key\x18\x03 \x01(\tR\nprivateKey\x12\'\n\x0f\x63\x61_certificates\x18\x04 \x01(\tR\x0e\x63\x61\x43\x65rtificates\x12\'\n\x0f\x63redential_name\x18\x07 \x01(\tR\x0e\x63redentialName\x12*\n\x11subject_alt_names\x18\x05 \x03(\tR\x0fsubjectAltNames\x12\x10\n\x03sni\x18\x06 \x01(\tR\x03sni\"@\n\x07TLSmode\x12\x0b\n\x07\x44ISABLE\x10\x00\x12\n\n\x06SIMPLE\x10\x01\x12\n\n\x06MUTUAL\x10\x02\x12\x10\n\x0cISTIO_MUTUAL\x10\x03\"\xf5\x03\n\x1bLocalityLoadBalancerSetting\x12`\n\ndistribute\x18\x01 \x03(\x0b\x32@.istio.networking.v1beta1.LocalityLoadBalancerSetting.DistributeR\ndistribute\x12Z\n\x08\x66\x61ilover\x18\x02 \x03(\x0b\x32>.istio.networking.v1beta1.LocalityLoadBalancerSetting.FailoverR\x08\x66\x61ilover\x12\x34\n\x07\x65nabled\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.BoolValueR\x07\x65nabled\x1a\xb1\x01\n\nDistribute\x12\x12\n\x04\x66rom\x18\x01 \x01(\tR\x04\x66rom\x12X\n\x02to\x18\x02 \x03(\x0b\x32H.istio.networking.v1beta1.LocalityLoadBalancerSetting.Distribute.ToEntryR\x02to\x1a\x35\n\x07ToEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\rR\x05value:\x02\x38\x01\x1a.\n\x08\x46\x61ilover\x12\x12\n\x04\x66rom\x18\x01 \x01(\tR\x04\x66rom\x12\x0e\n\x02to\x18\x02 \x01(\tR\x02toB!Z\x1fistio.io/api/networking/v1beta1b\x06proto3') , dependencies=[google_dot_api_dot_field__behavior__pb2.DESCRIPTOR,google_dot_protobuf_dot_duration__pb2.DESCRIPTOR,google_dot_protobuf_dot_wrappers__pb2.DESCRIPTOR,networking_dot_v1beta1_dot_virtual__service__pb2.DESCRIPTOR,gogoproto_dot_gogo__pb2.DESCRIPTOR,]) @@ -82,8 +82,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=3427, - serialized_end=3490, + serialized_start=3416, + serialized_end=3479, ) _sym_db.RegisterEnumDescriptor(_CONNECTIONPOOLSETTINGS_HTTPSETTINGS_H2UPGRADEPOLICY) @@ -112,8 +112,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=4289, - serialized_end=4353, + serialized_start=4278, + serialized_end=4342, ) _sym_db.RegisterEnumDescriptor(_CLIENTTLSSETTINGS_TLSMODE) @@ -626,12 +626,12 @@ is_extension=False, extension_scope=None, serialized_options=None, json_name='http1MaxPendingRequests', file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='http2_max_requests', full_name='istio.networking.v1beta1.ConnectionPoolSettings.HTTPSettings.http2_max_requests', index=1, + name='max_requests', full_name='istio.networking.v1beta1.ConnectionPoolSettings.HTTPSettings.max_requests', index=1, number=2, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, json_name='http2MaxRequests', file=DESCRIPTOR), + serialized_options=None, json_name='maxRequests', file=DESCRIPTOR), _descriptor.FieldDescriptor( name='max_requests_per_connection', full_name='istio.networking.v1beta1.ConnectionPoolSettings.HTTPSettings.max_requests_per_connection', index=2, number=3, type=5, cpp_type=1, label=1, @@ -681,7 +681,7 @@ oneofs=[ ], serialized_start=2975, - serialized_end=3490, + serialized_end=3479, ) _CONNECTIONPOOLSETTINGS = _descriptor.Descriptor( @@ -718,7 +718,7 @@ oneofs=[ ], serialized_start=2405, - serialized_end=3490, + serialized_end=3479, ) @@ -790,8 +790,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3493, - serialized_end=3962, + serialized_start=3482, + serialized_end=3951, ) @@ -864,8 +864,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3965, - serialized_end=4353, + serialized_start=3954, + serialized_end=4342, ) @@ -902,8 +902,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=4756, - serialized_end=4809, + serialized_start=4745, + serialized_end=4798, ) _LOCALITYLOADBALANCERSETTING_DISTRIBUTE = _descriptor.Descriptor( @@ -939,8 +939,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=4632, - serialized_end=4809, + serialized_start=4621, + serialized_end=4798, ) _LOCALITYLOADBALANCERSETTING_FAILOVER = _descriptor.Descriptor( @@ -976,8 +976,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=4811, - serialized_end=4857, + serialized_start=4800, + serialized_end=4846, ) _LOCALITYLOADBALANCERSETTING = _descriptor.Descriptor( @@ -1020,8 +1020,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=4356, - serialized_end=4857, + serialized_start=4345, + serialized_end=4846, ) _DESTINATIONRULE.fields_by_name['traffic_policy'].message_type = _TRAFFICPOLICY diff --git a/releasenotes/notes/27473-change-http2_max_requests.yaml b/releasenotes/notes/27473-change-http2_max_requests.yaml new file mode 100644 index 00000000000..013db2bfc6b --- /dev/null +++ b/releasenotes/notes/27473-change-http2_max_requests.yaml @@ -0,0 +1,10 @@ +apiVersion: release-notes/v2 +kind: API Change +area: networking +issue: + - 27473 + +releaseNotes: + - | + **Changed** ConnectionPoolSettings.HTTPSettings `http2MaxRequests` of DestinationRule API to `maxRequests` in accordance with the combination of H1 and H2 conn_pool implementations: https://github.com/envoyproxy/envoy/issues/9215. This resolves the outdated H1 only implications for `max_requests` field. +