From 0f148f8293892180a705abef6087274e372ec4d8 Mon Sep 17 00:00:00 2001 From: Gregory Hanson Date: Mon, 19 Nov 2018 13:47:24 -0600 Subject: [PATCH] fix naming convention between access log format vs encoding --- mesh/v1alpha1/config.pb.go | 186 ++++++++++++------- mesh/v1alpha1/config.proto | 10 +- mesh/v1alpha1/istio.mesh.v1alpha1.pb.html | 11 +- proto.lock | 5 + python/istio_api/mesh/v1alpha1/config_pb2.py | 49 ++--- 5 files changed, 169 insertions(+), 92 deletions(-) diff --git a/mesh/v1alpha1/config.pb.go b/mesh/v1alpha1/config.pb.go index 98218b7feb..68e6849aa4 100644 --- a/mesh/v1alpha1/config.pb.go +++ b/mesh/v1alpha1/config.pb.go @@ -183,9 +183,12 @@ type MeshConfig struct { // File address for the proxy access log (e.g. /dev/stdout). // Empty value disables access logging. AccessLogFile string `protobuf:"bytes,13,opt,name=access_log_file,json=accessLogFile,proto3" json:"access_log_file,omitempty"` - // Format for the proxy access log (text or json). - // Default value is text. + // Format for the proxy access log + // Empty value results in proxy's default access log format AccessLogFormat string `protobuf:"bytes,24,opt,name=access_log_format,json=accessLogFormat,proto3" json:"access_log_format,omitempty"` + // Encoding for the proxy access log (text or json). + // Default value is text. + AccessLogEncoding string `protobuf:"bytes,27,opt,name=access_log_encoding,json=accessLogEncoding,proto3" json:"access_log_encoding,omitempty"` // Default proxy config used by the proxy injection mechanism operating in the mesh // (e.g. Kubernetes admission controller) // In case of Kubernetes, the proxy config is applied once during the injection process, @@ -334,6 +337,13 @@ func (m *MeshConfig) GetAccessLogFormat() string { return "" } +func (m *MeshConfig) GetAccessLogEncoding() string { + if m != nil { + return m.AccessLogEncoding + } + return "" +} + func (m *MeshConfig) GetDefaultConfig() *ProxyConfig { if m != nil { return m.DefaultConfig @@ -677,6 +687,14 @@ func (m *MeshConfig) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintConfig(dAtA, i, uint64(len(m.TrustDomain))) i += copy(dAtA[i:], m.TrustDomain) } + if len(m.AccessLogEncoding) > 0 { + dAtA[i] = 0xda + i++ + dAtA[i] = 0x1 + i++ + i = encodeVarintConfig(dAtA, i, uint64(len(m.AccessLogEncoding))) + i += copy(dAtA[i:], m.AccessLogEncoding) + } return i, nil } @@ -838,6 +856,10 @@ func (m *MeshConfig) Size() (n int) { if l > 0 { n += 2 + l + sovConfig(uint64(l)) } + l = len(m.AccessLogEncoding) + if l > 0 { + n += 2 + l + sovConfig(uint64(l)) + } return n } @@ -1539,6 +1561,35 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } m.TrustDomain = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 27: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AccessLogEncoding", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.AccessLogEncoding = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipConfig(dAtA[iNdEx:]) @@ -1849,69 +1900,70 @@ var ( func init() { proto.RegisterFile("mesh/v1alpha1/config.proto", fileDescriptorConfig) } var fileDescriptorConfig = []byte{ - // 1022 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xdd, 0x4e, 0x23, 0x47, - 0x13, 0xdd, 0x01, 0x2f, 0x98, 0xf2, 0xdf, 0xd0, 0xac, 0x97, 0xc6, 0xdf, 0x27, 0xe2, 0x25, 0x0a, - 0x6b, 0xa1, 0x68, 0xac, 0x05, 0xe5, 0x22, 0xb9, 0x33, 0x06, 0x76, 0xbd, 0x32, 0x18, 0x8d, 0xcd, - 0x46, 0xe4, 0xa6, 0x35, 0xcc, 0xb4, 0xed, 0x16, 0xe3, 0xe9, 0xc9, 0x74, 0xcf, 0x66, 0x79, 0xa1, - 0xbc, 0x44, 0x5e, 0x20, 0x97, 0x79, 0x84, 0x88, 0x27, 0x89, 0xa6, 0x7a, 0x0c, 0x26, 0xb1, 0x44, - 0x94, 0xcb, 0x3e, 0x75, 0xaa, 0xaa, 0xeb, 0x54, 0x55, 0x37, 0x34, 0x66, 0x5c, 0x4d, 0xdb, 0x9f, - 0xdf, 0x79, 0x61, 0x3c, 0xf5, 0xde, 0xb5, 0x7d, 0x19, 0x8d, 0xc5, 0xc4, 0x89, 0x13, 0xa9, 0x25, - 0xd9, 0x12, 0x4a, 0x0b, 0xe9, 0x64, 0x0c, 0x67, 0xce, 0x68, 0xec, 0x4e, 0xa4, 0x9c, 0x84, 0xbc, - 0x8d, 0x94, 0x9b, 0x74, 0xdc, 0x0e, 0xd2, 0xc4, 0xd3, 0x42, 0x46, 0xc6, 0xa9, 0xb1, 0xf3, 0x34, - 0x60, 0x9c, 0xc8, 0x2f, 0x77, 0xb9, 0xe9, 0x20, 0xe2, 0xfa, 0x17, 0x99, 0xdc, 0x8a, 0x68, 0x32, - 0x27, 0x1c, 0xb5, 0x03, 0xae, 0xb4, 0x88, 0x30, 0x02, 0x4b, 0xd2, 0x90, 0x1b, 0xee, 0xde, 0xaf, - 0x15, 0x80, 0x73, 0xae, 0xa6, 0x5d, 0xbc, 0x10, 0xf9, 0x16, 0xc8, 0x4c, 0x7c, 0xe1, 0x09, 0xf3, - 0xa7, 0xdc, 0xbf, 0x65, 0x8a, 0x27, 0x9f, 0x79, 0x42, 0xad, 0xa6, 0xd5, 0xda, 0x70, 0x6d, 0xb4, - 0x74, 0x33, 0xc3, 0x10, 0x71, 0xe2, 0xc0, 0x96, 0x61, 0x27, 0x3c, 0x96, 0x89, 0x9e, 0xd3, 0x57, - 0x90, 0xbe, 0x89, 0x26, 0x17, 0x2d, 0x39, 0xff, 0x10, 0xea, 0x81, 0x50, 0xde, 0x4d, 0xc8, 0x59, - 0x2c, 0x43, 0xe1, 0xdf, 0x99, 0x34, 0x8a, 0xae, 0x36, 0xad, 0x56, 0xd1, 0xdd, 0xca, 0x8d, 0x97, - 0x68, 0xc3, 0x44, 0x8a, 0x1c, 0xc0, 0x26, 0xd6, 0xc6, 0x42, 0xa1, 0x34, 0x8f, 0x58, 0x16, 0x8e, - 0x16, 0x9a, 0x56, 0xeb, 0xa5, 0x5b, 0x43, 0x43, 0x1f, 0xf1, 0x4b, 0x99, 0x68, 0xb2, 0x0f, 0x06, - 0x62, 0x53, 0xad, 0x63, 0xc3, 0x7c, 0x89, 0xcc, 0x0a, 0xc2, 0x1f, 0xb4, 0x8e, 0x91, 0x77, 0x0c, - 0x35, 0x5f, 0x46, 0x11, 0xf7, 0x35, 0xd3, 0x62, 0xc6, 0x65, 0xaa, 0xe9, 0x5a, 0xd3, 0x6a, 0x95, - 0x0e, 0x77, 0x1c, 0xa3, 0xba, 0x33, 0x57, 0xdd, 0x39, 0xc9, 0x55, 0x77, 0xab, 0xb9, 0xc7, 0xc8, - 0x38, 0x90, 0xaf, 0xa1, 0x22, 0xa2, 0x49, 0xc2, 0x95, 0x62, 0x7e, 0xe8, 0x29, 0x45, 0xd7, 0xb1, - 0xea, 0x72, 0x0e, 0x76, 0x33, 0x8c, 0xbc, 0x85, 0xda, 0x9c, 0x94, 0x69, 0x23, 0x7c, 0x4e, 0x8b, - 0x48, 0xab, 0xe6, 0xf0, 0xd0, 0xa0, 0x64, 0x06, 0xdb, 0x0f, 0xd1, 0x64, 0xa4, 0x13, 0x19, 0x86, - 0x3c, 0x61, 0x33, 0x19, 0x70, 0xba, 0xd1, 0xb4, 0x5a, 0xd5, 0xc3, 0xef, 0x9c, 0x25, 0x43, 0xe2, - 0x3c, 0x76, 0xce, 0xe9, 0xe5, 0x79, 0x1f, 0xbc, 0xcf, 0x65, 0xc0, 0xdd, 0xba, 0x58, 0x06, 0x93, - 0x01, 0x94, 0xbc, 0x54, 0x4f, 0xf3, 0x2e, 0x50, 0xc0, 0x14, 0x07, 0xcf, 0xa5, 0xe8, 0xa4, 0x7a, - 0x6a, 0x7a, 0x73, 0xbc, 0x42, 0x2d, 0x17, 0xbc, 0x87, 0x33, 0xe9, 0xc1, 0x66, 0x12, 0x28, 0x96, - 0xf0, 0x71, 0xc2, 0xd5, 0x94, 0x05, 0x3c, 0xf4, 0xee, 0x68, 0xe9, 0x19, 0x4d, 0x31, 0x4a, 0x2d, - 0x09, 0x94, 0x6b, 0xdc, 0x4e, 0x32, 0x2f, 0xf2, 0x0d, 0x54, 0x79, 0x84, 0x33, 0xa2, 0x13, 0xcf, - 0x17, 0xd1, 0x84, 0x96, 0x71, 0x3a, 0x2a, 0x06, 0x1d, 0x19, 0x30, 0xeb, 0xb5, 0xe7, 0xfb, 0x99, - 0x60, 0xa1, 0x9c, 0xb0, 0xb1, 0x08, 0x39, 0xad, 0xa0, 0xb4, 0x15, 0x03, 0xf7, 0xe5, 0xe4, 0x4c, - 0x84, 0x9c, 0xbc, 0x87, 0x6a, 0xc0, 0xc7, 0x5e, 0x1a, 0x6a, 0x66, 0x96, 0x8e, 0x56, 0xf1, 0x5a, - 0xcd, 0xa5, 0xd5, 0x5e, 0x66, 0x73, 0x62, 0xca, 0x75, 0x2b, 0xb9, 0x5f, 0xbe, 0x1a, 0x6f, 0xa1, - 0x62, 0x86, 0xdd, 0x0b, 0x82, 0x4c, 0x52, 0x6a, 0x67, 0xe9, 0xb0, 0x86, 0x32, 0x1a, 0x3a, 0x06, - 0x27, 0x3f, 0xc3, 0xb6, 0x4c, 0xf5, 0x8d, 0x4c, 0xa3, 0x20, 0x2b, 0x61, 0x3c, 0x16, 0xfe, 0x5c, - 0xe8, 0x4d, 0x4c, 0xfd, 0x6c, 0x2f, 0x07, 0xb9, 0xfb, 0xc8, 0x78, 0x2f, 0x68, 0x5e, 0x97, 0xcb, - 0x4c, 0xe4, 0x04, 0xbe, 0xca, 0x35, 0xf3, 0x43, 0xc1, 0x23, 0xcd, 0x94, 0x08, 0x9e, 0xee, 0x18, - 0xdd, 0x42, 0x11, 0xff, 0x67, 0x68, 0x5d, 0x64, 0x0d, 0x45, 0xb0, 0xb8, 0x6b, 0xa4, 0x09, 0x65, - 0x15, 0x28, 0x96, 0x06, 0x8a, 0xc5, 0x9e, 0x9e, 0xd2, 0x57, 0xa8, 0x27, 0xa8, 0x40, 0x5d, 0x05, - 0xea, 0xd2, 0xd3, 0xd3, 0xac, 0xcd, 0xea, 0x1f, 0x6d, 0xae, 0xff, 0xab, 0x36, 0xab, 0xbf, 0xb5, - 0xf9, 0x03, 0x54, 0x4d, 0x3f, 0x98, 0x92, 0x69, 0xe2, 0x73, 0x45, 0x5f, 0x37, 0x57, 0x5b, 0xa5, - 0xc3, 0x37, 0x4b, 0xc5, 0x31, 0xc2, 0x0c, 0x91, 0xe9, 0x56, 0xfc, 0x85, 0x93, 0x22, 0x47, 0xf0, - 0x3a, 0x2f, 0x3e, 0xbb, 0x9b, 0x96, 0xb7, 0x3c, 0x62, 0x33, 0x99, 0x46, 0x9a, 0x6e, 0x9b, 0x67, - 0xc5, 0x58, 0x87, 0x81, 0x1a, 0x65, 0xb6, 0xf3, 0xcc, 0x94, 0x3d, 0x2b, 0x8b, 0xe3, 0x23, 0x93, - 0x99, 0xa7, 0x29, 0xc5, 0x82, 0x6b, 0x8f, 0x03, 0x84, 0x70, 0x96, 0x60, 0x51, 0x4a, 0x36, 0xf6, - 0x44, 0xc8, 0x64, 0xcc, 0x23, 0xba, 0x63, 0x12, 0xc4, 0x8f, 0x22, 0x9e, 0x79, 0x22, 0x1c, 0xc4, - 0x3c, 0x22, 0x6f, 0xa0, 0xac, 0x93, 0x54, 0x69, 0x16, 0xc8, 0x99, 0x27, 0x22, 0xda, 0xc0, 0xd8, - 0x25, 0xc4, 0x4e, 0x10, 0x6a, 0xfc, 0x66, 0x41, 0x7d, 0x69, 0xab, 0x89, 0x0b, 0x05, 0xdc, 0x7d, - 0x0b, 0x17, 0xf3, 0x87, 0xff, 0x34, 0x2f, 0x4e, 0xb6, 0xe9, 0xa8, 0x3d, 0xc6, 0xda, 0xbb, 0x80, - 0x02, 0xee, 0x7e, 0x1d, 0x2a, 0xee, 0xe9, 0xfb, 0xde, 0x70, 0xe4, 0x5e, 0xb3, 0xc1, 0x45, 0xff, - 0xda, 0x7e, 0xd1, 0x58, 0x29, 0x5a, 0x64, 0x13, 0x36, 0x3a, 0xfd, 0xfe, 0xe0, 0x47, 0xd6, 0xb9, - 0xb8, 0xb6, 0x2d, 0x84, 0xfe, 0x0f, 0xaf, 0x3e, 0xf5, 0xdc, 0xd1, 0x55, 0xa7, 0xcf, 0x86, 0xa7, - 0xee, 0xa7, 0x5e, 0xf7, 0xd4, 0x38, 0xac, 0x64, 0xd6, 0xbd, 0xef, 0xa1, 0xbe, 0xf4, 0xcd, 0x21, - 0xeb, 0xb0, 0x3a, 0x38, 0x3b, 0xb3, 0x5f, 0x90, 0x12, 0xac, 0x9f, 0x9c, 0x9e, 0x75, 0xae, 0xfa, - 0x23, 0xdb, 0x22, 0x00, 0x6b, 0xc3, 0x91, 0xdb, 0xeb, 0x8e, 0xec, 0x95, 0xbd, 0x7d, 0x80, 0xc7, - 0xb7, 0x84, 0x14, 0xa1, 0x70, 0x31, 0xb8, 0x38, 0xb5, 0x5f, 0x90, 0x2a, 0xc0, 0xf9, 0x15, 0xe6, - 0x1b, 0xf5, 0x87, 0xb6, 0xf5, 0xb1, 0x50, 0xac, 0xd9, 0xf6, 0xc7, 0x42, 0x91, 0xd8, 0x5b, 0x7b, - 0x0a, 0xca, 0x8b, 0x43, 0x40, 0x28, 0xac, 0xcf, 0x17, 0xd1, 0x7c, 0x4f, 0xf3, 0x23, 0xe9, 0x41, - 0x59, 0x87, 0xd9, 0x83, 0xab, 0xb5, 0x88, 0x26, 0x0a, 0xbf, 0xa3, 0xd2, 0xe1, 0x7e, 0x2e, 0xe2, - 0xe3, 0xdf, 0x38, 0x97, 0xf2, 0xc8, 0x19, 0xf5, 0x87, 0xc3, 0x9c, 0xed, 0x96, 0x74, 0xa8, 0xe6, - 0x87, 0xe3, 0xd6, 0xef, 0xf7, 0xbb, 0xd6, 0x1f, 0xf7, 0xbb, 0xd6, 0x9f, 0xf7, 0xbb, 0xd6, 0x4f, - 0x0d, 0x13, 0x41, 0xc8, 0xb6, 0x17, 0x8b, 0xf6, 0x93, 0xff, 0xf7, 0x66, 0x0d, 0xc7, 0xfe, 0xe8, - 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc5, 0x33, 0xb9, 0xa7, 0xe8, 0x07, 0x00, 0x00, + // 1039 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0x5f, 0x4f, 0x23, 0x37, + 0x10, 0x67, 0x21, 0x07, 0xc1, 0xf9, 0xb7, 0x98, 0xcb, 0x61, 0x72, 0x15, 0xcd, 0x51, 0x95, 0x8b, + 0x50, 0xb5, 0xd1, 0x81, 0xfa, 0xd0, 0xbe, 0x85, 0x10, 0xee, 0x72, 0x0a, 0x04, 0x6d, 0x96, 0xab, + 0xe8, 0x8b, 0xb5, 0xec, 0x3a, 0x89, 0xc5, 0x66, 0xbd, 0x5d, 0x7b, 0xaf, 0xc7, 0x67, 0xeb, 0x17, + 0xe8, 0x63, 0x9f, 0xfa, 0x5c, 0xf1, 0x49, 0x2a, 0x8f, 0x37, 0x10, 0xda, 0x48, 0x54, 0x7d, 0xf4, + 0x6f, 0x7e, 0x33, 0xe3, 0xf9, 0xcd, 0x78, 0x8c, 0x1a, 0x33, 0x26, 0xa7, 0xed, 0xcf, 0xef, 0xfc, + 0x28, 0x99, 0xfa, 0xef, 0xda, 0x81, 0x88, 0xc7, 0x7c, 0xe2, 0x24, 0xa9, 0x50, 0x02, 0x6f, 0x73, + 0xa9, 0xb8, 0x70, 0x34, 0xc3, 0x99, 0x33, 0x1a, 0x7b, 0x13, 0x21, 0x26, 0x11, 0x6b, 0x03, 0xe5, + 0x26, 0x1b, 0xb7, 0xc3, 0x2c, 0xf5, 0x15, 0x17, 0xb1, 0x71, 0x6a, 0xec, 0x3e, 0x0d, 0x98, 0xa4, + 0xe2, 0xcb, 0x5d, 0x6e, 0x3a, 0x8c, 0x99, 0xfa, 0x55, 0xa4, 0xb7, 0x3c, 0x9e, 0xcc, 0x09, 0xc7, + 0xed, 0x90, 0x49, 0xc5, 0x63, 0x88, 0x40, 0xd3, 0x2c, 0x62, 0x86, 0xbb, 0xff, 0x67, 0x05, 0xa1, + 0x73, 0x26, 0xa7, 0x5d, 0xb8, 0x10, 0xfe, 0x0e, 0xe1, 0x19, 0xff, 0xc2, 0x52, 0x1a, 0x4c, 0x59, + 0x70, 0x4b, 0x25, 0x4b, 0x3f, 0xb3, 0x94, 0x58, 0x4d, 0xab, 0xb5, 0xe9, 0xda, 0x60, 0xe9, 0x6a, + 0xc3, 0x08, 0x70, 0xec, 0xa0, 0x6d, 0xc3, 0x4e, 0x59, 0x22, 0x52, 0x35, 0xa7, 0xaf, 0x02, 0x7d, + 0x0b, 0x4c, 0x2e, 0x58, 0x72, 0xfe, 0x11, 0xaa, 0x87, 0x5c, 0xfa, 0x37, 0x11, 0xa3, 0x89, 0x88, + 0x78, 0x70, 0x67, 0xd2, 0x48, 0xb2, 0xd6, 0xb4, 0x5a, 0x45, 0x77, 0x3b, 0x37, 0x5e, 0x82, 0x0d, + 0x12, 0x49, 0x7c, 0x88, 0xb6, 0xa0, 0x36, 0x1a, 0x71, 0xa9, 0x58, 0x4c, 0x75, 0x38, 0x52, 0x68, + 0x5a, 0xad, 0x17, 0x6e, 0x0d, 0x0c, 0x03, 0xc0, 0x2f, 0x45, 0xaa, 0xf0, 0x01, 0x32, 0x10, 0x9d, + 0x2a, 0x95, 0x18, 0xe6, 0x0b, 0x60, 0x56, 0x00, 0xfe, 0xa0, 0x54, 0x02, 0xbc, 0x13, 0x54, 0x0b, + 0x44, 0x1c, 0xb3, 0x40, 0x51, 0xc5, 0x67, 0x4c, 0x64, 0x8a, 0xac, 0x37, 0xad, 0x56, 0xe9, 0x68, + 0xd7, 0x31, 0xaa, 0x3b, 0x73, 0xd5, 0x9d, 0xd3, 0x5c, 0x75, 0xb7, 0x9a, 0x7b, 0x78, 0xc6, 0x01, + 0x7f, 0x83, 0x2a, 0x3c, 0x9e, 0xa4, 0x4c, 0x4a, 0x1a, 0x44, 0xbe, 0x94, 0x64, 0x03, 0xaa, 0x2e, + 0xe7, 0x60, 0x57, 0x63, 0xf8, 0x2d, 0xaa, 0xcd, 0x49, 0x5a, 0x1b, 0x1e, 0x30, 0x52, 0x04, 0x5a, + 0x35, 0x87, 0x47, 0x06, 0xc5, 0x33, 0xb4, 0xf3, 0x10, 0x4d, 0xc4, 0x2a, 0x15, 0x51, 0xc4, 0x52, + 0x3a, 0x13, 0x21, 0x23, 0x9b, 0x4d, 0xab, 0x55, 0x3d, 0xfa, 0xde, 0x59, 0x32, 0x24, 0xce, 0x63, + 0xe7, 0x9c, 0x7e, 0x9e, 0xf7, 0xc1, 0xfb, 0x5c, 0x84, 0xcc, 0xad, 0xf3, 0x65, 0x30, 0x1e, 0xa2, + 0x92, 0x9f, 0xa9, 0x69, 0xde, 0x05, 0x82, 0x20, 0xc5, 0xe1, 0x73, 0x29, 0x3a, 0x99, 0x9a, 0x9a, + 0xde, 0x9c, 0xac, 0x12, 0xcb, 0x45, 0xfe, 0xc3, 0x19, 0xf7, 0xd1, 0x56, 0x1a, 0x4a, 0x9a, 0xb2, + 0x71, 0xca, 0xe4, 0x94, 0x86, 0x2c, 0xf2, 0xef, 0x48, 0xe9, 0x19, 0x4d, 0x21, 0x4a, 0x2d, 0x0d, + 0xa5, 0x6b, 0xdc, 0x4e, 0xb5, 0x17, 0xfe, 0x16, 0x55, 0x59, 0x0c, 0x33, 0xa2, 0x52, 0x3f, 0xe0, + 0xf1, 0x84, 0x94, 0x61, 0x3a, 0x2a, 0x06, 0xf5, 0x0c, 0xa8, 0x7b, 0xed, 0x07, 0x81, 0x16, 0x2c, + 0x12, 0x13, 0x3a, 0xe6, 0x11, 0x23, 0x15, 0x90, 0xb6, 0x62, 0xe0, 0x81, 0x98, 0x9c, 0xf1, 0x88, + 0xe1, 0xf7, 0xa8, 0x1a, 0xb2, 0xb1, 0x9f, 0x45, 0x8a, 0x9a, 0x47, 0x47, 0xaa, 0x70, 0xad, 0xe6, + 0xd2, 0x6a, 0x2f, 0xf5, 0x9c, 0x98, 0x72, 0xdd, 0x4a, 0xee, 0x97, 0x3f, 0x8d, 0xb7, 0xa8, 0x62, + 0x86, 0xdd, 0x0f, 0x43, 0x2d, 0x29, 0xb1, 0x75, 0x3a, 0xa8, 0xa1, 0x0c, 0x86, 0x8e, 0xc1, 0xf1, + 0x2f, 0x68, 0x47, 0x64, 0xea, 0x46, 0x64, 0x71, 0xa8, 0x4b, 0x18, 0x8f, 0x79, 0x30, 0x17, 0x7a, + 0x0b, 0x52, 0x3f, 0xdb, 0xcb, 0x61, 0xee, 0xee, 0x19, 0xef, 0x05, 0xcd, 0xeb, 0x62, 0x99, 0x09, + 0x9f, 0xa2, 0xaf, 0x73, 0xcd, 0x82, 0x88, 0xb3, 0x58, 0x51, 0xc9, 0xc3, 0xa7, 0x6f, 0x8c, 0x6c, + 0x83, 0x88, 0xaf, 0x0d, 0xad, 0x0b, 0xac, 0x11, 0x0f, 0x17, 0xdf, 0x1a, 0x6e, 0xa2, 0xb2, 0x0c, + 0x25, 0xcd, 0x42, 0x49, 0x13, 0x5f, 0x4d, 0xc9, 0x4b, 0xd0, 0x13, 0xc9, 0x50, 0x5e, 0x85, 0xf2, + 0xd2, 0x57, 0x53, 0xdd, 0x66, 0xf9, 0xaf, 0x36, 0xd7, 0xff, 0x53, 0x9b, 0xe5, 0x3f, 0xda, 0xfc, + 0x01, 0x55, 0x4d, 0x3f, 0xa8, 0x14, 0x59, 0x1a, 0x30, 0x49, 0x5e, 0x35, 0xd7, 0x5a, 0xa5, 0xa3, + 0x37, 0x4b, 0xc5, 0x31, 0xc2, 0x8c, 0x80, 0xe9, 0x56, 0x82, 0x85, 0x93, 0xc4, 0xc7, 0xe8, 0x55, + 0x5e, 0xbc, 0xbe, 0x9b, 0x12, 0xb7, 0x2c, 0xa6, 0x33, 0x91, 0xc5, 0x8a, 0xec, 0x98, 0xb5, 0x62, + 0xac, 0xa3, 0x50, 0x7a, 0xda, 0x76, 0xae, 0x4d, 0x7a, 0xad, 0x2c, 0x8e, 0x8f, 0x48, 0x67, 0xbe, + 0x22, 0x04, 0x0a, 0xae, 0x3d, 0x0e, 0x10, 0xc0, 0x3a, 0xc1, 0xa2, 0x94, 0x74, 0xec, 0xf3, 0x88, + 0x8a, 0x84, 0xc5, 0x64, 0xd7, 0x24, 0x48, 0x1e, 0x45, 0x3c, 0xf3, 0x79, 0x34, 0x4c, 0x58, 0x8c, + 0xdf, 0xa0, 0xb2, 0x4a, 0x33, 0xa9, 0x68, 0x28, 0x66, 0x3e, 0x8f, 0x49, 0x03, 0x62, 0x97, 0x00, + 0x3b, 0x05, 0x48, 0xaf, 0xcf, 0x85, 0x3b, 0xb0, 0x38, 0x10, 0xa1, 0x1e, 0xf7, 0xd7, 0x66, 0x7d, + 0x3e, 0xdc, 0xa2, 0x97, 0x1b, 0x1a, 0xbf, 0x59, 0xa8, 0xbe, 0x74, 0x34, 0xb0, 0x8b, 0x0a, 0xb0, + 0x2b, 0x2c, 0x78, 0xc8, 0x3f, 0xfe, 0xaf, 0xf9, 0x72, 0xf4, 0x66, 0x80, 0x5e, 0x41, 0xac, 0xfd, + 0x0b, 0x54, 0x80, 0x5d, 0x51, 0x47, 0x15, 0xb7, 0xf7, 0xbe, 0x3f, 0xf2, 0xdc, 0x6b, 0x3a, 0xbc, + 0x18, 0x5c, 0xdb, 0x2b, 0x8d, 0xd5, 0xa2, 0x85, 0xb7, 0xd0, 0x66, 0x67, 0x30, 0x18, 0xfe, 0x44, + 0x3b, 0x17, 0xd7, 0xb6, 0x05, 0xd0, 0x57, 0xe8, 0xe5, 0xa7, 0xbe, 0xeb, 0x5d, 0x75, 0x06, 0x74, + 0xd4, 0x73, 0x3f, 0xf5, 0xbb, 0x3d, 0xe3, 0xb0, 0xaa, 0xad, 0xfb, 0x3f, 0xa0, 0xfa, 0xd2, 0x1d, + 0x85, 0x37, 0xd0, 0xda, 0xf0, 0xec, 0xcc, 0x5e, 0xc1, 0x25, 0xb4, 0x71, 0xda, 0x3b, 0xeb, 0x5c, + 0x0d, 0x3c, 0xdb, 0xc2, 0x08, 0xad, 0x8f, 0x3c, 0xb7, 0xdf, 0xf5, 0xec, 0xd5, 0xfd, 0x03, 0x84, + 0x1e, 0x77, 0x0f, 0x2e, 0xa2, 0xc2, 0xc5, 0xf0, 0xa2, 0x67, 0xaf, 0xe0, 0x2a, 0x42, 0xe7, 0x57, + 0x90, 0xcf, 0x1b, 0x8c, 0x6c, 0xeb, 0x63, 0xa1, 0x58, 0xb3, 0xed, 0x8f, 0x85, 0x22, 0xb6, 0xb7, + 0xf7, 0x25, 0x2a, 0x2f, 0x0e, 0x0d, 0x26, 0x68, 0x63, 0xfe, 0x70, 0xcd, 0x77, 0x36, 0x3f, 0xe2, + 0x3e, 0x2a, 0xab, 0x48, 0x2f, 0x68, 0xa5, 0x78, 0x3c, 0x91, 0xf0, 0x7d, 0x95, 0x8e, 0x0e, 0x72, + 0x11, 0x1f, 0xff, 0xd2, 0xb9, 0x94, 0xc7, 0x8e, 0x37, 0x18, 0x8d, 0x72, 0xb6, 0x5b, 0x52, 0x91, + 0x9c, 0x1f, 0x4e, 0x5a, 0xbf, 0xdf, 0xef, 0x59, 0x7f, 0xdc, 0xef, 0x59, 0x7f, 0xdd, 0xef, 0x59, + 0x3f, 0x37, 0x4c, 0x04, 0x2e, 0xda, 0x7e, 0xc2, 0xdb, 0x4f, 0xfe, 0xeb, 0x9b, 0x75, 0x78, 0x26, + 0xc7, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0xf5, 0x34, 0x94, 0x8e, 0x18, 0x08, 0x00, 0x00, } diff --git a/mesh/v1alpha1/config.proto b/mesh/v1alpha1/config.proto index 38b2b2faec..9505758427 100644 --- a/mesh/v1alpha1/config.proto +++ b/mesh/v1alpha1/config.proto @@ -121,10 +121,14 @@ message MeshConfig { // Empty value disables access logging. string access_log_file = 13; - // Format for the proxy access log (text or json). - // Default value is text. + // Format for the proxy access log + // Empty value results in proxy's default access log format string access_log_format = 24; + // Encoding for the proxy access log (text or json). + // Default value is text. + string access_log_encoding = 27; + // Default proxy config used by the proxy injection mechanism operating in the mesh // (e.g. Kubernetes admission controller) // In case of Kubernetes, the proxy config is applied once during the injection process, @@ -188,7 +192,7 @@ message MeshConfig { string trust_domain = 26; // $hide_from_docs - // Next available field number: 27 + // Next available field number: 28 } // ConfigSource describes information about a configuration store inside a diff --git a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html index e5ade7fc3e..c7b162a46c 100644 --- a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html +++ b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html @@ -221,7 +221,16 @@

MeshConfig

accessLogFormat string -

Format for the proxy access log (text or json). +

Format for the proxy access log +Empty value results in proxy’s default access log format

+ + + + +accessLogEncoding +string + +

Encoding for the proxy access log (text or json). Default value is text.

diff --git a/proto.lock b/proto.lock index 17752c00c6..789228faca 100644 --- a/proto.lock +++ b/proto.lock @@ -758,6 +758,11 @@ "name": "access_log_format", "type": "string" }, + { + "id": 27, + "name": "access_log_encoding", + "type": "string" + }, { "id": 14, "name": "default_config", diff --git a/python/istio_api/mesh/v1alpha1/config_pb2.py b/python/istio_api/mesh/v1alpha1/config_pb2.py index e6fc3b9567..67482484c3 100644 --- a/python/istio_api/mesh/v1alpha1/config_pb2.py +++ b/python/istio_api/mesh/v1alpha1/config_pb2.py @@ -22,7 +22,7 @@ name='mesh/v1alpha1/config.proto', package='istio.mesh.v1alpha1', syntax='proto3', - serialized_pb=_b('\n\x1amesh/v1alpha1/config.proto\x12\x13istio.mesh.v1alpha1\x1a\x1egoogle/protobuf/duration.proto\x1a\x19mesh/v1alpha1/proxy.proto\x1a*networking/v1alpha3/destination_rule.proto\"\x81\n\n\nMeshConfig\x12\x1a\n\x12mixer_check_server\x18\x01 \x01(\t\x12\x1b\n\x13mixer_report_server\x18\x02 \x01(\t\x12\x1d\n\x15\x64isable_policy_checks\x18\x03 \x01(\x08\x12\x1e\n\x16policy_check_fail_open\x18\x19 \x01(\x08\x12\x19\n\x11proxy_listen_port\x18\x04 \x01(\x05\x12\x17\n\x0fproxy_http_port\x18\x05 \x01(\x05\x12\x32\n\x0f\x63onnect_timeout\x18\x06 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x15\n\ringress_class\x18\x07 \x01(\t\x12\x17\n\x0fingress_service\x18\x08 \x01(\t\x12V\n\x17ingress_controller_mode\x18\t \x01(\x0e\x32\x35.istio.mesh.v1alpha1.MeshConfig.IngressControllerMode\x12\x43\n\x0b\x61uth_policy\x18\n \x01(\x0e\x32*.istio.mesh.v1alpha1.MeshConfig.AuthPolicyB\x02\x18\x01\x12\x38\n\x11rds_refresh_delay\x18\x0b \x01(\x0b\x32\x19.google.protobuf.DurationB\x02\x18\x01\x12\x16\n\x0e\x65nable_tracing\x18\x0c \x01(\x08\x12\x17\n\x0f\x61\x63\x63\x65ss_log_file\x18\r \x01(\t\x12\x19\n\x11\x61\x63\x63\x65ss_log_format\x18\x18 \x01(\t\x12\x38\n\x0e\x64\x65\x66\x61ult_config\x18\x0e \x01(\x0b\x32 .istio.mesh.v1alpha1.ProxyConfig\x12\x19\n\rmixer_address\x18\x10 \x01(\tB\x02\x18\x01\x12Z\n\x17outbound_traffic_policy\x18\x11 \x01(\x0b\x32\x35.istio.mesh.v1alpha1.MeshConfig.OutboundTrafficPolicyB\x02\x18\x01\x12\'\n\x1f\x65nable_client_side_policy_check\x18\x13 \x01(\x08\x12\x14\n\x0csds_uds_path\x18\x14 \x01(\t\x12\x38\n\x11sds_refresh_delay\x18\x15 \x01(\x0b\x32\x19.google.protobuf.DurationB\x02\x18\x01\x12\x39\n\x0e\x63onfig_sources\x18\x16 \x03(\x0b\x32!.istio.mesh.v1alpha1.ConfigSource\x12\x1e\n\x16\x65nable_sds_token_mount\x18\x17 \x01(\x08\x12\x14\n\x0ctrust_domain\x18\x1a \x01(\t\x1a\xb5\x01\n\x15OutboundTrafficPolicy\x12L\n\x04mode\x18\x01 \x01(\x0e\x32:.istio.mesh.v1alpha1.MeshConfig.OutboundTrafficPolicy.ModeB\x02\x18\x01\"N\n\x04Mode\x12\x15\n\rREGISTRY_ONLY\x10\x00\x1a\x02\x08\x01\x12\x11\n\tALLOW_ANY\x10\x01\x1a\x02\x08\x01\x12\x1c\n\x14VIRTUAL_SERVICE_ONLY\x10\x02\x1a\x02\x08\x01\"9\n\x15IngressControllerMode\x12\x07\n\x03OFF\x10\x00\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10\x01\x12\n\n\x06STRICT\x10\x02\"&\n\nAuthPolicy\x12\x08\n\x04NONE\x10\x00\x12\x0e\n\nMUTUAL_TLS\x10\x01J\x04\x08\x0f\x10\x10J\x04\x08\x12\x10\x13\"]\n\x0c\x43onfigSource\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12<\n\x0ctls_settings\x18\x02 \x01(\x0b\x32&.istio.networking.v1alpha3.TLSSettingsB\x1cZ\x1aistio.io/api/mesh/v1alpha1b\x06proto3') + serialized_pb=_b('\n\x1amesh/v1alpha1/config.proto\x12\x13istio.mesh.v1alpha1\x1a\x1egoogle/protobuf/duration.proto\x1a\x19mesh/v1alpha1/proxy.proto\x1a*networking/v1alpha3/destination_rule.proto\"\x9e\n\n\nMeshConfig\x12\x1a\n\x12mixer_check_server\x18\x01 \x01(\t\x12\x1b\n\x13mixer_report_server\x18\x02 \x01(\t\x12\x1d\n\x15\x64isable_policy_checks\x18\x03 \x01(\x08\x12\x1e\n\x16policy_check_fail_open\x18\x19 \x01(\x08\x12\x19\n\x11proxy_listen_port\x18\x04 \x01(\x05\x12\x17\n\x0fproxy_http_port\x18\x05 \x01(\x05\x12\x32\n\x0f\x63onnect_timeout\x18\x06 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x15\n\ringress_class\x18\x07 \x01(\t\x12\x17\n\x0fingress_service\x18\x08 \x01(\t\x12V\n\x17ingress_controller_mode\x18\t \x01(\x0e\x32\x35.istio.mesh.v1alpha1.MeshConfig.IngressControllerMode\x12\x43\n\x0b\x61uth_policy\x18\n \x01(\x0e\x32*.istio.mesh.v1alpha1.MeshConfig.AuthPolicyB\x02\x18\x01\x12\x38\n\x11rds_refresh_delay\x18\x0b \x01(\x0b\x32\x19.google.protobuf.DurationB\x02\x18\x01\x12\x16\n\x0e\x65nable_tracing\x18\x0c \x01(\x08\x12\x17\n\x0f\x61\x63\x63\x65ss_log_file\x18\r \x01(\t\x12\x19\n\x11\x61\x63\x63\x65ss_log_format\x18\x18 \x01(\t\x12\x1b\n\x13\x61\x63\x63\x65ss_log_encoding\x18\x1b \x01(\t\x12\x38\n\x0e\x64\x65\x66\x61ult_config\x18\x0e \x01(\x0b\x32 .istio.mesh.v1alpha1.ProxyConfig\x12\x19\n\rmixer_address\x18\x10 \x01(\tB\x02\x18\x01\x12Z\n\x17outbound_traffic_policy\x18\x11 \x01(\x0b\x32\x35.istio.mesh.v1alpha1.MeshConfig.OutboundTrafficPolicyB\x02\x18\x01\x12\'\n\x1f\x65nable_client_side_policy_check\x18\x13 \x01(\x08\x12\x14\n\x0csds_uds_path\x18\x14 \x01(\t\x12\x38\n\x11sds_refresh_delay\x18\x15 \x01(\x0b\x32\x19.google.protobuf.DurationB\x02\x18\x01\x12\x39\n\x0e\x63onfig_sources\x18\x16 \x03(\x0b\x32!.istio.mesh.v1alpha1.ConfigSource\x12\x1e\n\x16\x65nable_sds_token_mount\x18\x17 \x01(\x08\x12\x14\n\x0ctrust_domain\x18\x1a \x01(\t\x1a\xb5\x01\n\x15OutboundTrafficPolicy\x12L\n\x04mode\x18\x01 \x01(\x0e\x32:.istio.mesh.v1alpha1.MeshConfig.OutboundTrafficPolicy.ModeB\x02\x18\x01\"N\n\x04Mode\x12\x15\n\rREGISTRY_ONLY\x10\x00\x1a\x02\x08\x01\x12\x11\n\tALLOW_ANY\x10\x01\x1a\x02\x08\x01\x12\x1c\n\x14VIRTUAL_SERVICE_ONLY\x10\x02\x1a\x02\x08\x01\"9\n\x15IngressControllerMode\x12\x07\n\x03OFF\x10\x00\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10\x01\x12\n\n\x06STRICT\x10\x02\"&\n\nAuthPolicy\x12\x08\n\x04NONE\x10\x00\x12\x0e\n\nMUTUAL_TLS\x10\x01J\x04\x08\x0f\x10\x10J\x04\x08\x12\x10\x13\"]\n\x0c\x43onfigSource\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12<\n\x0ctls_settings\x18\x02 \x01(\x0b\x32&.istio.networking.v1alpha3.TLSSettingsB\x1cZ\x1aistio.io/api/mesh/v1alpha1b\x06proto3') , dependencies=[google_dot_protobuf_dot_duration__pb2.DESCRIPTOR,mesh_dot_v1alpha1_dot_proxy__pb2.DESCRIPTOR,networking_dot_v1alpha3_dot_destination__rule__pb2.DESCRIPTOR,]) @@ -49,8 +49,8 @@ ], containing_type=None, options=None, - serialized_start=1247, - serialized_end=1325, + serialized_start=1276, + serialized_end=1354, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_OUTBOUNDTRAFFICPOLICY_MODE) @@ -75,8 +75,8 @@ ], containing_type=None, options=None, - serialized_start=1327, - serialized_end=1384, + serialized_start=1356, + serialized_end=1413, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_INGRESSCONTROLLERMODE) @@ -97,8 +97,8 @@ ], containing_type=None, options=None, - serialized_start=1386, - serialized_end=1424, + serialized_start=1415, + serialized_end=1453, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_AUTHPOLICY) @@ -130,8 +130,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1144, - serialized_end=1325, + serialized_start=1173, + serialized_end=1354, ) _MESHCONFIG = _descriptor.Descriptor( @@ -247,63 +247,70 @@ is_extension=False, extension_scope=None, options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='default_config', full_name='istio.mesh.v1alpha1.MeshConfig.default_config', index=15, + name='access_log_encoding', full_name='istio.mesh.v1alpha1.MeshConfig.access_log_encoding', index=15, + number=27, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=_b("").decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='default_config', full_name='istio.mesh.v1alpha1.MeshConfig.default_config', index=16, number=14, 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, options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='mixer_address', full_name='istio.mesh.v1alpha1.MeshConfig.mixer_address', index=16, + name='mixer_address', full_name='istio.mesh.v1alpha1.MeshConfig.mixer_address', index=17, number=16, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')), file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='outbound_traffic_policy', full_name='istio.mesh.v1alpha1.MeshConfig.outbound_traffic_policy', index=17, + name='outbound_traffic_policy', full_name='istio.mesh.v1alpha1.MeshConfig.outbound_traffic_policy', index=18, number=17, 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, options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')), file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='enable_client_side_policy_check', full_name='istio.mesh.v1alpha1.MeshConfig.enable_client_side_policy_check', index=18, + name='enable_client_side_policy_check', full_name='istio.mesh.v1alpha1.MeshConfig.enable_client_side_policy_check', index=19, number=19, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='sds_uds_path', full_name='istio.mesh.v1alpha1.MeshConfig.sds_uds_path', index=19, + name='sds_uds_path', full_name='istio.mesh.v1alpha1.MeshConfig.sds_uds_path', index=20, number=20, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='sds_refresh_delay', full_name='istio.mesh.v1alpha1.MeshConfig.sds_refresh_delay', index=20, + name='sds_refresh_delay', full_name='istio.mesh.v1alpha1.MeshConfig.sds_refresh_delay', index=21, number=21, 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, options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')), file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='config_sources', full_name='istio.mesh.v1alpha1.MeshConfig.config_sources', index=21, + name='config_sources', full_name='istio.mesh.v1alpha1.MeshConfig.config_sources', index=22, number=22, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='enable_sds_token_mount', full_name='istio.mesh.v1alpha1.MeshConfig.enable_sds_token_mount', index=22, + name='enable_sds_token_mount', full_name='istio.mesh.v1alpha1.MeshConfig.enable_sds_token_mount', index=23, number=23, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='trust_domain', full_name='istio.mesh.v1alpha1.MeshConfig.trust_domain', index=23, + name='trust_domain', full_name='istio.mesh.v1alpha1.MeshConfig.trust_domain', index=24, number=26, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, @@ -324,7 +331,7 @@ oneofs=[ ], serialized_start=155, - serialized_end=1436, + serialized_end=1465, ) @@ -361,8 +368,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1438, - serialized_end=1531, + serialized_start=1467, + serialized_end=1560, ) _MESHCONFIG_OUTBOUNDTRAFFICPOLICY.fields_by_name['mode'].enum_type = _MESHCONFIG_OUTBOUNDTRAFFICPOLICY_MODE