From 62ceae0ee92d6bc02a441184ec76613414e5b000 Mon Sep 17 00:00:00 2001 From: ckcd Date: Sat, 11 Jan 2020 17:17:52 +0800 Subject: [PATCH] add retry_remote_localities for retry --- kubernetes/customresourcedefinitions.gen.yaml | 5 + networking/v1alpha3/virtual_service.gen.json | 5 + networking/v1alpha3/virtual_service.pb.go | 304 +++++++++++------- networking/v1alpha3/virtual_service.pb.html | 12 + networking/v1alpha3/virtual_service.proto | 4 + proto.lock | 5 + .../v1alpha3/virtual_service_pb2.py | 38 ++- 7 files changed, 238 insertions(+), 135 deletions(-) diff --git a/kubernetes/customresourcedefinitions.gen.yaml b/kubernetes/customresourcedefinitions.gen.yaml index 48bd0dcda59..9e29505a5d4 100644 --- a/kubernetes/customresourcedefinitions.gen.yaml +++ b/kubernetes/customresourcedefinitions.gen.yaml @@ -4046,6 +4046,11 @@ spec: place. format: string type: string + retryRemoteLocalities: + description: Flag to specify whether the retries should retry + to other localities. + nullable: true + type: boolean type: object rewrite: description: Rewrite HTTP URIs and Authority headers. diff --git a/networking/v1alpha3/virtual_service.gen.json b/networking/v1alpha3/virtual_service.gen.json index 818b661a1d7..d1a347401b2 100644 --- a/networking/v1alpha3/virtual_service.gen.json +++ b/networking/v1alpha3/virtual_service.gen.json @@ -316,6 +316,11 @@ "description": "Specifies the conditions under which retry takes place. One or more policies can be specified using a ‘,’ delimited list. See the [retry policies](https://www.envoyproxy.io/docs/envoy/latest/configuration/http/http_filters/router_filter#x-envoy-retry-on) and [gRPC retry policies](https://www.envoyproxy.io/docs/envoy/latest/configuration/http/http_filters/router_filter#x-envoy-retry-grpc-on) for more details.", "type": "string", "format": "string" + }, + "retryRemoteLocalities": { + "description": "Flag to specify whether the retries should retry to other localities. See the [retry plugin configuration](https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/http/http_connection_management#retry-plugin-configuration) for more details.", + "type": "boolean", + "nullable": true } } }, diff --git a/networking/v1alpha3/virtual_service.pb.go b/networking/v1alpha3/virtual_service.pb.go index 278c4d1b640..4e0a416d81a 100644 --- a/networking/v1alpha3/virtual_service.pb.go +++ b/networking/v1alpha3/virtual_service.pb.go @@ -1971,10 +1971,13 @@ type HTTPRetry struct { // One or more policies can be specified using a ‘,’ delimited list. // See the [retry policies](https://www.envoyproxy.io/docs/envoy/latest/configuration/http/http_filters/router_filter#x-envoy-retry-on) // and [gRPC retry policies](https://www.envoyproxy.io/docs/envoy/latest/configuration/http/http_filters/router_filter#x-envoy-retry-grpc-on) for more details. - RetryOn string `protobuf:"bytes,3,opt,name=retry_on,json=retryOn,proto3" json:"retry_on,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + RetryOn string `protobuf:"bytes,3,opt,name=retry_on,json=retryOn,proto3" json:"retry_on,omitempty"` + // Flag to specify whether the retries should retry to other localities. + // See the [retry plugin configuration](https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/http/http_connection_management#retry-plugin-configuration) for more details. + RetryRemoteLocalities *types.BoolValue `protobuf:"bytes,4,opt,name=retry_remote_localities,json=retryRemoteLocalities,proto3" json:"retry_remote_localities,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *HTTPRetry) Reset() { *m = HTTPRetry{} } @@ -2031,6 +2034,13 @@ func (m *HTTPRetry) GetRetryOn() string { return "" } +func (m *HTTPRetry) GetRetryRemoteLocalities() *types.BoolValue { + if m != nil { + return m.RetryRemoteLocalities + } + return nil +} + // Describes the Cross-Origin Resource Sharing (CORS) policy, for a given // service. Refer to [CORS](https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS) // for further details about cross origin resource sharing. For example, @@ -2658,123 +2668,125 @@ func init() { } var fileDescriptor_e85a9a4fa9c17a22 = []byte{ - // 1851 bytes of a gzipped FileDescriptorProto + // 1881 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x4f, 0x8f, 0x1b, 0x49, - 0x15, 0x8f, 0xff, 0xb4, 0xff, 0xbc, 0xb6, 0x13, 0x4f, 0xed, 0x2a, 0xdb, 0x31, 0x51, 0x32, 0x74, - 0x48, 0x08, 0x82, 0xf5, 0x08, 0x07, 0x50, 0x04, 0xd9, 0x2c, 0x9e, 0x49, 0x76, 0x9d, 0x21, 0x61, - 0x86, 0x9a, 0xd9, 0x3d, 0x70, 0x69, 0xb5, 0xbb, 0xdf, 0xd8, 0x4d, 0xec, 0xae, 0x4e, 0x75, 0xf5, - 0xcc, 0x58, 0x7c, 0x02, 0x10, 0x12, 0xe2, 0xc4, 0x07, 0x80, 0x4f, 0xc1, 0x85, 0x2b, 0x47, 0x24, - 0x24, 0x2e, 0x5c, 0x56, 0x39, 0x70, 0xe4, 0x33, 0xa0, 0xaa, 0xea, 0xb6, 0xdb, 0xe3, 0x64, 0x6c, - 0x87, 0x00, 0x27, 0xbb, 0x5e, 0xbd, 0xdf, 0xaf, 0xaa, 0x5e, 0x57, 0xfd, 0x5e, 0xbd, 0x82, 0x6f, - 0x85, 0x28, 0xce, 0x18, 0x7f, 0x19, 0x84, 0xc3, 0x9d, 0xd3, 0xef, 0xba, 0xe3, 0x68, 0xe4, 0x3e, - 0xd8, 0x39, 0x0d, 0xb8, 0x48, 0xdc, 0xb1, 0x13, 0x23, 0x3f, 0x0d, 0x3c, 0xec, 0x44, 0x9c, 0x09, - 0x46, 0x6e, 0x04, 0xb1, 0x08, 0x58, 0x67, 0x0e, 0xe8, 0x64, 0x80, 0xf6, 0xed, 0x21, 0x63, 0xc3, - 0x31, 0xee, 0xb8, 0x51, 0xb0, 0x73, 0x12, 0xe0, 0xd8, 0x77, 0x06, 0x38, 0x72, 0x4f, 0x03, 0xc6, - 0x35, 0xb6, 0x7d, 0x2b, 0x75, 0x50, 0xad, 0x41, 0x72, 0xb2, 0xe3, 0x27, 0xdc, 0x15, 0x01, 0x0b, - 0xdf, 0xd6, 0x7f, 0xc6, 0xdd, 0x28, 0x42, 0x1e, 0xeb, 0x7e, 0xfb, 0x37, 0x45, 0xb8, 0xfa, 0xa5, - 0x9e, 0xd5, 0x91, 0x9e, 0x14, 0xb9, 0x01, 0xc6, 0x88, 0xc5, 0x22, 0xb6, 0x0a, 0xdb, 0xa5, 0xfb, - 0xf5, 0xdd, 0xd2, 0x57, 0xbd, 0x22, 0xd5, 0x16, 0xd2, 0x86, 0xda, 0xd0, 0x15, 0x78, 0xe6, 0x4e, - 0x63, 0xab, 0x28, 0x7b, 0xe9, 0xac, 0x4d, 0x1e, 0x42, 0x79, 0x24, 0x44, 0x64, 0x95, 0xb6, 0x4b, - 0xf7, 0xcd, 0xee, 0x37, 0x3a, 0x6f, 0x5d, 0x54, 0xa7, 0x7f, 0x7c, 0x7c, 0x48, 0x59, 0x22, 0x90, - 0x2a, 0x04, 0xf9, 0x3e, 0x94, 0xc4, 0x38, 0xb6, 0x0c, 0x05, 0xbc, 0x73, 0x09, 0xf0, 0xf8, 0xf9, - 0x91, 0xc6, 0x49, 0x7f, 0x05, 0xf3, 0x22, 0xab, 0xbc, 0x1a, 0xb6, 0x77, 0x98, 0xc1, 0xbc, 0x88, - 0x7c, 0x0d, 0xea, 0x78, 0x1e, 0x31, 0x2e, 0x1c, 0xc1, 0xac, 0x8a, 0x5e, 0x84, 0x36, 0x1c, 0x33, - 0xfb, 0x97, 0x60, 0x3e, 0xc1, 0x58, 0x04, 0xa1, 0x8a, 0x21, 0xf9, 0x08, 0xca, 0x72, 0xe1, 0x56, - 0x61, 0xbb, 0x90, 0x45, 0x42, 0x19, 0xc8, 0x75, 0xa8, 0xc4, 0xc9, 0x20, 0x46, 0x61, 0x15, 0x65, - 0x17, 0x4d, 0x5b, 0xe4, 0x47, 0x50, 0x96, 0x4c, 0x56, 0x69, 0xbb, 0x70, 0xdf, 0xec, 0x7e, 0xf3, - 0x92, 0x49, 0x1d, 0x32, 0x2e, 0x8e, 0x70, 0x8c, 0x9e, 0x60, 0x9c, 0x2a, 0x90, 0xfd, 0x8f, 0x2a, - 0xd4, 0x67, 0xb1, 0x21, 0x04, 0xca, 0xa1, 0x3b, 0x41, 0x6b, 0x4b, 0x0d, 0xa0, 0xfe, 0x93, 0x1e, - 0x18, 0x13, 0x57, 0x78, 0x23, 0xf5, 0x69, 0xcc, 0xee, 0xb7, 0x57, 0x04, 0xf9, 0x85, 0xf4, 0xa5, - 0xf8, 0x2a, 0xc1, 0x58, 0x50, 0x8d, 0x24, 0x4f, 0xc1, 0xe0, 0x92, 0x5f, 0x7d, 0x3f, 0xb3, 0xbb, - 0xb3, 0xce, 0x77, 0xca, 0x85, 0x84, 0x6a, 0x34, 0xd9, 0x83, 0x1a, 0x47, 0x3f, 0xe0, 0xe8, 0xad, - 0xb3, 0x58, 0xc5, 0x94, 0xba, 0xd3, 0x19, 0x90, 0xfc, 0x18, 0xaa, 0x1c, 0xcf, 0x78, 0x20, 0xd0, - 0x2a, 0x2b, 0x8e, 0x7b, 0x2b, 0x39, 0x94, 0x37, 0xcd, 0x60, 0xe4, 0x01, 0x54, 0x45, 0x30, 0x41, - 0x96, 0x08, 0xab, 0xa2, 0x18, 0x6e, 0x74, 0xf4, 0x86, 0xef, 0x64, 0x1b, 0xbe, 0xf3, 0x24, 0x3d, - 0x10, 0x34, 0xf3, 0x24, 0x8f, 0xe5, 0xb0, 0x82, 0x07, 0x18, 0x5b, 0x55, 0x05, 0x5a, 0xb9, 0x59, - 0x51, 0xf0, 0x29, 0xcd, 0x40, 0x64, 0x0f, 0x8c, 0x13, 0x37, 0x19, 0x0b, 0xab, 0xa6, 0xd0, 0x1f, - 0xaf, 0x40, 0x7f, 0x26, 0x7d, 0x9f, 0x85, 0xbf, 0x40, 0x4f, 0x07, 0x50, 0x61, 0xc9, 0x63, 0xa8, - 0x4c, 0x02, 0xce, 0x19, 0xb7, 0xea, 0x2b, 0x97, 0x9e, 0x8f, 0x7f, 0x8a, 0x22, 0x9f, 0xc3, 0x55, - 0xfd, 0xcf, 0x89, 0x90, 0x7b, 0x18, 0x0a, 0x8b, 0x28, 0x9e, 0x9b, 0x4b, 0x01, 0xf8, 0xe2, 0x59, - 0x28, 0x1e, 0x74, 0xbf, 0x74, 0xc7, 0x09, 0xee, 0x16, 0xad, 0x02, 0x6d, 0x6a, 0xdc, 0xa1, 0x86, - 0x91, 0x03, 0xd8, 0x5a, 0x24, 0x72, 0x87, 0x68, 0x7d, 0xa0, 0xb8, 0xec, 0xcb, 0xf6, 0xaf, 0x76, - 0xa6, 0xad, 0x05, 0x36, 0x77, 0x88, 0xe4, 0x33, 0x30, 0x3d, 0xc6, 0x63, 0x27, 0x62, 0xe3, 0xc0, - 0x9b, 0x5a, 0xa0, 0xa8, 0xee, 0x5e, 0x42, 0xb5, 0xc7, 0x78, 0x7c, 0xa8, 0x9c, 0x29, 0x78, 0xb3, - 0xff, 0xe4, 0x11, 0x54, 0x47, 0xe8, 0xfa, 0xc8, 0x63, 0xab, 0xb5, 0x72, 0x3a, 0x7d, 0xed, 0x49, - 0x33, 0xc8, 0x7e, 0xb9, 0x66, 0xb4, 0x2a, 0xfb, 0xe5, 0x9a, 0xd9, 0x6a, 0xd1, 0xad, 0x33, 0x1c, - 0xc4, 0xcc, 0x7b, 0x89, 0xc2, 0x49, 0xa2, 0x21, 0x77, 0x7d, 0xa4, 0x57, 0xa5, 0x0a, 0x86, 0xbe, - 0x93, 0xba, 0xd3, 0x8f, 0x38, 0x4e, 0xd8, 0x29, 0x3a, 0x1c, 0xe3, 0x88, 0x85, 0x31, 0xce, 0x3b, - 0x52, 0xc7, 0xa5, 0x8e, 0xeb, 0x33, 0x84, 0x3a, 0x5f, 0x73, 0xfb, 0x0c, 0xb0, 0x60, 0xb7, 0xff, - 0x59, 0x82, 0x6a, 0x3a, 0x4b, 0xf2, 0x42, 0xee, 0x40, 0xd5, 0xad, 0xa4, 0xc5, 0xec, 0x3e, 0x58, - 0xbd, 0xb4, 0xf4, 0xf7, 0x20, 0x42, 0xbd, 0x9f, 0x63, 0x9a, 0x71, 0x90, 0x03, 0x79, 0x18, 0xf5, - 0xf4, 0x94, 0x1e, 0xbd, 0x23, 0xdf, 0x8c, 0xa4, 0xfd, 0xa7, 0x22, 0xb4, 0x2e, 0x76, 0x93, 0x9f, - 0x42, 0x49, 0x0a, 0x9e, 0x96, 0x9e, 0x47, 0xef, 0x30, 0x40, 0xe7, 0x08, 0xc5, 0xd3, 0x50, 0x1e, - 0x25, 0x49, 0x24, 0xf9, 0x5c, 0xdf, 0x4f, 0x75, 0xe8, 0x9d, 0xf8, 0x7a, 0xbe, 0x9f, 0xf2, 0xb9, - 0xbe, 0x2f, 0x35, 0x59, 0x7f, 0x12, 0x95, 0x82, 0xea, 0x34, 0x6d, 0xb5, 0x7f, 0x00, 0xb5, 0x6c, - 0x60, 0xd2, 0x82, 0xd2, 0x4b, 0x9c, 0x6a, 0x3d, 0xa7, 0xf2, 0x2f, 0xf9, 0x10, 0x8c, 0x53, 0x79, - 0x34, 0x52, 0x21, 0xd7, 0x8d, 0x1f, 0x16, 0x1f, 0x16, 0x24, 0x2e, 0x1b, 0x60, 0x13, 0x9c, 0xfd, - 0xfb, 0x02, 0xd4, 0xb2, 0x4c, 0x45, 0xfa, 0x8b, 0x8a, 0xfd, 0xf1, 0xe5, 0xd9, 0x4d, 0x09, 0x76, - 0x4f, 0x08, 0x1e, 0x0c, 0x12, 0x81, 0x71, 0x9a, 0x7b, 0xb5, 0x70, 0xf7, 0x16, 0x85, 0xfb, 0x32, - 0xed, 0x7f, 0x8b, 0x68, 0xdb, 0xbf, 0x93, 0x33, 0x4b, 0x93, 0x21, 0xd9, 0x5d, 0x9c, 0xd9, 0x77, - 0x2e, 0xe1, 0x7b, 0xfe, 0xbd, 0x0b, 0x13, 0x7b, 0x8f, 0x73, 0xfa, 0x63, 0x15, 0x5a, 0x17, 0x73, - 0xd5, 0x2c, 0xf7, 0x99, 0xb9, 0xdc, 0xf7, 0x10, 0x4a, 0x09, 0x0f, 0xd2, 0xf3, 0x72, 0x99, 0x5a, - 0x1e, 0x09, 0x1e, 0x84, 0x43, 0xcd, 0x27, 0x21, 0x52, 0x6a, 0x63, 0x6f, 0x84, 0x93, 0xec, 0x70, - 0xac, 0x0b, 0x4e, 0x51, 0x4a, 0xaa, 0x51, 0x8c, 0x98, 0x9f, 0x66, 0xba, 0xb5, 0xf1, 0x1a, 0x45, - 0x9e, 0x40, 0xdd, 0x4d, 0xc4, 0x88, 0xf1, 0x40, 0x4c, 0xd7, 0x48, 0x74, 0x79, 0x8a, 0x39, 0x90, - 0xd0, 0xb9, 0x1c, 0xea, 0x9b, 0xd2, 0xc3, 0x0d, 0xb2, 0x7f, 0x76, 0x86, 0xf4, 0x71, 0xc9, 0x88, - 0x64, 0x9c, 0xd5, 0x75, 0x45, 0xe6, 0xce, 0xa6, 0xbe, 0x85, 0x90, 0x01, 0x34, 0x63, 0x96, 0x70, - 0x0f, 0x9d, 0xb1, 0x3b, 0xc0, 0xb1, 0xcc, 0x91, 0x72, 0xb4, 0x4f, 0x36, 0x19, 0xed, 0x48, 0x11, - 0x3c, 0x57, 0x78, 0x3d, 0x64, 0x23, 0xce, 0x99, 0x16, 0xee, 0x91, 0xb5, 0x0b, 0xf7, 0x48, 0x07, - 0x1a, 0xaf, 0x12, 0xe4, 0x53, 0x27, 0x72, 0xb9, 0x3b, 0x89, 0xad, 0xfa, 0x6a, 0x7d, 0xb8, 0x38, - 0xfc, 0xcf, 0x24, 0xfe, 0x50, 0xc1, 0xf5, 0xe8, 0xe6, 0xab, 0xb9, 0x85, 0xdc, 0x83, 0x6b, 0xc1, - 0x30, 0x64, 0x1c, 0x9d, 0x84, 0x07, 0x8e, 0xe7, 0xc6, 0xa8, 0x72, 0x54, 0x8d, 0x36, 0xb5, 0xf9, - 0x0b, 0x1e, 0xec, 0xb9, 0x31, 0xb6, 0x07, 0xd0, 0xc8, 0x47, 0xed, 0x0d, 0x1a, 0xf0, 0x28, 0xaf, - 0x01, 0xeb, 0x7f, 0xd4, 0x9c, 0xc6, 0x7c, 0x0a, 0x5b, 0x4b, 0xb1, 0xda, 0x48, 0xa4, 0x4e, 0xa0, - 0x75, 0x71, 0xb5, 0xff, 0x8d, 0x89, 0xda, 0x7f, 0x28, 0xc2, 0x87, 0x6f, 0xba, 0x0f, 0x92, 0x17, - 0x60, 0xfa, 0xf3, 0xe6, 0x1a, 0xc7, 0x33, 0x07, 0xd6, 0xfa, 0x96, 0xc7, 0x4b, 0x11, 0x3f, 0xc3, - 0x60, 0x38, 0xd2, 0x17, 0x6b, 0x83, 0xa6, 0xad, 0xfc, 0x65, 0xa0, 0xfa, 0x2e, 0x97, 0x81, 0x52, - 0xab, 0xfa, 0x3f, 0xc8, 0xf1, 0x53, 0x68, 0xfd, 0x9f, 0x02, 0x64, 0xff, 0xb9, 0x08, 0x5b, 0x4b, - 0x3a, 0x4d, 0x76, 0xe0, 0x83, 0x1c, 0xd8, 0x89, 0x93, 0x41, 0x88, 0x59, 0x65, 0x47, 0x49, 0xae, - 0xeb, 0x48, 0xf7, 0xcc, 0x14, 0xa1, 0x98, 0x53, 0x84, 0x3b, 0x33, 0x45, 0xd0, 0x78, 0x25, 0x83, - 0xf5, 0xec, 0x48, 0x6b, 0x24, 0xf1, 0x2e, 0xca, 0x86, 0xae, 0xcb, 0x1e, 0x6f, 0x92, 0x56, 0x36, - 0xd2, 0x0d, 0x63, 0x51, 0x37, 0xfe, 0xe3, 0xa3, 0x64, 0xff, 0xad, 0x08, 0x64, 0x39, 0x07, 0x93, - 0x6d, 0xa8, 0xc7, 0x61, 0xe0, 0x2c, 0x95, 0xc4, 0xb5, 0x38, 0x0c, 0xfa, 0xaa, 0x2a, 0x7e, 0x4b, - 0x90, 0x8b, 0x2b, 0x83, 0x5c, 0xca, 0x05, 0xd9, 0xbf, 0x18, 0x3f, 0x2d, 0xf2, 0x9f, 0x6e, 0x74, - 0x61, 0xd8, 0x28, 0x80, 0x95, 0xf7, 0x1c, 0xc0, 0xfd, 0x72, 0xad, 0xdc, 0x32, 0xe8, 0xe2, 0x5e, - 0xb1, 0x3d, 0x68, 0xe4, 0xab, 0x3f, 0x49, 0x98, 0xa5, 0xf1, 0xba, 0x4e, 0xcf, 0x37, 0xf3, 0xe9, - 0x51, 0x93, 0xe6, 0xd2, 0xde, 0x1d, 0x68, 0x66, 0xf5, 0xa2, 0xe3, 0x31, 0x1f, 0xd3, 0xa0, 0x35, - 0x32, 0xe3, 0x1e, 0xf3, 0xd1, 0xfe, 0x04, 0xcc, 0x5c, 0x79, 0xb8, 0xe9, 0x18, 0x36, 0x82, 0x99, - 0x93, 0x3d, 0x72, 0x1d, 0x0c, 0x3c, 0x77, 0xbd, 0xb4, 0xec, 0xef, 0x5f, 0xa1, 0xba, 0x49, 0x2c, - 0xa8, 0x44, 0x1c, 0x4f, 0x82, 0x73, 0xcd, 0xd0, 0xbf, 0x42, 0xd3, 0xb6, 0x44, 0x70, 0x1c, 0xe2, - 0xb9, 0x3e, 0x19, 0x12, 0xa1, 0x9a, 0xbb, 0x0d, 0x00, 0x75, 0x51, 0x72, 0xc4, 0x34, 0x42, 0xfb, - 0xd7, 0x85, 0xb4, 0xbe, 0x97, 0xe5, 0x24, 0xb9, 0x0d, 0x35, 0x57, 0x08, 0x9c, 0x44, 0x6a, 0x5b, - 0x15, 0xee, 0x1b, 0xe9, 0xb6, 0xca, 0x8c, 0xa4, 0x07, 0xd7, 0x22, 0xe4, 0x8e, 0xe0, 0x53, 0x27, - 0xab, 0x71, 0x8b, 0xab, 0x6a, 0xdc, 0x66, 0x84, 0xfc, 0x98, 0x4f, 0x8f, 0xd3, 0x4a, 0xf7, 0x86, - 0x2c, 0x0c, 0x24, 0x01, 0x0b, 0xd3, 0x43, 0xab, 0x8a, 0xd8, 0xe9, 0x41, 0x68, 0xff, 0xab, 0x08, - 0x30, 0x2f, 0xbc, 0xc8, 0x5d, 0x68, 0xb8, 0xe3, 0x31, 0x3b, 0x73, 0x18, 0x0f, 0x86, 0x41, 0x98, - 0x6e, 0x74, 0x59, 0x2e, 0x9a, 0xca, 0x7e, 0xa0, 0xcc, 0xe4, 0x27, 0xd0, 0xcc, 0xbb, 0x65, 0x97, - 0x83, 0x75, 0x13, 0x4a, 0x23, 0xc7, 0x15, 0xcb, 0x4f, 0xab, 0xc9, 0xf4, 0x3d, 0x29, 0x3b, 0x31, - 0xda, 0xe9, 0x85, 0xb6, 0xcd, 0x9d, 0x32, 0xf9, 0x2f, 0xe5, 0x9c, 0xb2, 0x7a, 0xea, 0x2e, 0x5c, - 0xc5, 0xf3, 0x88, 0xcd, 0x95, 0x5b, 0xa9, 0x4f, 0x9d, 0x36, 0xb5, 0x35, 0x73, 0xeb, 0x42, 0x75, - 0xe2, 0x9e, 0x3b, 0xb2, 0xc0, 0x35, 0x56, 0x45, 0xb2, 0x32, 0x71, 0xcf, 0x7b, 0x43, 0x24, 0x9f, - 0xc3, 0x96, 0x1e, 0xdf, 0xe3, 0xe8, 0x63, 0x28, 0x02, 0x77, 0x1c, 0xa7, 0x6f, 0x0d, 0xed, 0x25, - 0xf4, 0x2e, 0x63, 0x63, 0x55, 0x68, 0xd3, 0x96, 0x02, 0xed, 0xcd, 0x31, 0xf6, 0x6f, 0x0d, 0x20, - 0xcb, 0xcf, 0x01, 0xe4, 0x19, 0x18, 0x3e, 0x8e, 0xdd, 0xe9, 0x3a, 0x85, 0xe0, 0x12, 0xba, 0xf3, - 0x44, 0x42, 0xa9, 0x66, 0x90, 0x54, 0xee, 0x20, 0x13, 0xef, 0x8d, 0xa9, 0x7a, 0x12, 0x4a, 0x35, - 0x43, 0xfb, 0x57, 0x45, 0x30, 0x14, 0x37, 0xb9, 0x09, 0xd5, 0xec, 0x81, 0x41, 0xef, 0x52, 0xb9, - 0x27, 0x32, 0x13, 0xe9, 0x81, 0x79, 0x12, 0x9c, 0xa3, 0xef, 0xe8, 0x35, 0xac, 0xda, 0x9f, 0x6a, - 0x8b, 0xf7, 0xaf, 0x50, 0x50, 0x20, 0x3d, 0x40, 0x1f, 0xb6, 0xe4, 0x57, 0x0a, 0x75, 0x9c, 0x52, - 0xa2, 0xd2, 0x0a, 0xa2, 0xfe, 0x15, 0xda, 0xca, 0xa1, 0x34, 0xd3, 0x2e, 0x40, 0xee, 0x09, 0xc3, - 0x58, 0xfb, 0x09, 0x23, 0x87, 0xda, 0xdd, 0x82, 0x6b, 0x23, 0x21, 0x22, 0x3d, 0x0d, 0x75, 0x6c, - 0xdb, 0x7f, 0x2f, 0x80, 0xa1, 0x82, 0x43, 0xee, 0x81, 0xa9, 0x3a, 0x63, 0xe1, 0x8a, 0x24, 0xd6, - 0x09, 0x78, 0xb6, 0x24, 0xd9, 0x73, 0xa4, 0x3a, 0xc8, 0xd7, 0xc1, 0x1c, 0xf2, 0xc8, 0xcb, 0xfc, - 0x32, 0x51, 0x00, 0x69, 0x9c, 0xbb, 0x48, 0x40, 0xd7, 0x41, 0xf5, 0x06, 0x54, 0xce, 0x5c, 0x94, - 0xf1, 0xa9, 0x7a, 0xe1, 0x79, 0x1f, 0xcb, 0x69, 0x00, 0xa8, 0x01, 0xd4, 0x4a, 0xf6, 0xcb, 0xb5, - 0x42, 0xab, 0x38, 0xfb, 0x78, 0x76, 0x17, 0x1a, 0xf9, 0x57, 0x48, 0x79, 0xb5, 0x08, 0x93, 0xc9, - 0x00, 0xb9, 0xfa, 0xd2, 0x4d, 0x9a, 0xb6, 0xf6, 0xcb, 0xb5, 0x62, 0xab, 0xa4, 0xab, 0x30, 0xfb, - 0x36, 0x54, 0xb3, 0x87, 0xa3, 0x59, 0x22, 0x90, 0xde, 0x85, 0x34, 0x11, 0xec, 0x76, 0xfe, 0xf2, - 0xfa, 0x56, 0xe1, 0xaf, 0xaf, 0x6f, 0x15, 0xbe, 0x7a, 0x7d, 0xab, 0xf0, 0xf3, 0x6d, 0x3d, 0xdd, - 0x80, 0xa9, 0x17, 0xec, 0x37, 0x3c, 0x89, 0x0f, 0x2a, 0xea, 0xdb, 0x3e, 0xf8, 0x77, 0x00, 0x00, - 0x00, 0xff, 0xff, 0x78, 0xe8, 0xde, 0x88, 0x30, 0x17, 0x00, 0x00, + 0x15, 0x8f, 0xff, 0xf4, 0xd8, 0x7e, 0xf6, 0x24, 0x9e, 0xda, 0x25, 0xe9, 0x98, 0x28, 0x19, 0x3a, + 0x24, 0x04, 0xc1, 0x7a, 0x84, 0x07, 0x50, 0x04, 0xd9, 0x2c, 0x9e, 0x49, 0x76, 0x9d, 0x21, 0x61, + 0x86, 0x9a, 0xd9, 0x3d, 0x70, 0x69, 0xb5, 0xbb, 0xdf, 0xd8, 0x4d, 0xda, 0x5d, 0x9d, 0xea, 0xea, + 0x99, 0xb1, 0xf8, 0x04, 0x48, 0x48, 0x88, 0x13, 0x1f, 0x00, 0x3e, 0x05, 0x17, 0xae, 0x1c, 0x91, + 0x90, 0xb8, 0x20, 0xa1, 0x55, 0x0e, 0x1c, 0xf9, 0x0c, 0xa8, 0xaa, 0xba, 0xed, 0xf6, 0x38, 0xf1, + 0x9f, 0x10, 0xd8, 0x93, 0x5d, 0x55, 0xef, 0xf7, 0xab, 0xaa, 0xd7, 0xf5, 0x7e, 0xaf, 0x5e, 0xc1, + 0xb7, 0x43, 0x14, 0xe7, 0x8c, 0xbf, 0xf4, 0xc3, 0xc1, 0xce, 0xd9, 0xf7, 0x9c, 0x20, 0x1a, 0x3a, + 0xbb, 0x3b, 0x67, 0x3e, 0x17, 0x89, 0x13, 0xd8, 0x31, 0xf2, 0x33, 0xdf, 0xc5, 0x76, 0xc4, 0x99, + 0x60, 0xe4, 0xa6, 0x1f, 0x0b, 0x9f, 0xb5, 0xa7, 0x80, 0x76, 0x06, 0x68, 0xdd, 0x19, 0x30, 0x36, + 0x08, 0x70, 0xc7, 0x89, 0xfc, 0x9d, 0x53, 0x1f, 0x03, 0xcf, 0xee, 0xe3, 0xd0, 0x39, 0xf3, 0x19, + 0xd7, 0xd8, 0xd6, 0xed, 0xd4, 0x40, 0xb5, 0xfa, 0xc9, 0xe9, 0x8e, 0x97, 0x70, 0x47, 0xf8, 0x2c, + 0x7c, 0xdb, 0xf8, 0x39, 0x77, 0xa2, 0x08, 0x79, 0xac, 0xc7, 0xad, 0xdf, 0x14, 0xe1, 0xea, 0x17, + 0x7a, 0x55, 0xc7, 0x7a, 0x51, 0xe4, 0x26, 0x18, 0x43, 0x16, 0x8b, 0xd8, 0x2c, 0x6c, 0x97, 0x1e, + 0xd4, 0xf6, 0x4a, 0x5f, 0x76, 0x8b, 0x54, 0xf7, 0x90, 0x16, 0x54, 0x07, 0x8e, 0xc0, 0x73, 0x67, + 0x1c, 0x9b, 0x45, 0x39, 0x4a, 0x27, 0x6d, 0xf2, 0x10, 0xca, 0x43, 0x21, 0x22, 0xb3, 0xb4, 0x5d, + 0x7a, 0x50, 0xef, 0x7c, 0xb3, 0xfd, 0xd6, 0x4d, 0xb5, 0x7b, 0x27, 0x27, 0x47, 0x94, 0x25, 0x02, + 0xa9, 0x42, 0x90, 0x1f, 0x40, 0x49, 0x04, 0xb1, 0x69, 0x28, 0xe0, 0xdd, 0x05, 0xc0, 0x93, 0xe7, + 0xc7, 0x1a, 0x27, 0xed, 0x15, 0xcc, 0x8d, 0xcc, 0xf2, 0x72, 0xd8, 0xfe, 0x51, 0x06, 0x73, 0x23, + 0xf2, 0x75, 0xa8, 0xe1, 0x45, 0xc4, 0xb8, 0xb0, 0x05, 0x33, 0x37, 0xf4, 0x26, 0x74, 0xc7, 0x09, + 0xb3, 0x7e, 0x05, 0xf5, 0x27, 0x18, 0x0b, 0x3f, 0x54, 0x3e, 0x24, 0x37, 0xa0, 0x2c, 0x37, 0x6e, + 0x16, 0xb6, 0x0b, 0x99, 0x27, 0x54, 0x07, 0xb9, 0x0e, 0x1b, 0x71, 0xd2, 0x8f, 0x51, 0x98, 0x45, + 0x39, 0x44, 0xd3, 0x16, 0xf9, 0x31, 0x94, 0x25, 0x93, 0x59, 0xda, 0x2e, 0x3c, 0xa8, 0x77, 0xbe, + 0xb5, 0x60, 0x51, 0x47, 0x8c, 0x8b, 0x63, 0x0c, 0xd0, 0x15, 0x8c, 0x53, 0x05, 0xb2, 0xfe, 0x51, + 0x81, 0xda, 0xc4, 0x37, 0x84, 0x40, 0x39, 0x74, 0x46, 0x68, 0x6e, 0xa9, 0x09, 0xd4, 0x7f, 0xd2, + 0x05, 0x63, 0xe4, 0x08, 0x77, 0xa8, 0x3e, 0x4d, 0xbd, 0xf3, 0x9d, 0x25, 0x4e, 0x7e, 0x21, 0x6d, + 0x29, 0xbe, 0x4a, 0x30, 0x16, 0x54, 0x23, 0xc9, 0x53, 0x30, 0xb8, 0xe4, 0x57, 0xdf, 0xaf, 0xde, + 0xd9, 0x59, 0xe5, 0x3b, 0xe5, 0x5c, 0x42, 0x35, 0x9a, 0xec, 0x43, 0x95, 0xa3, 0xe7, 0x73, 0x74, + 0x57, 0xd9, 0xac, 0x62, 0x4a, 0xcd, 0xe9, 0x04, 0x48, 0x7e, 0x02, 0x15, 0x8e, 0xe7, 0xdc, 0x17, + 0x68, 0x96, 0x15, 0xc7, 0xfd, 0xa5, 0x1c, 0xca, 0x9a, 0x66, 0x30, 0xb2, 0x0b, 0x15, 0xe1, 0x8f, + 0x90, 0x25, 0xc2, 0xdc, 0x50, 0x0c, 0x37, 0xdb, 0xfa, 0xc0, 0xb7, 0xb3, 0x03, 0xdf, 0x7e, 0x92, + 0x06, 0x04, 0xcd, 0x2c, 0xc9, 0x63, 0x39, 0xad, 0xe0, 0x3e, 0xc6, 0x66, 0x45, 0x81, 0x96, 0x1e, + 0x56, 0x14, 0x7c, 0x4c, 0x33, 0x10, 0xd9, 0x07, 0xe3, 0xd4, 0x49, 0x02, 0x61, 0x56, 0x15, 0xfa, + 0xa3, 0x25, 0xe8, 0x4f, 0xa5, 0xed, 0xb3, 0xf0, 0x97, 0xe8, 0x6a, 0x07, 0x2a, 0x2c, 0x79, 0x0c, + 0x1b, 0x23, 0x9f, 0x73, 0xc6, 0xcd, 0xda, 0xd2, 0xad, 0xe7, 0xfd, 0x9f, 0xa2, 0xc8, 0x67, 0x70, + 0x55, 0xff, 0xb3, 0x23, 0xe4, 0x2e, 0x86, 0xc2, 0x24, 0x8a, 0xe7, 0xd6, 0x9c, 0x03, 0x3e, 0x7f, + 0x16, 0x8a, 0xdd, 0xce, 0x17, 0x4e, 0x90, 0xe0, 0x5e, 0xd1, 0x2c, 0xd0, 0x4d, 0x8d, 0x3b, 0xd2, + 0x30, 0x72, 0x08, 0x5b, 0xb3, 0x44, 0xce, 0x00, 0xcd, 0x0f, 0x14, 0x97, 0xb5, 0xe8, 0xfc, 0x6a, + 0x63, 0xda, 0x9c, 0x61, 0x73, 0x06, 0x48, 0x3e, 0x85, 0xba, 0xcb, 0x78, 0x6c, 0x47, 0x2c, 0xf0, + 0xdd, 0xb1, 0x09, 0x8a, 0xea, 0xde, 0x02, 0xaa, 0x7d, 0xc6, 0xe3, 0x23, 0x65, 0x4c, 0xc1, 0x9d, + 0xfc, 0x27, 0x8f, 0xa0, 0x32, 0x44, 0xc7, 0x43, 0x1e, 0x9b, 0xcd, 0xa5, 0xcb, 0xe9, 0x69, 0x4b, + 0x9a, 0x41, 0x0e, 0xca, 0x55, 0xa3, 0xb9, 0x71, 0x50, 0xae, 0xd6, 0x9b, 0x4d, 0xba, 0x75, 0x8e, + 0xfd, 0x98, 0xb9, 0x2f, 0x51, 0xd8, 0x49, 0x34, 0xe0, 0x8e, 0x87, 0xf4, 0xaa, 0x54, 0xc1, 0xd0, + 0xb3, 0x53, 0x73, 0x7a, 0x83, 0xe3, 0x88, 0x9d, 0xa1, 0xcd, 0x31, 0x8e, 0x58, 0x18, 0xe3, 0x74, + 0x20, 0x35, 0x9c, 0x1b, 0xb8, 0x3e, 0x41, 0xa8, 0xf8, 0x9a, 0xf6, 0x4f, 0x00, 0x33, 0xfd, 0xd6, + 0xbf, 0x4a, 0x50, 0x49, 0x57, 0x49, 0x5e, 0xc8, 0x13, 0xa8, 0x86, 0x95, 0xb4, 0xd4, 0x3b, 0xbb, + 0xcb, 0xb7, 0x96, 0xfe, 0x1e, 0x46, 0xa8, 0xcf, 0x73, 0x4c, 0x33, 0x0e, 0x72, 0x28, 0x83, 0x51, + 0x2f, 0x4f, 0xe9, 0xd1, 0x3b, 0xf2, 0x4d, 0x48, 0x5a, 0x7f, 0x2a, 0x42, 0xf3, 0xf2, 0x30, 0xf9, + 0x19, 0x94, 0xa4, 0xe0, 0x69, 0xe9, 0x79, 0xf4, 0x0e, 0x13, 0xb4, 0x8f, 0x51, 0x3c, 0x0d, 0x65, + 0x28, 0x49, 0x22, 0xc9, 0xe7, 0x78, 0x5e, 0xaa, 0x43, 0xef, 0xc4, 0xd7, 0xf5, 0xbc, 0x94, 0xcf, + 0xf1, 0x3c, 0xa9, 0xc9, 0xfa, 0x93, 0xa8, 0x14, 0x54, 0xa3, 0x69, 0xab, 0xf5, 0x43, 0xa8, 0x66, + 0x13, 0x93, 0x26, 0x94, 0x5e, 0xe2, 0x58, 0xeb, 0x39, 0x95, 0x7f, 0xc9, 0x87, 0x60, 0x9c, 0xc9, + 0xd0, 0x48, 0x85, 0x5c, 0x37, 0x7e, 0x54, 0x7c, 0x58, 0x90, 0xb8, 0x6c, 0x82, 0x75, 0x70, 0xd6, + 0xef, 0x0b, 0x50, 0xcd, 0x32, 0x15, 0xe9, 0xcd, 0x2a, 0xf6, 0x47, 0x8b, 0xb3, 0x9b, 0x12, 0xec, + 0xae, 0x10, 0xdc, 0xef, 0x27, 0x02, 0xe3, 0x34, 0xf7, 0x6a, 0xe1, 0xee, 0xce, 0x0a, 0xf7, 0x22, + 0xed, 0x7f, 0x8b, 0x68, 0x5b, 0xbf, 0x93, 0x2b, 0x4b, 0x93, 0x21, 0xd9, 0x9b, 0x5d, 0xd9, 0x77, + 0x17, 0xf0, 0x3d, 0xff, 0xfe, 0xa5, 0x85, 0xbd, 0xc7, 0x35, 0xfd, 0xb1, 0x02, 0xcd, 0xcb, 0xb9, + 0x6a, 0x92, 0xfb, 0xea, 0xb9, 0xdc, 0xf7, 0x10, 0x4a, 0x09, 0xf7, 0xd3, 0x78, 0x59, 0xa4, 0x96, + 0xc7, 0x82, 0xfb, 0xe1, 0x40, 0xf3, 0x49, 0x88, 0x94, 0xda, 0xd8, 0x1d, 0xe2, 0x28, 0x0b, 0x8e, + 0x55, 0xc1, 0x29, 0x4a, 0x49, 0x35, 0x8a, 0x21, 0xf3, 0xd2, 0x4c, 0xb7, 0x32, 0x5e, 0xa3, 0xc8, + 0x13, 0xa8, 0x39, 0x89, 0x18, 0x32, 0xee, 0x8b, 0xf1, 0x0a, 0x89, 0x2e, 0x4f, 0x31, 0x05, 0x12, + 0x3a, 0x95, 0x43, 0x7d, 0x53, 0x7a, 0xb8, 0x46, 0xf6, 0xcf, 0x62, 0x48, 0x87, 0x4b, 0x46, 0x24, + 0xfd, 0xac, 0xae, 0x2b, 0x32, 0x77, 0x6e, 0xea, 0x5b, 0x08, 0xe9, 0xc3, 0x66, 0xcc, 0x12, 0xee, + 0xa2, 0x1d, 0x38, 0x7d, 0x0c, 0x64, 0x8e, 0x94, 0xb3, 0x7d, 0xbc, 0xce, 0x6c, 0xc7, 0x8a, 0xe0, + 0xb9, 0xc2, 0xeb, 0x29, 0x1b, 0x71, 0xae, 0x6b, 0xe6, 0x1e, 0x59, 0xbd, 0x74, 0x8f, 0xb4, 0xa1, + 0xf1, 0x2a, 0x41, 0x3e, 0xb6, 0x23, 0x87, 0x3b, 0xa3, 0xd8, 0xac, 0x2d, 0xd7, 0x87, 0xcb, 0xd3, + 0xff, 0x5c, 0xe2, 0x8f, 0x14, 0x5c, 0xcf, 0x5e, 0x7f, 0x35, 0xed, 0x21, 0xf7, 0xe1, 0x9a, 0x3f, + 0x08, 0x19, 0x47, 0x3b, 0xe1, 0xbe, 0xed, 0x3a, 0x31, 0xaa, 0x1c, 0x55, 0xa5, 0x9b, 0xba, 0xfb, + 0x73, 0xee, 0xef, 0x3b, 0x31, 0xb6, 0xfa, 0xd0, 0xc8, 0x7b, 0xed, 0x0d, 0x1a, 0xf0, 0x28, 0xaf, + 0x01, 0xab, 0x7f, 0xd4, 0x9c, 0xc6, 0x7c, 0x02, 0x5b, 0x73, 0xbe, 0x5a, 0x4b, 0xa4, 0x4e, 0xa1, + 0x79, 0x79, 0xb7, 0xff, 0x8b, 0x85, 0x5a, 0x7f, 0x28, 0xc2, 0x87, 0x6f, 0xba, 0x0f, 0x92, 0x17, + 0x50, 0xf7, 0xa6, 0xcd, 0x15, 0xc2, 0x33, 0x07, 0xd6, 0xfa, 0x96, 0xc7, 0x4b, 0x11, 0x3f, 0x47, + 0x7f, 0x30, 0xd4, 0x17, 0x6b, 0x83, 0xa6, 0xad, 0xfc, 0x65, 0xa0, 0xf2, 0x2e, 0x97, 0x81, 0x52, + 0xb3, 0xf2, 0x7f, 0xc8, 0xf1, 0x63, 0x68, 0x7e, 0x45, 0x0e, 0xb2, 0xfe, 0x5c, 0x84, 0xad, 0x39, + 0x9d, 0x26, 0x3b, 0xf0, 0x41, 0x0e, 0x6c, 0xc7, 0x49, 0x3f, 0xc4, 0xac, 0xb2, 0xa3, 0x24, 0x37, + 0x74, 0xac, 0x47, 0x26, 0x8a, 0x50, 0xcc, 0x29, 0xc2, 0xdd, 0x89, 0x22, 0x68, 0xbc, 0x92, 0xc1, + 0x5a, 0x16, 0xd2, 0x1a, 0x49, 0xdc, 0xcb, 0xb2, 0xa1, 0xeb, 0xb2, 0xc7, 0xeb, 0xa4, 0x95, 0xb5, + 0x74, 0xc3, 0x98, 0xd5, 0x8d, 0xff, 0x3a, 0x94, 0xac, 0xbf, 0x15, 0x81, 0xcc, 0xe7, 0x60, 0xb2, + 0x0d, 0xb5, 0x38, 0xf4, 0xed, 0xb9, 0x92, 0xb8, 0x1a, 0x87, 0x7e, 0x4f, 0x55, 0xc5, 0x6f, 0x71, + 0x72, 0x71, 0xa9, 0x93, 0x4b, 0x39, 0x27, 0x7b, 0x97, 0xfd, 0xa7, 0x45, 0xfe, 0x93, 0xb5, 0x2e, + 0x0c, 0x6b, 0x39, 0x70, 0xe3, 0x3d, 0x3b, 0xf0, 0xa0, 0x5c, 0x2d, 0x37, 0x0d, 0x3a, 0x7b, 0x56, + 0x2c, 0x17, 0x1a, 0xf9, 0xea, 0x4f, 0x12, 0x66, 0x69, 0xbc, 0xa6, 0xd3, 0xf3, 0xad, 0x7c, 0x7a, + 0xd4, 0xa4, 0xb9, 0xb4, 0x77, 0x17, 0x36, 0xb3, 0x7a, 0xd1, 0x76, 0x99, 0x87, 0xa9, 0xd3, 0x1a, + 0x59, 0xe7, 0x3e, 0xf3, 0xd0, 0xfa, 0x18, 0xea, 0xb9, 0xf2, 0x70, 0xdd, 0x39, 0x2c, 0x84, 0x7a, + 0x4e, 0xf6, 0xc8, 0x75, 0x30, 0xf0, 0xc2, 0x71, 0xd3, 0xb2, 0xbf, 0x77, 0x85, 0xea, 0x26, 0x31, + 0x61, 0x23, 0xe2, 0x78, 0xea, 0x5f, 0x68, 0x86, 0xde, 0x15, 0x9a, 0xb6, 0x25, 0x82, 0xe3, 0x00, + 0x2f, 0x74, 0x64, 0x48, 0x84, 0x6a, 0xee, 0x35, 0x00, 0xd4, 0x45, 0xc9, 0x16, 0xe3, 0x08, 0xad, + 0x7f, 0x16, 0xd2, 0xfa, 0x5e, 0x96, 0x93, 0xe4, 0x0e, 0x54, 0x1d, 0x21, 0x70, 0x14, 0xa9, 0x63, + 0x55, 0x78, 0x60, 0xa4, 0xc7, 0x2a, 0xeb, 0x24, 0x5d, 0xb8, 0x16, 0x21, 0xb7, 0x05, 0x1f, 0xdb, + 0x59, 0x8d, 0x5b, 0x5c, 0x56, 0xe3, 0x6e, 0x46, 0xc8, 0x4f, 0xf8, 0xf8, 0x24, 0xad, 0x74, 0x6f, + 0xca, 0xc2, 0x40, 0x12, 0xb0, 0x30, 0x0d, 0x5a, 0x55, 0xc4, 0x8e, 0x0f, 0x43, 0x42, 0xe1, 0x86, + 0x1e, 0x92, 0x12, 0x27, 0xd0, 0x0e, 0x98, 0xeb, 0x04, 0xbe, 0x90, 0x45, 0xb1, 0xbe, 0xa2, 0xb4, + 0xe6, 0x66, 0xd9, 0x63, 0x2c, 0x50, 0x65, 0x24, 0xfd, 0x9a, 0x82, 0x52, 0x85, 0x7c, 0x3e, 0x01, + 0x5a, 0xff, 0x2e, 0x02, 0x4c, 0x8b, 0x39, 0x72, 0x0f, 0x1a, 0x4e, 0x10, 0xb0, 0x73, 0x9b, 0x71, + 0x7f, 0xe0, 0x87, 0x69, 0xf0, 0xc8, 0x12, 0xb4, 0xae, 0xfa, 0x0f, 0x55, 0x37, 0xf9, 0x29, 0x6c, + 0xe6, 0xcd, 0xb2, 0x0b, 0xc7, 0xaa, 0x49, 0xaa, 0x91, 0xe3, 0x8a, 0xe5, 0x71, 0xd1, 0x64, 0xfa, + 0xee, 0x95, 0x45, 0xa1, 0x36, 0x7a, 0xa1, 0xfb, 0xa6, 0x46, 0x59, 0x4a, 0x29, 0xe5, 0x8c, 0xb2, + 0x1a, 0xed, 0x1e, 0x5c, 0xc5, 0x8b, 0x88, 0x4d, 0xb3, 0x81, 0x52, 0xb4, 0x1a, 0xdd, 0xd4, 0xbd, + 0x99, 0x59, 0x07, 0x2a, 0x23, 0xe7, 0xc2, 0x96, 0x45, 0xb3, 0xb1, 0xec, 0xeb, 0x6c, 0x8c, 0x9c, + 0x8b, 0xee, 0x00, 0xc9, 0x67, 0xb0, 0xa5, 0xe7, 0x77, 0x39, 0x7a, 0x18, 0x0a, 0xdf, 0x09, 0xe2, + 0xf4, 0xfd, 0x62, 0x91, 0xd7, 0x9b, 0x0a, 0xb4, 0x3f, 0xc5, 0x58, 0xbf, 0x35, 0x80, 0xcc, 0x3f, + 0x31, 0x90, 0x67, 0x60, 0x78, 0x18, 0x38, 0xe3, 0x55, 0x8a, 0xcb, 0x39, 0x74, 0xfb, 0x89, 0x84, + 0x52, 0xcd, 0x20, 0xa9, 0x9c, 0x7e, 0x96, 0x10, 0xd6, 0xa6, 0xea, 0x4a, 0x28, 0xd5, 0x0c, 0xad, + 0x5f, 0x17, 0xc1, 0x50, 0xdc, 0xe4, 0x16, 0x54, 0xb2, 0x47, 0x0b, 0x7d, 0xf2, 0xe5, 0x99, 0xc8, + 0xba, 0x48, 0x17, 0xea, 0xa7, 0xfe, 0x05, 0x7a, 0xb6, 0xde, 0xc3, 0xb2, 0x33, 0xaf, 0xc2, 0xa6, + 0x77, 0x85, 0x82, 0x02, 0xe9, 0x09, 0x7a, 0xb0, 0x25, 0xbf, 0x52, 0xa8, 0xfd, 0x94, 0x12, 0x95, + 0x96, 0x10, 0xf5, 0xae, 0xd0, 0x66, 0x0e, 0xa5, 0x99, 0xf6, 0x00, 0x72, 0xcf, 0x22, 0xc6, 0xca, + 0xcf, 0x22, 0x39, 0xd4, 0xde, 0x16, 0x5c, 0x1b, 0x0a, 0x11, 0xe9, 0x65, 0x28, 0x29, 0x68, 0xfd, + 0xbd, 0x00, 0x86, 0x72, 0x0e, 0xb9, 0x0f, 0x75, 0x35, 0x18, 0x0b, 0x47, 0x24, 0xb1, 0x4e, 0xea, + 0x93, 0x2d, 0xc9, 0x91, 0x63, 0x35, 0x40, 0xbe, 0x01, 0xf5, 0x01, 0x8f, 0xdc, 0xcc, 0x2e, 0x13, + 0x1a, 0x90, 0x9d, 0x53, 0x13, 0x09, 0xe8, 0xd8, 0xa8, 0xde, 0x95, 0xca, 0x99, 0x89, 0xea, 0x7c, + 0xaa, 0x5e, 0x8d, 0xde, 0xc7, 0x76, 0x1a, 0x00, 0x6a, 0x02, 0xb5, 0x93, 0x83, 0x72, 0xb5, 0xd0, + 0x2c, 0x4e, 0x3e, 0x9e, 0xd5, 0x81, 0x46, 0xfe, 0x65, 0x53, 0x5e, 0x57, 0xc2, 0x64, 0xd4, 0x47, + 0xae, 0xbe, 0xf4, 0x26, 0x4d, 0x5b, 0x07, 0xe5, 0x6a, 0xb1, 0x59, 0xd2, 0x95, 0x9d, 0x75, 0x07, + 0x2a, 0xd9, 0x63, 0xd4, 0x24, 0xb9, 0x48, 0xeb, 0x42, 0x9a, 0x5c, 0xf6, 0xda, 0x7f, 0x79, 0x7d, + 0xbb, 0xf0, 0xd7, 0xd7, 0xb7, 0x0b, 0x5f, 0xbe, 0xbe, 0x5d, 0xf8, 0xc5, 0xb6, 0x5e, 0xae, 0xcf, + 0xd4, 0xab, 0xf8, 0x1b, 0x9e, 0xd9, 0xfb, 0x1b, 0xea, 0xdb, 0xee, 0xfe, 0x27, 0x00, 0x00, 0xff, + 0xff, 0x9e, 0xe9, 0xce, 0x8c, 0x84, 0x17, 0x00, 0x00, } func (m *VirtualService) Marshal() (dAtA []byte, err error) { @@ -3968,6 +3980,18 @@ func (m *HTTPRetry) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if m.RetryRemoteLocalities != nil { + { + size, err := m.RetryRemoteLocalities.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintVirtualService(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } if len(m.RetryOn) > 0 { i -= len(m.RetryOn) copy(dAtA[i:], m.RetryOn) @@ -4948,6 +4972,10 @@ func (m *HTTPRetry) Size() (n int) { if l > 0 { n += 1 + l + sovVirtualService(uint64(l)) } + if m.RetryRemoteLocalities != nil { + l = m.RetryRemoteLocalities.Size() + n += 1 + l + sovVirtualService(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -8837,6 +8865,42 @@ func (m *HTTPRetry) Unmarshal(dAtA []byte) error { } m.RetryOn = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field RetryRemoteLocalities", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowVirtualService + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthVirtualService + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthVirtualService + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.RetryRemoteLocalities == nil { + m.RetryRemoteLocalities = &types.BoolValue{} + } + if err := m.RetryRemoteLocalities.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipVirtualService(dAtA[iNdEx:]) diff --git a/networking/v1alpha3/virtual_service.pb.html b/networking/v1alpha3/virtual_service.pb.html index 41c8c7c417e..42f917cd86c 100644 --- a/networking/v1alpha3/virtual_service.pb.html +++ b/networking/v1alpha3/virtual_service.pb.html @@ -983,6 +983,18 @@

HTTPRetry

See the retry policies and gRPC retry policies for more details.

+ + +No + + + +retryRemoteLocalities +BoolValue + +

Flag to specify whether the retries should retry to other localities. +See the retry plugin configuration for more details.

+ No diff --git a/networking/v1alpha3/virtual_service.proto b/networking/v1alpha3/virtual_service.proto index cb4d6b754f7..709de9ee729 100644 --- a/networking/v1alpha3/virtual_service.proto +++ b/networking/v1alpha3/virtual_service.proto @@ -1007,6 +1007,10 @@ message HTTPRetry { // See the [retry policies](https://www.envoyproxy.io/docs/envoy/latest/configuration/http/http_filters/router_filter#x-envoy-retry-on) // and [gRPC retry policies](https://www.envoyproxy.io/docs/envoy/latest/configuration/http/http_filters/router_filter#x-envoy-retry-grpc-on) for more details. string retry_on = 3; + + // Flag to specify whether the retries should retry to other localities. + // See the [retry plugin configuration](https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/http/http_connection_management#retry-plugin-configuration) for more details. + google.protobuf.BoolValue retry_remote_localities = 4; } // Describes the Cross-Origin Resource Sharing (CORS) policy, for a given diff --git a/proto.lock b/proto.lock index 4becbdcd57e..8ca00df99ee 100644 --- a/proto.lock +++ b/proto.lock @@ -40812,6 +40812,11 @@ "id": 3, "name": "retry_on", "type": "string" + }, + { + "id": 4, + "name": "retry_remote_localities", + "type": "google.protobuf.BoolValue" } ] }, diff --git a/python/istio_api/networking/v1alpha3/virtual_service_pb2.py b/python/istio_api/networking/v1alpha3/virtual_service_pb2.py index 08070e00f7d..4fd0644dc22 100644 --- a/python/istio_api/networking/v1alpha3/virtual_service_pb2.py +++ b/python/istio_api/networking/v1alpha3/virtual_service_pb2.py @@ -23,7 +23,7 @@ package='istio.networking.v1alpha3', syntax='proto3', serialized_options=_b('Z istio.io/api/networking/v1alpha3'), - serialized_pb=_b('\n)networking/v1alpha3/virtual_service.proto\x12\x19istio.networking.v1alpha3\x1a\x1fgoogle/api/field_behavior.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1egoogle/protobuf/wrappers.proto\"\xe1\x01\n\x0eVirtualService\x12\x12\n\x05hosts\x18\x01 \x03(\tB\x03\xe0\x41\x02\x12\x10\n\x08gateways\x18\x02 \x03(\t\x12\x32\n\x04http\x18\x03 \x03(\x0b\x32$.istio.networking.v1alpha3.HTTPRoute\x12\x30\n\x03tls\x18\x05 \x03(\x0b\x32#.istio.networking.v1alpha3.TLSRoute\x12\x30\n\x03tcp\x18\x04 \x03(\x0b\x32#.istio.networking.v1alpha3.TCPRoute\x12\x11\n\texport_to\x18\x06 \x03(\t\"g\n\x0b\x44\x65stination\x12\x11\n\x04host\x18\x01 \x01(\tB\x03\xe0\x41\x02\x12\x0e\n\x06subset\x18\x02 \x01(\t\x12\x35\n\x04port\x18\x03 \x01(\x0b\x32\'.istio.networking.v1alpha3.PortSelector\"\xdd\x06\n\tHTTPRoute\x12\x0c\n\x04name\x18\x11 \x01(\t\x12:\n\x05match\x18\x01 \x03(\x0b\x32+.istio.networking.v1alpha3.HTTPMatchRequest\x12>\n\x05route\x18\x02 \x03(\x0b\x32/.istio.networking.v1alpha3.HTTPRouteDestination\x12\x39\n\x08redirect\x18\x03 \x01(\x0b\x32\'.istio.networking.v1alpha3.HTTPRedirect\x12\x37\n\x07rewrite\x18\x04 \x01(\x0b\x32&.istio.networking.v1alpha3.HTTPRewrite\x12*\n\x07timeout\x18\x06 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x35\n\x07retries\x18\x07 \x01(\x0b\x32$.istio.networking.v1alpha3.HTTPRetry\x12<\n\x05\x66\x61ult\x18\x08 \x01(\x0b\x32-.istio.networking.v1alpha3.HTTPFaultInjection\x12\x36\n\x06mirror\x18\t \x01(\x0b\x32&.istio.networking.v1alpha3.Destination\x12\x38\n\x0emirror_percent\x18\x12 \x01(\x0b\x32\x1c.google.protobuf.UInt32ValueB\x02\x18\x01\x12=\n\x11mirror_percentage\x18\x13 \x01(\x0b\x32\".istio.networking.v1alpha3.Percent\x12:\n\x0b\x63ors_policy\x18\n \x01(\x0b\x32%.istio.networking.v1alpha3.CorsPolicy\x12\x33\n\x07headers\x18\x10 \x01(\x0b\x32\".istio.networking.v1alpha3.HeadersJ\x04\x08\x05\x10\x06J\x04\x08\x0b\x10\x10R\x11websocket_upgradeR\x0e\x61ppend_headersR\x17remove_response_headersR\x17\x61ppend_response_headersR\x16remove_request_headersR\x16\x61ppend_request_headers\"\xa9\x03\n\x07Headers\x12\x44\n\x07request\x18\x01 \x01(\x0b\x32\x33.istio.networking.v1alpha3.Headers.HeaderOperations\x12\x45\n\x08response\x18\x02 \x01(\x0b\x32\x33.istio.networking.v1alpha3.Headers.HeaderOperations\x1a\x90\x02\n\x10HeaderOperations\x12I\n\x03set\x18\x01 \x03(\x0b\x32<.istio.networking.v1alpha3.Headers.HeaderOperations.SetEntry\x12I\n\x03\x61\x64\x64\x18\x02 \x03(\x0b\x32<.istio.networking.v1alpha3.Headers.HeaderOperations.AddEntry\x12\x0e\n\x06remove\x18\x03 \x03(\t\x1a*\n\x08SetEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a*\n\x08\x41\x64\x64\x45ntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\x89\x01\n\x08TLSRoute\x12\x41\n\x05match\x18\x01 \x03(\x0b\x32-.istio.networking.v1alpha3.TLSMatchAttributesB\x03\xe0\x41\x02\x12:\n\x05route\x18\x02 \x03(\x0b\x32+.istio.networking.v1alpha3.RouteDestination\"\x83\x01\n\x08TCPRoute\x12;\n\x05match\x18\x01 \x03(\x0b\x32,.istio.networking.v1alpha3.L4MatchAttributes\x12:\n\x05route\x18\x02 \x03(\x0b\x32+.istio.networking.v1alpha3.RouteDestination\"\x97\x06\n\x10HTTPMatchRequest\x12\x0c\n\x04name\x18\x0b \x01(\t\x12\x33\n\x03uri\x18\x01 \x01(\x0b\x32&.istio.networking.v1alpha3.StringMatch\x12\x36\n\x06scheme\x18\x02 \x01(\x0b\x32&.istio.networking.v1alpha3.StringMatch\x12\x36\n\x06method\x18\x03 \x01(\x0b\x32&.istio.networking.v1alpha3.StringMatch\x12\x39\n\tauthority\x18\x04 \x01(\x0b\x32&.istio.networking.v1alpha3.StringMatch\x12I\n\x07headers\x18\x05 \x03(\x0b\x32\x38.istio.networking.v1alpha3.HTTPMatchRequest.HeadersEntry\x12\x0c\n\x04port\x18\x06 \x01(\r\x12T\n\rsource_labels\x18\x07 \x03(\x0b\x32=.istio.networking.v1alpha3.HTTPMatchRequest.SourceLabelsEntry\x12\x10\n\x08gateways\x18\x08 \x03(\t\x12R\n\x0cquery_params\x18\t \x03(\x0b\x32<.istio.networking.v1alpha3.HTTPMatchRequest.QueryParamsEntry\x12\x17\n\x0fignore_uri_case\x18\n \x01(\x08\x1aV\n\x0cHeadersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x35\n\x05value\x18\x02 \x01(\x0b\x32&.istio.networking.v1alpha3.StringMatch:\x02\x38\x01\x1a\x33\n\x11SourceLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1aZ\n\x10QueryParamsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x35\n\x05value\x18\x02 \x01(\x0b\x32&.istio.networking.v1alpha3.StringMatch:\x02\x38\x01\"\x85\x02\n\x14HTTPRouteDestination\x12@\n\x0b\x64\x65stination\x18\x01 \x01(\x0b\x32&.istio.networking.v1alpha3.DestinationB\x03\xe0\x41\x02\x12\x0e\n\x06weight\x18\x02 \x01(\x05\x12\x33\n\x07headers\x18\x07 \x01(\x0b\x32\".istio.networking.v1alpha3.HeadersJ\x04\x08\x03\x10\x07R\x17remove_response_headersR\x17\x61ppend_response_headersR\x16remove_request_headersR\x16\x61ppend_request_headers\"d\n\x10RouteDestination\x12@\n\x0b\x64\x65stination\x18\x01 \x01(\x0b\x32&.istio.networking.v1alpha3.DestinationB\x03\xe0\x41\x02\x12\x0e\n\x06weight\x18\x02 \x01(\x05\"\xf3\x01\n\x11L4MatchAttributes\x12\x1b\n\x13\x64\x65stination_subnets\x18\x01 \x03(\t\x12\x0c\n\x04port\x18\x02 \x01(\r\x12\x15\n\rsource_subnet\x18\x03 \x01(\t\x12U\n\rsource_labels\x18\x04 \x03(\x0b\x32>.istio.networking.v1alpha3.L4MatchAttributes.SourceLabelsEntry\x12\x10\n\x08gateways\x18\x05 \x03(\t\x1a\x33\n\x11SourceLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\x8b\x02\n\x12TLSMatchAttributes\x12\x16\n\tsni_hosts\x18\x01 \x03(\tB\x03\xe0\x41\x02\x12\x1b\n\x13\x64\x65stination_subnets\x18\x02 \x03(\t\x12\x0c\n\x04port\x18\x03 \x01(\r\x12V\n\rsource_labels\x18\x05 \x03(\x0b\x32?.istio.networking.v1alpha3.TLSMatchAttributes.SourceLabelsEntry\x12\x10\n\x08gateways\x18\x06 \x03(\t\x1a\x33\n\x11SourceLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01J\x04\x08\x04\x10\x05R\rsource_subnet\"E\n\x0cHTTPRedirect\x12\x0b\n\x03uri\x18\x01 \x01(\t\x12\x11\n\tauthority\x18\x02 \x01(\t\x12\x15\n\rredirect_code\x18\x03 \x01(\r\"-\n\x0bHTTPRewrite\x12\x0b\n\x03uri\x18\x01 \x01(\t\x12\x11\n\tauthority\x18\x02 \x01(\t\"O\n\x0bStringMatch\x12\x0f\n\x05\x65xact\x18\x01 \x01(\tH\x00\x12\x10\n\x06prefix\x18\x02 \x01(\tH\x00\x12\x0f\n\x05regex\x18\x03 \x01(\tH\x00\x42\x0c\n\nmatch_type\"h\n\tHTTPRetry\x12\x15\n\x08\x61ttempts\x18\x01 \x01(\x05\x42\x03\xe0\x41\x02\x12\x32\n\x0fper_try_timeout\x18\x02 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x10\n\x08retry_on\x18\x03 \x01(\t\"\x8e\x02\n\nCorsPolicy\x12\x18\n\x0c\x61llow_origin\x18\x01 \x03(\tB\x02\x18\x01\x12=\n\rallow_origins\x18\x07 \x03(\x0b\x32&.istio.networking.v1alpha3.StringMatch\x12\x15\n\rallow_methods\x18\x02 \x03(\t\x12\x15\n\rallow_headers\x18\x03 \x03(\t\x12\x16\n\x0e\x65xpose_headers\x18\x04 \x03(\t\x12*\n\x07max_age\x18\x05 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x35\n\x11\x61llow_credentials\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.BoolValue\"\x9e\x04\n\x12HTTPFaultInjection\x12\x42\n\x05\x64\x65lay\x18\x01 \x01(\x0b\x32\x33.istio.networking.v1alpha3.HTTPFaultInjection.Delay\x12\x42\n\x05\x61\x62ort\x18\x02 \x01(\x0b\x32\x33.istio.networking.v1alpha3.HTTPFaultInjection.Abort\x1a\xd6\x01\n\x05\x44\x65lay\x12\x13\n\x07percent\x18\x01 \x01(\x05\x42\x02\x18\x01\x12\x35\n\x0b\x66ixed_delay\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationB\x03\xe0\x41\x02H\x00\x12\x36\n\x11\x65xponential_delay\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationH\x00\x12\x36\n\npercentage\x18\x05 \x01(\x0b\x32\".istio.networking.v1alpha3.PercentB\x11\n\x0fhttp_delay_type\x1a\xa6\x01\n\x05\x41\x62ort\x12\x1a\n\x0bhttp_status\x18\x02 \x01(\x05\x42\x03\xe0\x41\x02H\x00\x12\x15\n\x0bgrpc_status\x18\x03 \x01(\tH\x00\x12\x15\n\x0bhttp2_error\x18\x04 \x01(\tH\x00\x12\x36\n\npercentage\x18\x05 \x01(\x0b\x32\".istio.networking.v1alpha3.PercentB\x0c\n\nerror_typeJ\x04\x08\x01\x10\x02R\x07percent\"*\n\x0cPortSelector\x12\x0e\n\x06number\x18\x01 \x01(\rJ\x04\x08\x02\x10\x03R\x04name\"\x18\n\x07Percent\x12\r\n\x05value\x18\x01 \x01(\x01\x42\"Z istio.io/api/networking/v1alpha3b\x06proto3') + serialized_pb=_b('\n)networking/v1alpha3/virtual_service.proto\x12\x19istio.networking.v1alpha3\x1a\x1fgoogle/api/field_behavior.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1egoogle/protobuf/wrappers.proto\"\xe1\x01\n\x0eVirtualService\x12\x12\n\x05hosts\x18\x01 \x03(\tB\x03\xe0\x41\x02\x12\x10\n\x08gateways\x18\x02 \x03(\t\x12\x32\n\x04http\x18\x03 \x03(\x0b\x32$.istio.networking.v1alpha3.HTTPRoute\x12\x30\n\x03tls\x18\x05 \x03(\x0b\x32#.istio.networking.v1alpha3.TLSRoute\x12\x30\n\x03tcp\x18\x04 \x03(\x0b\x32#.istio.networking.v1alpha3.TCPRoute\x12\x11\n\texport_to\x18\x06 \x03(\t\"g\n\x0b\x44\x65stination\x12\x11\n\x04host\x18\x01 \x01(\tB\x03\xe0\x41\x02\x12\x0e\n\x06subset\x18\x02 \x01(\t\x12\x35\n\x04port\x18\x03 \x01(\x0b\x32\'.istio.networking.v1alpha3.PortSelector\"\xdd\x06\n\tHTTPRoute\x12\x0c\n\x04name\x18\x11 \x01(\t\x12:\n\x05match\x18\x01 \x03(\x0b\x32+.istio.networking.v1alpha3.HTTPMatchRequest\x12>\n\x05route\x18\x02 \x03(\x0b\x32/.istio.networking.v1alpha3.HTTPRouteDestination\x12\x39\n\x08redirect\x18\x03 \x01(\x0b\x32\'.istio.networking.v1alpha3.HTTPRedirect\x12\x37\n\x07rewrite\x18\x04 \x01(\x0b\x32&.istio.networking.v1alpha3.HTTPRewrite\x12*\n\x07timeout\x18\x06 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x35\n\x07retries\x18\x07 \x01(\x0b\x32$.istio.networking.v1alpha3.HTTPRetry\x12<\n\x05\x66\x61ult\x18\x08 \x01(\x0b\x32-.istio.networking.v1alpha3.HTTPFaultInjection\x12\x36\n\x06mirror\x18\t \x01(\x0b\x32&.istio.networking.v1alpha3.Destination\x12\x38\n\x0emirror_percent\x18\x12 \x01(\x0b\x32\x1c.google.protobuf.UInt32ValueB\x02\x18\x01\x12=\n\x11mirror_percentage\x18\x13 \x01(\x0b\x32\".istio.networking.v1alpha3.Percent\x12:\n\x0b\x63ors_policy\x18\n \x01(\x0b\x32%.istio.networking.v1alpha3.CorsPolicy\x12\x33\n\x07headers\x18\x10 \x01(\x0b\x32\".istio.networking.v1alpha3.HeadersJ\x04\x08\x05\x10\x06J\x04\x08\x0b\x10\x10R\x11websocket_upgradeR\x0e\x61ppend_headersR\x17remove_response_headersR\x17\x61ppend_response_headersR\x16remove_request_headersR\x16\x61ppend_request_headers\"\xa9\x03\n\x07Headers\x12\x44\n\x07request\x18\x01 \x01(\x0b\x32\x33.istio.networking.v1alpha3.Headers.HeaderOperations\x12\x45\n\x08response\x18\x02 \x01(\x0b\x32\x33.istio.networking.v1alpha3.Headers.HeaderOperations\x1a\x90\x02\n\x10HeaderOperations\x12I\n\x03set\x18\x01 \x03(\x0b\x32<.istio.networking.v1alpha3.Headers.HeaderOperations.SetEntry\x12I\n\x03\x61\x64\x64\x18\x02 \x03(\x0b\x32<.istio.networking.v1alpha3.Headers.HeaderOperations.AddEntry\x12\x0e\n\x06remove\x18\x03 \x03(\t\x1a*\n\x08SetEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a*\n\x08\x41\x64\x64\x45ntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\x89\x01\n\x08TLSRoute\x12\x41\n\x05match\x18\x01 \x03(\x0b\x32-.istio.networking.v1alpha3.TLSMatchAttributesB\x03\xe0\x41\x02\x12:\n\x05route\x18\x02 \x03(\x0b\x32+.istio.networking.v1alpha3.RouteDestination\"\x83\x01\n\x08TCPRoute\x12;\n\x05match\x18\x01 \x03(\x0b\x32,.istio.networking.v1alpha3.L4MatchAttributes\x12:\n\x05route\x18\x02 \x03(\x0b\x32+.istio.networking.v1alpha3.RouteDestination\"\x97\x06\n\x10HTTPMatchRequest\x12\x0c\n\x04name\x18\x0b \x01(\t\x12\x33\n\x03uri\x18\x01 \x01(\x0b\x32&.istio.networking.v1alpha3.StringMatch\x12\x36\n\x06scheme\x18\x02 \x01(\x0b\x32&.istio.networking.v1alpha3.StringMatch\x12\x36\n\x06method\x18\x03 \x01(\x0b\x32&.istio.networking.v1alpha3.StringMatch\x12\x39\n\tauthority\x18\x04 \x01(\x0b\x32&.istio.networking.v1alpha3.StringMatch\x12I\n\x07headers\x18\x05 \x03(\x0b\x32\x38.istio.networking.v1alpha3.HTTPMatchRequest.HeadersEntry\x12\x0c\n\x04port\x18\x06 \x01(\r\x12T\n\rsource_labels\x18\x07 \x03(\x0b\x32=.istio.networking.v1alpha3.HTTPMatchRequest.SourceLabelsEntry\x12\x10\n\x08gateways\x18\x08 \x03(\t\x12R\n\x0cquery_params\x18\t \x03(\x0b\x32<.istio.networking.v1alpha3.HTTPMatchRequest.QueryParamsEntry\x12\x17\n\x0fignore_uri_case\x18\n \x01(\x08\x1aV\n\x0cHeadersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x35\n\x05value\x18\x02 \x01(\x0b\x32&.istio.networking.v1alpha3.StringMatch:\x02\x38\x01\x1a\x33\n\x11SourceLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1aZ\n\x10QueryParamsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x35\n\x05value\x18\x02 \x01(\x0b\x32&.istio.networking.v1alpha3.StringMatch:\x02\x38\x01\"\x85\x02\n\x14HTTPRouteDestination\x12@\n\x0b\x64\x65stination\x18\x01 \x01(\x0b\x32&.istio.networking.v1alpha3.DestinationB\x03\xe0\x41\x02\x12\x0e\n\x06weight\x18\x02 \x01(\x05\x12\x33\n\x07headers\x18\x07 \x01(\x0b\x32\".istio.networking.v1alpha3.HeadersJ\x04\x08\x03\x10\x07R\x17remove_response_headersR\x17\x61ppend_response_headersR\x16remove_request_headersR\x16\x61ppend_request_headers\"d\n\x10RouteDestination\x12@\n\x0b\x64\x65stination\x18\x01 \x01(\x0b\x32&.istio.networking.v1alpha3.DestinationB\x03\xe0\x41\x02\x12\x0e\n\x06weight\x18\x02 \x01(\x05\"\xf3\x01\n\x11L4MatchAttributes\x12\x1b\n\x13\x64\x65stination_subnets\x18\x01 \x03(\t\x12\x0c\n\x04port\x18\x02 \x01(\r\x12\x15\n\rsource_subnet\x18\x03 \x01(\t\x12U\n\rsource_labels\x18\x04 \x03(\x0b\x32>.istio.networking.v1alpha3.L4MatchAttributes.SourceLabelsEntry\x12\x10\n\x08gateways\x18\x05 \x03(\t\x1a\x33\n\x11SourceLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\x8b\x02\n\x12TLSMatchAttributes\x12\x16\n\tsni_hosts\x18\x01 \x03(\tB\x03\xe0\x41\x02\x12\x1b\n\x13\x64\x65stination_subnets\x18\x02 \x03(\t\x12\x0c\n\x04port\x18\x03 \x01(\r\x12V\n\rsource_labels\x18\x05 \x03(\x0b\x32?.istio.networking.v1alpha3.TLSMatchAttributes.SourceLabelsEntry\x12\x10\n\x08gateways\x18\x06 \x03(\t\x1a\x33\n\x11SourceLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01J\x04\x08\x04\x10\x05R\rsource_subnet\"E\n\x0cHTTPRedirect\x12\x0b\n\x03uri\x18\x01 \x01(\t\x12\x11\n\tauthority\x18\x02 \x01(\t\x12\x15\n\rredirect_code\x18\x03 \x01(\r\"-\n\x0bHTTPRewrite\x12\x0b\n\x03uri\x18\x01 \x01(\t\x12\x11\n\tauthority\x18\x02 \x01(\t\"O\n\x0bStringMatch\x12\x0f\n\x05\x65xact\x18\x01 \x01(\tH\x00\x12\x10\n\x06prefix\x18\x02 \x01(\tH\x00\x12\x0f\n\x05regex\x18\x03 \x01(\tH\x00\x42\x0c\n\nmatch_type\"\xa5\x01\n\tHTTPRetry\x12\x15\n\x08\x61ttempts\x18\x01 \x01(\x05\x42\x03\xe0\x41\x02\x12\x32\n\x0fper_try_timeout\x18\x02 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x10\n\x08retry_on\x18\x03 \x01(\t\x12;\n\x17retry_remote_localities\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.BoolValue\"\x8e\x02\n\nCorsPolicy\x12\x18\n\x0c\x61llow_origin\x18\x01 \x03(\tB\x02\x18\x01\x12=\n\rallow_origins\x18\x07 \x03(\x0b\x32&.istio.networking.v1alpha3.StringMatch\x12\x15\n\rallow_methods\x18\x02 \x03(\t\x12\x15\n\rallow_headers\x18\x03 \x03(\t\x12\x16\n\x0e\x65xpose_headers\x18\x04 \x03(\t\x12*\n\x07max_age\x18\x05 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x35\n\x11\x61llow_credentials\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.BoolValue\"\x9e\x04\n\x12HTTPFaultInjection\x12\x42\n\x05\x64\x65lay\x18\x01 \x01(\x0b\x32\x33.istio.networking.v1alpha3.HTTPFaultInjection.Delay\x12\x42\n\x05\x61\x62ort\x18\x02 \x01(\x0b\x32\x33.istio.networking.v1alpha3.HTTPFaultInjection.Abort\x1a\xd6\x01\n\x05\x44\x65lay\x12\x13\n\x07percent\x18\x01 \x01(\x05\x42\x02\x18\x01\x12\x35\n\x0b\x66ixed_delay\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationB\x03\xe0\x41\x02H\x00\x12\x36\n\x11\x65xponential_delay\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationH\x00\x12\x36\n\npercentage\x18\x05 \x01(\x0b\x32\".istio.networking.v1alpha3.PercentB\x11\n\x0fhttp_delay_type\x1a\xa6\x01\n\x05\x41\x62ort\x12\x1a\n\x0bhttp_status\x18\x02 \x01(\x05\x42\x03\xe0\x41\x02H\x00\x12\x15\n\x0bgrpc_status\x18\x03 \x01(\tH\x00\x12\x15\n\x0bhttp2_error\x18\x04 \x01(\tH\x00\x12\x36\n\npercentage\x18\x05 \x01(\x0b\x32\".istio.networking.v1alpha3.PercentB\x0c\n\nerror_typeJ\x04\x08\x01\x10\x02R\x07percent\"*\n\x0cPortSelector\x12\x0e\n\x06number\x18\x01 \x01(\rJ\x04\x08\x02\x10\x03R\x04name\"\x18\n\x07Percent\x12\r\n\x05value\x18\x01 \x01(\x01\x42\"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,]) @@ -1134,6 +1134,13 @@ message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='retry_remote_localities', full_name='istio.networking.v1alpha3.HTTPRetry.retry_remote_localities', index=3, + number=4, type=11, cpp_type=10, label=1, + has_default_value=False, default_value=None, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -1146,8 +1153,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3943, - serialized_end=4047, + serialized_start=3944, + serialized_end=4109, ) @@ -1219,8 +1226,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=4050, - serialized_end=4320, + serialized_start=4112, + serialized_end=4382, ) @@ -1274,8 +1281,8 @@ name='http_delay_type', full_name='istio.networking.v1alpha3.HTTPFaultInjection.Delay.http_delay_type', index=0, containing_type=None, fields=[]), ], - serialized_start=4482, - serialized_end=4696, + serialized_start=4544, + serialized_end=4758, ) _HTTPFAULTINJECTION_ABORT = _descriptor.Descriptor( @@ -1328,8 +1335,8 @@ name='error_type', full_name='istio.networking.v1alpha3.HTTPFaultInjection.Abort.error_type', index=0, containing_type=None, fields=[]), ], - serialized_start=4699, - serialized_end=4865, + serialized_start=4761, + serialized_end=4927, ) _HTTPFAULTINJECTION = _descriptor.Descriptor( @@ -1365,8 +1372,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=4323, - serialized_end=4865, + serialized_start=4385, + serialized_end=4927, ) @@ -1396,8 +1403,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=4867, - serialized_end=4909, + serialized_start=4929, + serialized_end=4971, ) @@ -1427,8 +1434,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=4911, - serialized_end=4935, + serialized_start=4973, + serialized_end=4997, ) _VIRTUALSERVICE.fields_by_name['http'].message_type = _HTTPROUTE @@ -1487,6 +1494,7 @@ _STRINGMATCH.fields_by_name['regex']) _STRINGMATCH.fields_by_name['regex'].containing_oneof = _STRINGMATCH.oneofs_by_name['match_type'] _HTTPRETRY.fields_by_name['per_try_timeout'].message_type = google_dot_protobuf_dot_duration__pb2._DURATION +_HTTPRETRY.fields_by_name['retry_remote_localities'].message_type = google_dot_protobuf_dot_wrappers__pb2._BOOLVALUE _CORSPOLICY.fields_by_name['allow_origins'].message_type = _STRINGMATCH _CORSPOLICY.fields_by_name['max_age'].message_type = google_dot_protobuf_dot_duration__pb2._DURATION _CORSPOLICY.fields_by_name['allow_credentials'].message_type = google_dot_protobuf_dot_wrappers__pb2._BOOLVALUE