From b35629db52869b86d1bc1adf810edca9c54af882 Mon Sep 17 00:00:00 2001 From: ozben Date: Fri, 19 Oct 2018 13:36:01 -0700 Subject: [PATCH 1/2] Bring back removed Mesh config entries. --- mesh/v1alpha1/config.pb.go | 503 +++++++++++++++++-- mesh/v1alpha1/config.proto | 58 ++- mesh/v1alpha1/istio.mesh.v1alpha1.pb.html | 5 +- mesh/v1alpha1/proxy.pb.go | 226 ++++++--- mesh/v1alpha1/proxy.proto | 14 +- python/istio_api/mesh/v1alpha1/config_pb2.py | 149 +++++- python/istio_api/mesh/v1alpha1/proxy_pb2.py | 53 +- 7 files changed, 857 insertions(+), 151 deletions(-) diff --git a/mesh/v1alpha1/config.pb.go b/mesh/v1alpha1/config.pb.go index f3a0c3eb12..e6d2227347 100644 --- a/mesh/v1alpha1/config.pb.go +++ b/mesh/v1alpha1/config.pb.go @@ -96,6 +96,41 @@ func (MeshConfig_AuthPolicy) EnumDescriptor() ([]byte, []int) { return fileDescriptorConfig, []int{0, 1} } +// $hide_from_docs +// DEPRECATED. UNUSED. +type MeshConfig_OutboundTrafficPolicy_Mode int32 + +const ( + // $hide_from_docs + // outbound traffic will be restricted to services defined in the service registry as well as those defined + // through ServiceEntries + MeshConfig_OutboundTrafficPolicy_REGISTRY_ONLY MeshConfig_OutboundTrafficPolicy_Mode = 0 + // $hide_from_docs + // outbound traffic to unknown destinations will be allowed + MeshConfig_OutboundTrafficPolicy_ALLOW_ANY MeshConfig_OutboundTrafficPolicy_Mode = 1 + // $hide_from_docs + // not implemented. outbound traffic will be restricted to destinations defined in VirtualServices only + MeshConfig_OutboundTrafficPolicy_VIRTUAL_SERVICE_ONLY MeshConfig_OutboundTrafficPolicy_Mode = 2 +) + +var MeshConfig_OutboundTrafficPolicy_Mode_name = map[int32]string{ + 0: "REGISTRY_ONLY", + 1: "ALLOW_ANY", + 2: "VIRTUAL_SERVICE_ONLY", +} +var MeshConfig_OutboundTrafficPolicy_Mode_value = map[string]int32{ + "REGISTRY_ONLY": 0, + "ALLOW_ANY": 1, + "VIRTUAL_SERVICE_ONLY": 2, +} + +func (x MeshConfig_OutboundTrafficPolicy_Mode) String() string { + return proto.EnumName(MeshConfig_OutboundTrafficPolicy_Mode_name, int32(x)) +} +func (MeshConfig_OutboundTrafficPolicy_Mode) EnumDescriptor() ([]byte, []int) { + return fileDescriptorConfig, []int{0, 0, 0} +} + // MeshConfig defines mesh-wide variables shared by all Envoy instances in the // Istio service mesh. // @@ -138,12 +173,16 @@ type MeshConfig struct { IngressControllerMode MeshConfig_IngressControllerMode `protobuf:"varint,9,opt,name=ingress_controller_mode,json=ingressControllerMode,proto3,enum=istio.mesh.v1alpha1.MeshConfig_IngressControllerMode" json:"ingress_controller_mode,omitempty"` // $hide_from_docs AuthPolicy MeshConfig_AuthPolicy `protobuf:"varint,10,opt,name=auth_policy,json=authPolicy,proto3,enum=istio.mesh.v1alpha1.MeshConfig_AuthPolicy" json:"auth_policy,omitempty"` + // $hide_from_docs + // DEPRECATED. UNUSED. Polling interval for RDS (MUST BE >=1ms) + RdsRefreshDelay *google_protobuf.Duration `protobuf:"bytes,11,opt,name=rds_refresh_delay,json=rdsRefreshDelay" json:"rds_refresh_delay,omitempty"` // Flag to control generation of trace spans and request IDs. // Requires a trace span collector defined in the proxy configuration. EnableTracing bool `protobuf:"varint,12,opt,name=enable_tracing,json=enableTracing,proto3" json:"enable_tracing,omitempty"` // 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"` + // DEPRECATED. // Format for the proxy access log (text or json). // Default value is text. AccessLogFormat string `protobuf:"bytes,24,opt,name=access_log_format,json=accessLogFormat,proto3" json:"access_log_format,omitempty"` @@ -153,11 +192,28 @@ type MeshConfig struct { // and remain constant for the duration of the pod. The rest of the mesh config can be changed // at runtime and config gets distributed dynamically. DefaultConfig *ProxyConfig `protobuf:"bytes,14,opt,name=default_config,json=defaultConfig" json:"default_config,omitempty"` + // $hide_from_docs + // DEPRECATED. UNUSED. Mixer address. This option will be removed soon. Please + // use mixer_check and mixer_report. + MixerAddress string `protobuf:"bytes,16,opt,name=mixer_address,json=mixerAddress,proto3" json:"mixer_address,omitempty"` + // $hide_from_docs + // DEPRECATED. UNUSED. + // Set the default behavior of the sidecar for handling outbound traffic from the application. + // While the default mode should work out of the box, if your application uses one or more external services that + // are not known apriori, setting the policy to ALLOW_ANY will cause the sidecars to route traffic to the any + // requested destination. + // Users are strongly encouraged to use ServiceEntries to explicitly declare any external dependencies, + // instead of using allow_any. + OutboundTrafficPolicy *MeshConfig_OutboundTrafficPolicy `protobuf:"bytes,17,opt,name=outbound_traffic_policy,json=outboundTrafficPolicy" json:"outbound_traffic_policy,omitempty"` // Enables clide side policy checks. EnableClientSidePolicyCheck bool `protobuf:"varint,19,opt,name=enable_client_side_policy_check,json=enableClientSidePolicyCheck,proto3" json:"enable_client_side_policy_check,omitempty"` // Unix Domain Socket through which envoy communicates with NodeAgent SDS to get key/cert for mTLS. // Use secret-mount files instead of SDS if set to empty. SdsUdsPath string `protobuf:"bytes,20,opt,name=sds_uds_path,json=sdsUdsPath,proto3" json:"sds_uds_path,omitempty"` + // $hide_from_docs + // DEPRECATED. UNUSED. + // Polling interval for SDS (MUST BE >=1ms) + SdsRefreshDelay *google_protobuf.Duration `protobuf:"bytes,21,opt,name=sds_refresh_delay,json=sdsRefreshDelay" json:"sds_refresh_delay,omitempty"` // Address of the galley service exposing the Mesh Control Protocol (MCP). GalleyAddress string `protobuf:"bytes,22,opt,name=galley_address,json=galleyAddress,proto3" json:"galley_address,omitempty"` // $hide_from_docs @@ -243,6 +299,13 @@ func (m *MeshConfig) GetAuthPolicy() MeshConfig_AuthPolicy { return MeshConfig_NONE } +func (m *MeshConfig) GetRdsRefreshDelay() *google_protobuf.Duration { + if m != nil { + return m.RdsRefreshDelay + } + return nil +} + func (m *MeshConfig) GetEnableTracing() bool { if m != nil { return m.EnableTracing @@ -271,6 +334,20 @@ func (m *MeshConfig) GetDefaultConfig() *ProxyConfig { return nil } +func (m *MeshConfig) GetMixerAddress() string { + if m != nil { + return m.MixerAddress + } + return "" +} + +func (m *MeshConfig) GetOutboundTrafficPolicy() *MeshConfig_OutboundTrafficPolicy { + if m != nil { + return m.OutboundTrafficPolicy + } + return nil +} + func (m *MeshConfig) GetEnableClientSidePolicyCheck() bool { if m != nil { return m.EnableClientSidePolicyCheck @@ -285,6 +362,13 @@ func (m *MeshConfig) GetSdsUdsPath() string { return "" } +func (m *MeshConfig) GetSdsRefreshDelay() *google_protobuf.Duration { + if m != nil { + return m.SdsRefreshDelay + } + return nil +} + func (m *MeshConfig) GetGalleyAddress() string { if m != nil { return m.GalleyAddress @@ -299,10 +383,34 @@ func (m *MeshConfig) GetEnableSdsTokenMount() bool { return false } +// $hide_from_docs +// DEPRECATED. UNUSED. +type MeshConfig_OutboundTrafficPolicy struct { + // $hide_from_docs + // DEPRECATED. UNUSED. + Mode MeshConfig_OutboundTrafficPolicy_Mode `protobuf:"varint,1,opt,name=mode,proto3,enum=istio.mesh.v1alpha1.MeshConfig_OutboundTrafficPolicy_Mode" json:"mode,omitempty"` +} + +func (m *MeshConfig_OutboundTrafficPolicy) Reset() { *m = MeshConfig_OutboundTrafficPolicy{} } +func (m *MeshConfig_OutboundTrafficPolicy) String() string { return proto.CompactTextString(m) } +func (*MeshConfig_OutboundTrafficPolicy) ProtoMessage() {} +func (*MeshConfig_OutboundTrafficPolicy) Descriptor() ([]byte, []int) { + return fileDescriptorConfig, []int{0, 0} +} + +func (m *MeshConfig_OutboundTrafficPolicy) GetMode() MeshConfig_OutboundTrafficPolicy_Mode { + if m != nil { + return m.Mode + } + return MeshConfig_OutboundTrafficPolicy_REGISTRY_ONLY +} + func init() { proto.RegisterType((*MeshConfig)(nil), "istio.mesh.v1alpha1.MeshConfig") + proto.RegisterType((*MeshConfig_OutboundTrafficPolicy)(nil), "istio.mesh.v1alpha1.MeshConfig.OutboundTrafficPolicy") proto.RegisterEnum("istio.mesh.v1alpha1.MeshConfig_IngressControllerMode", MeshConfig_IngressControllerMode_name, MeshConfig_IngressControllerMode_value) proto.RegisterEnum("istio.mesh.v1alpha1.MeshConfig_AuthPolicy", MeshConfig_AuthPolicy_name, MeshConfig_AuthPolicy_value) + proto.RegisterEnum("istio.mesh.v1alpha1.MeshConfig_OutboundTrafficPolicy_Mode", MeshConfig_OutboundTrafficPolicy_Mode_name, MeshConfig_OutboundTrafficPolicy_Mode_value) } func (m *MeshConfig) Marshal() (dAtA []byte, err error) { size := m.Size() @@ -383,6 +491,16 @@ func (m *MeshConfig) MarshalTo(dAtA []byte) (int, error) { i++ i = encodeVarintConfig(dAtA, i, uint64(m.AuthPolicy)) } + if m.RdsRefreshDelay != nil { + dAtA[i] = 0x5a + i++ + i = encodeVarintConfig(dAtA, i, uint64(m.RdsRefreshDelay.Size())) + n2, err := m.RdsRefreshDelay.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n2 + } if m.EnableTracing { dAtA[i] = 0x60 i++ @@ -403,11 +521,31 @@ func (m *MeshConfig) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x72 i++ i = encodeVarintConfig(dAtA, i, uint64(m.DefaultConfig.Size())) - n2, err := m.DefaultConfig.MarshalTo(dAtA[i:]) + n3, err := m.DefaultConfig.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n2 + i += n3 + } + if len(m.MixerAddress) > 0 { + dAtA[i] = 0x82 + i++ + dAtA[i] = 0x1 + i++ + i = encodeVarintConfig(dAtA, i, uint64(len(m.MixerAddress))) + i += copy(dAtA[i:], m.MixerAddress) + } + if m.OutboundTrafficPolicy != nil { + dAtA[i] = 0x8a + i++ + dAtA[i] = 0x1 + i++ + i = encodeVarintConfig(dAtA, i, uint64(m.OutboundTrafficPolicy.Size())) + n4, err := m.OutboundTrafficPolicy.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n4 } if m.EnableClientSidePolicyCheck { dAtA[i] = 0x98 @@ -429,6 +567,18 @@ func (m *MeshConfig) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintConfig(dAtA, i, uint64(len(m.SdsUdsPath))) i += copy(dAtA[i:], m.SdsUdsPath) } + if m.SdsRefreshDelay != nil { + dAtA[i] = 0xaa + i++ + dAtA[i] = 0x1 + i++ + i = encodeVarintConfig(dAtA, i, uint64(m.SdsRefreshDelay.Size())) + n5, err := m.SdsRefreshDelay.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n5 + } if len(m.GalleyAddress) > 0 { dAtA[i] = 0xb2 i++ @@ -460,6 +610,29 @@ func (m *MeshConfig) MarshalTo(dAtA []byte) (int, error) { return i, nil } +func (m *MeshConfig_OutboundTrafficPolicy) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalTo(dAtA) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *MeshConfig_OutboundTrafficPolicy) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if m.Mode != 0 { + dAtA[i] = 0x8 + i++ + i = encodeVarintConfig(dAtA, i, uint64(m.Mode)) + } + return i, nil +} + func encodeVarintConfig(dAtA []byte, offset int, v uint64) int { for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) @@ -507,6 +680,10 @@ func (m *MeshConfig) Size() (n int) { if m.AuthPolicy != 0 { n += 1 + sovConfig(uint64(m.AuthPolicy)) } + if m.RdsRefreshDelay != nil { + l = m.RdsRefreshDelay.Size() + n += 1 + l + sovConfig(uint64(l)) + } if m.EnableTracing { n += 2 } @@ -518,6 +695,14 @@ func (m *MeshConfig) Size() (n int) { l = m.DefaultConfig.Size() n += 1 + l + sovConfig(uint64(l)) } + l = len(m.MixerAddress) + if l > 0 { + n += 2 + l + sovConfig(uint64(l)) + } + if m.OutboundTrafficPolicy != nil { + l = m.OutboundTrafficPolicy.Size() + n += 2 + l + sovConfig(uint64(l)) + } if m.EnableClientSidePolicyCheck { n += 3 } @@ -525,6 +710,10 @@ func (m *MeshConfig) Size() (n int) { if l > 0 { n += 2 + l + sovConfig(uint64(l)) } + if m.SdsRefreshDelay != nil { + l = m.SdsRefreshDelay.Size() + n += 2 + l + sovConfig(uint64(l)) + } l = len(m.GalleyAddress) if l > 0 { n += 2 + l + sovConfig(uint64(l)) @@ -539,6 +728,15 @@ func (m *MeshConfig) Size() (n int) { return n } +func (m *MeshConfig_OutboundTrafficPolicy) Size() (n int) { + var l int + _ = l + if m.Mode != 0 { + n += 1 + sovConfig(uint64(m.Mode)) + } + return n +} + func sovConfig(x uint64) (n int) { for { n++ @@ -826,6 +1024,39 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { break } } + case 11: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field RdsRefreshDelay", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + msglen + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.RdsRefreshDelay == nil { + m.RdsRefreshDelay = &google_protobuf.Duration{} + } + if err := m.RdsRefreshDelay.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex case 12: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field EnableTracing", wireType) @@ -908,6 +1139,68 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 16: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field MixerAddress", 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.MixerAddress = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 17: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field OutboundTrafficPolicy", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + msglen + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.OutboundTrafficPolicy == nil { + m.OutboundTrafficPolicy = &MeshConfig_OutboundTrafficPolicy{} + } + if err := m.OutboundTrafficPolicy.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex case 19: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field EnableClientSidePolicyCheck", wireType) @@ -957,6 +1250,39 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } m.SdsUdsPath = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 21: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SdsRefreshDelay", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + msglen + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.SdsRefreshDelay == nil { + m.SdsRefreshDelay = &google_protobuf.Duration{} + } + if err := m.SdsRefreshDelay.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex case 22: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field GalleyAddress", wireType) @@ -1056,6 +1382,75 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } return nil } +func (m *MeshConfig_OutboundTrafficPolicy) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: OutboundTrafficPolicy: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: OutboundTrafficPolicy: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Mode", wireType) + } + m.Mode = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Mode |= (MeshConfig_OutboundTrafficPolicy_Mode(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + default: + iNdEx = preIndex + skippy, err := skipConfig(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthConfig + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipConfig(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 @@ -1164,51 +1559,61 @@ var ( func init() { proto.RegisterFile("mesh/v1alpha1/config.proto", fileDescriptorConfig) } var fileDescriptorConfig = []byte{ - // 723 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0xdd, 0x4e, 0xfb, 0x36, - 0x1c, 0xfd, 0x07, 0x02, 0x04, 0xf7, 0x2b, 0x75, 0x57, 0x30, 0x9d, 0xd4, 0x55, 0x4c, 0x63, 0x15, - 0x9a, 0x52, 0x01, 0xda, 0xc5, 0x2e, 0x4b, 0xa1, 0x1b, 0x55, 0x0b, 0x55, 0x9a, 0xde, 0xec, 0xc6, - 0x32, 0x89, 0x9b, 0x58, 0xa4, 0x71, 0x14, 0x3b, 0x08, 0xde, 0x70, 0x97, 0x93, 0xf6, 0x02, 0x13, - 0x4f, 0x32, 0xc5, 0x4e, 0xf9, 0x90, 0x2a, 0xed, 0x32, 0xe7, 0x9c, 0xdf, 0xe7, 0xf9, 0x39, 0xa0, - 0xb3, 0xa6, 0x22, 0x1a, 0x3c, 0x5f, 0x90, 0x38, 0x8d, 0xc8, 0xc5, 0xc0, 0xe7, 0xc9, 0x8a, 0x85, - 0x4e, 0x9a, 0x71, 0xc9, 0x61, 0x8b, 0x09, 0xc9, 0xb8, 0x53, 0x28, 0x9c, 0x8d, 0xa2, 0xd3, 0x0d, - 0x39, 0x0f, 0x63, 0x3a, 0x50, 0x92, 0xc7, 0x7c, 0x35, 0x08, 0xf2, 0x8c, 0x48, 0xc6, 0x13, 0x1d, - 0xd4, 0x39, 0xf9, 0x9a, 0x30, 0xcd, 0xf8, 0xcb, 0xab, 0xa6, 0x4e, 0xff, 0xb1, 0x00, 0x98, 0x51, - 0x11, 0x8d, 0x54, 0x11, 0xf8, 0x0b, 0x80, 0x6b, 0xf6, 0x42, 0x33, 0xec, 0x47, 0xd4, 0x7f, 0xc2, - 0x82, 0x66, 0xcf, 0x34, 0x43, 0x46, 0xcf, 0xe8, 0x1f, 0xba, 0xb6, 0x62, 0x46, 0x05, 0xb1, 0x50, - 0x38, 0x74, 0x40, 0x4b, 0xab, 0x33, 0x9a, 0xf2, 0x4c, 0x6e, 0xe4, 0x3b, 0x4a, 0xde, 0x54, 0x94, - 0xab, 0x98, 0x52, 0x7f, 0x09, 0xda, 0x01, 0x13, 0xe4, 0x31, 0xa6, 0x38, 0xe5, 0x31, 0xf3, 0x5f, - 0x75, 0x19, 0x81, 0x76, 0x7b, 0x46, 0xdf, 0x72, 0x5b, 0x25, 0x39, 0x57, 0x9c, 0x2a, 0x24, 0xe0, - 0x39, 0x68, 0xaa, 0x7e, 0x71, 0xcc, 0x84, 0xa4, 0x09, 0x2e, 0xd2, 0x21, 0xb3, 0x67, 0xf4, 0xf7, - 0xdc, 0x86, 0x22, 0xa6, 0x0a, 0x9f, 0xf3, 0x4c, 0xc2, 0x33, 0xa0, 0x21, 0x1c, 0x49, 0x99, 0x6a, - 0xe5, 0x9e, 0x52, 0xd6, 0x14, 0xfc, 0x87, 0x94, 0xa9, 0xd2, 0x5d, 0x83, 0x86, 0xcf, 0x93, 0x84, - 0xfa, 0x12, 0x4b, 0xb6, 0xa6, 0x3c, 0x97, 0x68, 0xbf, 0x67, 0xf4, 0x2b, 0x97, 0x27, 0x8e, 0xde, - 0xa4, 0xb3, 0xd9, 0xa4, 0x73, 0x53, 0x6e, 0xd2, 0xad, 0x97, 0x11, 0x9e, 0x0e, 0x80, 0x3f, 0x82, - 0x1a, 0x4b, 0xc2, 0x8c, 0x0a, 0x81, 0xfd, 0x98, 0x08, 0x81, 0x0e, 0xd4, 0xd4, 0xd5, 0x12, 0x1c, - 0x15, 0x18, 0xfc, 0x19, 0x34, 0x36, 0xa2, 0x62, 0x37, 0xcc, 0xa7, 0xc8, 0x52, 0xb2, 0x7a, 0x09, - 0x2f, 0x34, 0x0a, 0xd7, 0xe0, 0xf8, 0x3d, 0x1b, 0x4f, 0x64, 0xc6, 0xe3, 0x98, 0x66, 0x78, 0xcd, - 0x03, 0x8a, 0x0e, 0x7b, 0x46, 0xbf, 0x7e, 0xf9, 0xab, 0xb3, 0xc5, 0x78, 0xe7, 0xc3, 0x39, 0xe7, - 0xae, 0xac, 0xfb, 0x1e, 0x3d, 0xe3, 0x01, 0x75, 0xdb, 0x6c, 0x1b, 0x0c, 0x1f, 0x40, 0x85, 0xe4, - 0x32, 0x2a, 0x5d, 0x40, 0x40, 0x95, 0x38, 0xff, 0xbf, 0x12, 0xc3, 0x5c, 0x46, 0xda, 0x9b, 0xeb, - 0x1d, 0x64, 0xb8, 0x80, 0xbc, 0x7f, 0xc3, 0x9f, 0x40, 0x9d, 0x26, 0xca, 0x58, 0x99, 0x11, 0x9f, - 0x25, 0x21, 0xaa, 0x2a, 0x4b, 0x6b, 0x1a, 0xf5, 0x34, 0x58, 0x18, 0x44, 0x7c, 0xbf, 0x98, 0x32, - 0xe6, 0x21, 0x5e, 0xb1, 0x98, 0xa2, 0x9a, 0xda, 0x47, 0x4d, 0xc3, 0x53, 0x1e, 0x8e, 0x59, 0x4c, - 0xe1, 0xef, 0xa0, 0x1e, 0xd0, 0x15, 0xc9, 0x63, 0x89, 0xf5, 0xf5, 0xa3, 0xba, 0xf2, 0xa7, 0xb7, - 0xb5, 0xc5, 0x79, 0x61, 0xae, 0xee, 0xd1, 0xad, 0x95, 0x71, 0xe5, 0x3d, 0xdf, 0x80, 0x1f, 0xca, - 0xbe, 0xfc, 0x98, 0xd1, 0x44, 0x62, 0xc1, 0x82, 0xaf, 0xc7, 0x87, 0x5a, 0xaa, 0xd1, 0xef, 0xb5, - 0x6c, 0xa4, 0x54, 0x0b, 0x16, 0x7c, 0x3e, 0x42, 0xd8, 0x03, 0x55, 0x11, 0x08, 0x9c, 0x07, 0x02, - 0xa7, 0x44, 0x46, 0xe8, 0x3b, 0xd5, 0x33, 0x10, 0x81, 0x58, 0x06, 0x62, 0x4e, 0x64, 0x54, 0xcc, - 0x1f, 0x92, 0x38, 0xa6, 0xaf, 0x98, 0x04, 0x41, 0xb1, 0x70, 0x74, 0xa4, 0xe7, 0xd2, 0xe8, 0x50, - 0x83, 0xf0, 0x0a, 0x1c, 0x95, 0xed, 0x14, 0xf9, 0x24, 0x7f, 0xa2, 0x09, 0x5e, 0xf3, 0x3c, 0x91, - 0xe8, 0x58, 0xbf, 0x00, 0xcd, 0x2e, 0x02, 0xe1, 0x15, 0xdc, 0xac, 0xa0, 0x8a, 0x17, 0xf0, 0x79, - 0x69, 0x3c, 0x5b, 0x13, 0x89, 0x90, 0x4a, 0xdf, 0xf8, 0x58, 0x9b, 0x82, 0x4f, 0x7f, 0x03, 0xed, - 0xad, 0x87, 0x00, 0x0f, 0xc0, 0xee, 0xc3, 0x78, 0x6c, 0x7f, 0x83, 0x15, 0x70, 0x70, 0x73, 0x3b, - 0x1e, 0x2e, 0xa7, 0x9e, 0x6d, 0x40, 0x00, 0xf6, 0x17, 0x9e, 0x7b, 0x37, 0xf2, 0xec, 0x9d, 0xd3, - 0x33, 0x00, 0x3e, 0x0c, 0x86, 0x16, 0x30, 0xef, 0x1f, 0xee, 0x6f, 0xed, 0x6f, 0xb0, 0x0e, 0xc0, - 0x6c, 0xe9, 0x2d, 0x87, 0x53, 0xec, 0x4d, 0x17, 0xb6, 0x31, 0x31, 0xad, 0x8a, 0x5d, 0x9d, 0x98, - 0x56, 0xc3, 0xb6, 0x27, 0xa6, 0x65, 0xdb, 0xcd, 0x89, 0x69, 0x35, 0x6d, 0x38, 0x31, 0x2d, 0x68, - 0xb7, 0x26, 0xa6, 0xd5, 0xb6, 0x8f, 0xae, 0xfb, 0x7f, 0xbd, 0x75, 0x8d, 0xbf, 0xdf, 0xba, 0xc6, - 0xbf, 0x6f, 0x5d, 0xe3, 0xcf, 0x8e, 0x36, 0x8d, 0xf1, 0x01, 0x49, 0xd9, 0xe0, 0xcb, 0xbf, 0xe8, - 0x71, 0x5f, 0xbd, 0xb4, 0xab, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xd9, 0xc9, 0xa0, 0x33, 0xf4, - 0x04, 0x00, 0x00, + // 886 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xd1, 0x4e, 0x1b, 0x47, + 0x14, 0x65, 0x89, 0x03, 0xe6, 0x82, 0xed, 0xf5, 0x10, 0x87, 0x89, 0x5b, 0x51, 0x8b, 0xaa, 0x89, + 0x15, 0x55, 0x6b, 0x85, 0xa8, 0x0f, 0xed, 0x9b, 0x31, 0x26, 0x75, 0x64, 0x6c, 0xb4, 0x5e, 0x52, + 0xd1, 0x97, 0xd1, 0xb2, 0x3b, 0xf6, 0x8e, 0xb2, 0xde, 0x71, 0x77, 0x66, 0xa3, 0xf0, 0x55, 0xfd, + 0x80, 0xfe, 0x40, 0x1f, 0xfb, 0x09, 0x15, 0x5f, 0x52, 0xed, 0x9d, 0xb5, 0x01, 0xc5, 0x12, 0x55, + 0x1e, 0x39, 0xe7, 0xdc, 0xb9, 0x7b, 0xcf, 0xb9, 0x17, 0x43, 0x73, 0xce, 0x55, 0xd4, 0xf9, 0xf4, + 0xc6, 0x8f, 0x17, 0x91, 0xff, 0xa6, 0x13, 0xc8, 0x64, 0x2a, 0x66, 0xce, 0x22, 0x95, 0x5a, 0x92, + 0x7d, 0xa1, 0xb4, 0x90, 0x4e, 0xae, 0x70, 0x96, 0x8a, 0xe6, 0xe1, 0x4c, 0xca, 0x59, 0xcc, 0x3b, + 0x28, 0xb9, 0xce, 0xa6, 0x9d, 0x30, 0x4b, 0x7d, 0x2d, 0x64, 0x62, 0x8a, 0x9a, 0x2f, 0x1e, 0x3e, + 0xb8, 0x48, 0xe5, 0xe7, 0x1b, 0x43, 0x1d, 0xfd, 0xb9, 0x07, 0x70, 0xce, 0x55, 0xd4, 0xc3, 0x26, + 0xe4, 0x47, 0x20, 0x73, 0xf1, 0x99, 0xa7, 0x2c, 0x88, 0x78, 0xf0, 0x91, 0x29, 0x9e, 0x7e, 0xe2, + 0x29, 0xb5, 0x5a, 0x56, 0x7b, 0xc7, 0xb5, 0x91, 0xe9, 0xe5, 0xc4, 0x04, 0x71, 0xe2, 0xc0, 0xbe, + 0x51, 0xa7, 0x7c, 0x21, 0x53, 0xbd, 0x94, 0x6f, 0xa2, 0xbc, 0x8e, 0x94, 0x8b, 0x4c, 0xa1, 0x3f, + 0x86, 0x46, 0x28, 0x94, 0x7f, 0x1d, 0x73, 0xb6, 0x90, 0xb1, 0x08, 0x6e, 0x4c, 0x1b, 0x45, 0x9f, + 0xb4, 0xac, 0x76, 0xd9, 0xdd, 0x2f, 0xc8, 0x0b, 0xe4, 0xb0, 0x91, 0x22, 0xaf, 0xa1, 0x8e, 0xdf, + 0xcb, 0x62, 0xa1, 0x34, 0x4f, 0x58, 0xfe, 0x1c, 0x2d, 0xb5, 0xac, 0xf6, 0x53, 0xb7, 0x86, 0xc4, + 0x10, 0xf1, 0x0b, 0x99, 0x6a, 0xf2, 0x12, 0x0c, 0xc4, 0x22, 0xad, 0x17, 0x46, 0xf9, 0x14, 0x95, + 0x15, 0x84, 0x7f, 0xd5, 0x7a, 0x81, 0xba, 0x13, 0xa8, 0x05, 0x32, 0x49, 0x78, 0xa0, 0x99, 0x16, + 0x73, 0x2e, 0x33, 0x4d, 0xb7, 0x5a, 0x56, 0x7b, 0xf7, 0xf8, 0x85, 0x63, 0x9c, 0x74, 0x96, 0x4e, + 0x3a, 0xa7, 0x85, 0x93, 0x6e, 0xb5, 0xa8, 0xf0, 0x4c, 0x01, 0xf9, 0x1e, 0x2a, 0x22, 0x99, 0xa5, + 0x5c, 0x29, 0x16, 0xc4, 0xbe, 0x52, 0x74, 0x1b, 0xa7, 0xde, 0x2b, 0xc0, 0x5e, 0x8e, 0x91, 0x57, + 0x50, 0x5b, 0x8a, 0x72, 0x6f, 0x44, 0xc0, 0x69, 0x19, 0x65, 0xd5, 0x02, 0x9e, 0x18, 0x94, 0xcc, + 0xe1, 0x60, 0xf5, 0x9a, 0x4c, 0x74, 0x2a, 0xe3, 0x98, 0xa7, 0x6c, 0x2e, 0x43, 0x4e, 0x77, 0x5a, + 0x56, 0xbb, 0x7a, 0xfc, 0x93, 0xb3, 0x26, 0x78, 0xe7, 0x2e, 0x39, 0x67, 0x50, 0xf4, 0x5d, 0x55, + 0x9f, 0xcb, 0x90, 0xbb, 0x0d, 0xb1, 0x0e, 0x26, 0x63, 0xd8, 0xf5, 0x33, 0x1d, 0x15, 0x29, 0x50, + 0xc0, 0x16, 0xaf, 0x1f, 0x6b, 0xd1, 0xcd, 0x74, 0x64, 0xb2, 0x39, 0xd9, 0xa4, 0x96, 0x0b, 0xfe, + 0xea, 0x6f, 0x32, 0x80, 0x7a, 0x1a, 0x2a, 0x96, 0xf2, 0x69, 0xca, 0x55, 0xc4, 0x42, 0x1e, 0xfb, + 0x37, 0x74, 0xf7, 0x11, 0x4f, 0xf1, 0x95, 0x5a, 0x1a, 0x2a, 0xd7, 0x94, 0x9d, 0xe6, 0x55, 0xe4, + 0x07, 0xa8, 0xf2, 0x04, 0x77, 0x44, 0xa7, 0x7e, 0x20, 0x92, 0x19, 0xdd, 0xc3, 0xed, 0xa8, 0x18, + 0xd4, 0x33, 0x60, 0x9e, 0xb5, 0x1f, 0x04, 0xb9, 0x61, 0xb1, 0x9c, 0xb1, 0xa9, 0x88, 0x39, 0xad, + 0xa0, 0xb5, 0x15, 0x03, 0x0f, 0xe5, 0xec, 0x4c, 0xc4, 0x9c, 0xbc, 0x83, 0x6a, 0xc8, 0xa7, 0x7e, + 0x16, 0x6b, 0x66, 0x0e, 0x89, 0x56, 0xf1, 0xb3, 0x5a, 0x6b, 0xa7, 0xbd, 0xc8, 0xf7, 0xc4, 0x8c, + 0xeb, 0x56, 0x8a, 0xba, 0xe2, 0x34, 0x5e, 0x41, 0xc5, 0x2c, 0xbb, 0x1f, 0x86, 0xb9, 0xa5, 0xd4, + 0xce, 0xdb, 0xe1, 0x0c, 0x7b, 0x48, 0x74, 0x0d, 0x4e, 0xfe, 0x80, 0x03, 0x99, 0xe9, 0x6b, 0x99, + 0x25, 0x61, 0x3e, 0xc2, 0x74, 0x2a, 0x82, 0xa5, 0xd1, 0x75, 0x6c, 0xfd, 0x68, 0x96, 0xe3, 0xa2, + 0xdc, 0x33, 0xd5, 0xf7, 0x3c, 0x6f, 0xc8, 0x75, 0x14, 0x39, 0x85, 0xef, 0x0a, 0xcf, 0x82, 0x58, + 0xf0, 0x44, 0x33, 0x25, 0xc2, 0x87, 0x37, 0x46, 0xf7, 0xd1, 0xc4, 0x6f, 0x8c, 0xac, 0x87, 0xaa, + 0x89, 0x08, 0xef, 0xdf, 0x1a, 0x69, 0xc1, 0x9e, 0x0a, 0x15, 0xcb, 0x42, 0xc5, 0x16, 0xbe, 0x8e, + 0xe8, 0x33, 0xf4, 0x13, 0x54, 0xa8, 0x2e, 0x43, 0x75, 0xe1, 0xeb, 0x28, 0x8f, 0x59, 0x7d, 0x11, + 0x73, 0xe3, 0x7f, 0xc5, 0xac, 0xbe, 0x8c, 0x79, 0xe6, 0xc7, 0x31, 0xbf, 0x59, 0xf9, 0xf9, 0xdc, + 0xc4, 0x67, 0xd0, 0xa5, 0x99, 0x6f, 0xe1, 0x79, 0x31, 0x59, 0xde, 0x58, 0xcb, 0x8f, 0x3c, 0x61, + 0x73, 0x99, 0x25, 0x9a, 0x1e, 0x98, 0xff, 0x19, 0x86, 0x9d, 0x84, 0xca, 0xcb, 0xb9, 0xf3, 0x9c, + 0x22, 0x0e, 0xd4, 0xef, 0xef, 0x86, 0x4c, 0xe7, 0xbe, 0xa6, 0x74, 0x15, 0x57, 0xed, 0x6e, 0x43, + 0x90, 0x6a, 0xfe, 0x65, 0x41, 0x63, 0xad, 0xe7, 0xc4, 0x85, 0x12, 0x1e, 0xa1, 0x85, 0x17, 0xf2, + 0xcb, 0x57, 0x05, 0xe7, 0xe4, 0x27, 0x87, 0x8d, 0xf1, 0xad, 0xa3, 0x11, 0x94, 0xf0, 0x08, 0x1b, + 0x50, 0x71, 0xfb, 0xef, 0x06, 0x13, 0xcf, 0xbd, 0x62, 0xe3, 0xd1, 0xf0, 0xca, 0xde, 0x68, 0x6e, + 0x96, 0x2d, 0x52, 0x87, 0x9d, 0xee, 0x70, 0x38, 0xfe, 0x8d, 0x75, 0x47, 0x57, 0xb6, 0x85, 0xd0, + 0xb7, 0xf0, 0xec, 0xc3, 0xc0, 0xf5, 0x2e, 0xbb, 0x43, 0x36, 0xe9, 0xbb, 0x1f, 0x06, 0xbd, 0xbe, + 0x29, 0xd8, 0xcc, 0xd9, 0xa3, 0x9f, 0xa1, 0xb1, 0xf6, 0xf8, 0xc9, 0x36, 0x3c, 0x19, 0x9f, 0x9d, + 0xd9, 0x1b, 0x64, 0x17, 0xb6, 0x4f, 0xfb, 0x67, 0xdd, 0xcb, 0xa1, 0x67, 0x5b, 0x04, 0x60, 0x6b, + 0xe2, 0xb9, 0x83, 0x9e, 0x67, 0x6f, 0x1e, 0xbd, 0x04, 0xb8, 0x3b, 0x6a, 0x52, 0x86, 0xd2, 0x68, + 0x3c, 0xea, 0xdb, 0x1b, 0xa4, 0x0a, 0x70, 0x7e, 0x89, 0xfd, 0xbc, 0xe1, 0xc4, 0xb6, 0xde, 0x97, + 0xca, 0x35, 0xdb, 0x7e, 0x5f, 0x2a, 0x13, 0x7b, 0xff, 0xa4, 0xfd, 0xf7, 0xed, 0xa1, 0xf5, 0xcf, + 0xed, 0xa1, 0xf5, 0xef, 0xed, 0xa1, 0xf5, 0x7b, 0xd3, 0x38, 0x22, 0x64, 0xc7, 0x5f, 0x88, 0xce, + 0x83, 0xdf, 0x99, 0xeb, 0x2d, 0x5c, 0x85, 0xb7, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x49, 0xde, + 0xf3, 0xf3, 0xd0, 0x06, 0x00, 0x00, } diff --git a/mesh/v1alpha1/config.proto b/mesh/v1alpha1/config.proto index f20e21dffa..3fc78ab46d 100644 --- a/mesh/v1alpha1/config.proto +++ b/mesh/v1alpha1/config.proto @@ -104,7 +104,9 @@ message MeshConfig { // $hide_from_docs AuthPolicy auth_policy = 10 [deprecated=true]; - reserved 11; + // $hide_from_docs + // DEPRECATED. UNUSED. Polling interval for RDS (MUST BE >=1ms) + google.protobuf.Duration rds_refresh_delay = 11 [deprecated=true]; // Flag to control generation of trace spans and request IDs. // Requires a trace span collector defined in the proxy configuration. @@ -113,10 +115,11 @@ message MeshConfig { // File address for the proxy access log (e.g. /dev/stdout). // Empty value disables access logging. string access_log_file = 13; - + + // DEPRECATED. // Format for the proxy access log (text or json). // Default value is text. - string access_log_format = 24; + string access_log_format = 24 [deprecated=true]; // Default proxy config used by the proxy injection mechanism operating in the mesh // (e.g. Kubernetes admission controller) @@ -126,8 +129,46 @@ message MeshConfig { ProxyConfig default_config = 14; reserved 15; - reserved 16; - reserved 17; + + // $hide_from_docs + // DEPRECATED. UNUSED. Mixer address. This option will be removed soon. Please + // use mixer_check and mixer_report. + string mixer_address = 16 [deprecated=true]; + + + // $hide_from_docs + // DEPRECATED. UNUSED. + message OutboundTrafficPolicy { + // $hide_from_docs + // DEPRECATED. UNUSED. + enum Mode { + // $hide_from_docs + // outbound traffic will be restricted to services defined in the service registry as well as those defined + // through ServiceEntries + REGISTRY_ONLY = 0 [deprecated=true]; + // $hide_from_docs + // outbound traffic to unknown destinations will be allowed + ALLOW_ANY = 1 [deprecated=true]; + // $hide_from_docs + // not implemented. outbound traffic will be restricted to destinations defined in VirtualServices only + VIRTUAL_SERVICE_ONLY = 2 [deprecated=true]; + } + + // $hide_from_docs + // DEPRECATED. UNUSED. + Mode mode = 1 [deprecated=true]; + } + + // $hide_from_docs + // DEPRECATED. UNUSED. + // Set the default behavior of the sidecar for handling outbound traffic from the application. + // While the default mode should work out of the box, if your application uses one or more external services that + // are not known apriori, setting the policy to ALLOW_ANY will cause the sidecars to route traffic to the any + // requested destination. + // Users are strongly encouraged to use ServiceEntries to explicitly declare any external dependencies, + // instead of using allow_any. + OutboundTrafficPolicy outbound_traffic_policy = 17 [deprecated=true]; + reserved 18; // Enables clide side policy checks. @@ -136,8 +177,11 @@ message MeshConfig { // Unix Domain Socket through which envoy communicates with NodeAgent SDS to get key/cert for mTLS. // Use secret-mount files instead of SDS if set to empty. string sds_uds_path = 20; - - reserved 21; + + // $hide_from_docs + // DEPRECATED. UNUSED. + // Polling interval for SDS (MUST BE >=1ms) + google.protobuf.Duration sds_refresh_delay = 21 [deprecated=true]; // Address of the galley service exposing the Mesh Control Protocol (MCP). string galley_address = 22; diff --git a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html index 392830e414..8495af8802 100644 --- a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html +++ b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html @@ -169,11 +169,12 @@

MeshConfig

- + accessLogFormat string -

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

DEPRECATED. +Format for the proxy access log (text or json). Default value is text.

diff --git a/mesh/v1alpha1/proxy.pb.go b/mesh/v1alpha1/proxy.pb.go index c1b07a0ddd..0f163e5fcd 100644 --- a/mesh/v1alpha1/proxy.pb.go +++ b/mesh/v1alpha1/proxy.pb.go @@ -298,6 +298,10 @@ type ProxyConfig struct { ParentShutdownDuration *google_protobuf.Duration `protobuf:"bytes,5,opt,name=parent_shutdown_duration,json=parentShutdownDuration" json:"parent_shutdown_duration,omitempty"` // Address of the discovery service exposing xDS with mTLS connection. DiscoveryAddress string `protobuf:"bytes,6,opt,name=discovery_address,json=discoveryAddress,proto3" json:"discovery_address,omitempty"` + // $hide_from_docs + // DEPRECATED. UNUSED. + // Polling interval for service discovery (used by EDS, CDS, LDS, but not RDS). (MUST BE >=1ms) + DiscoveryRefreshDelay *google_protobuf.Duration `protobuf:"bytes,7,opt,name=discovery_refresh_delay,json=discoveryRefreshDelay" json:"discovery_refresh_delay,omitempty"` // Address of the Zipkin service (e.g. _zipkin:9411_). // DEPRECATED: Use [tracing][istio.mesh.v1alpha1.ProxyConfig.tracing] instead. ZipkinAddress string `protobuf:"bytes,8,opt,name=zipkin_address,json=zipkinAddress,proto3" json:"zipkin_address,omitempty"` @@ -307,6 +311,12 @@ type ProxyConfig struct { StatsdUdpAddress string `protobuf:"bytes,10,opt,name=statsd_udp_address,json=statsdUdpAddress,proto3" json:"statsd_udp_address,omitempty"` // Port on which Envoy should listen for administrative commands. ProxyAdminPort int32 `protobuf:"varint,11,opt,name=proxy_admin_port,json=proxyAdminPort,proto3" json:"proxy_admin_port,omitempty"` + // $hide_from_docs + // DEPRECATED. UNUSED. + // The availability zone where this Envoy instance is running. When running + // Envoy as a sidecar in Kubernetes, this flag must be one of the availability + // zones assigned to a node using failure-domain.beta.kubernetes.io/zone annotation. + AvailabilityZone string `protobuf:"bytes,12,opt,name=availability_zone,json=availabilityZone,proto3" json:"availability_zone,omitempty"` // Authentication policy defines the global switch to control authentication // for Envoy-to-Envoy communication for istio components Mixer and Pilot. ControlPlaneAuthPolicy AuthenticationPolicy `protobuf:"varint,13,opt,name=control_plane_auth_policy,json=controlPlaneAuthPolicy,proto3,enum=istio.mesh.v1alpha1.AuthenticationPolicy" json:"control_plane_auth_policy,omitempty"` @@ -376,6 +386,13 @@ func (m *ProxyConfig) GetDiscoveryAddress() string { return "" } +func (m *ProxyConfig) GetDiscoveryRefreshDelay() *google_protobuf.Duration { + if m != nil { + return m.DiscoveryRefreshDelay + } + return nil +} + func (m *ProxyConfig) GetZipkinAddress() string { if m != nil { return m.ZipkinAddress @@ -404,6 +421,13 @@ func (m *ProxyConfig) GetProxyAdminPort() int32 { return 0 } +func (m *ProxyConfig) GetAvailabilityZone() string { + if m != nil { + return m.AvailabilityZone + } + return "" +} + func (m *ProxyConfig) GetControlPlaneAuthPolicy() AuthenticationPolicy { if m != nil { return m.ControlPlaneAuthPolicy @@ -643,6 +667,16 @@ func (m *ProxyConfig) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintProxy(dAtA, i, uint64(len(m.DiscoveryAddress))) i += copy(dAtA[i:], m.DiscoveryAddress) } + if m.DiscoveryRefreshDelay != nil { + dAtA[i] = 0x3a + i++ + i = encodeVarintProxy(dAtA, i, uint64(m.DiscoveryRefreshDelay.Size())) + n6, err := m.DiscoveryRefreshDelay.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n6 + } if len(m.ZipkinAddress) > 0 { dAtA[i] = 0x42 i++ @@ -653,11 +687,11 @@ func (m *ProxyConfig) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x4a i++ i = encodeVarintProxy(dAtA, i, uint64(m.ConnectTimeout.Size())) - n6, err := m.ConnectTimeout.MarshalTo(dAtA[i:]) + n7, err := m.ConnectTimeout.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n6 + i += n7 } if len(m.StatsdUdpAddress) > 0 { dAtA[i] = 0x52 @@ -670,6 +704,12 @@ func (m *ProxyConfig) MarshalTo(dAtA []byte) (int, error) { i++ i = encodeVarintProxy(dAtA, i, uint64(m.ProxyAdminPort)) } + if len(m.AvailabilityZone) > 0 { + dAtA[i] = 0x62 + i++ + i = encodeVarintProxy(dAtA, i, uint64(len(m.AvailabilityZone))) + i += copy(dAtA[i:], m.AvailabilityZone) + } if m.ControlPlaneAuthPolicy != 0 { dAtA[i] = 0x68 i++ @@ -714,11 +754,11 @@ func (m *ProxyConfig) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x1 i++ i = encodeVarintProxy(dAtA, i, uint64(m.Tracing.Size())) - n7, err := m.Tracing.MarshalTo(dAtA[i:]) + n8, err := m.Tracing.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n7 + i += n8 } return i, nil } @@ -817,6 +857,10 @@ func (m *ProxyConfig) Size() (n int) { if l > 0 { n += 1 + l + sovProxy(uint64(l)) } + if m.DiscoveryRefreshDelay != nil { + l = m.DiscoveryRefreshDelay.Size() + n += 1 + l + sovProxy(uint64(l)) + } l = len(m.ZipkinAddress) if l > 0 { n += 1 + l + sovProxy(uint64(l)) @@ -832,6 +876,10 @@ func (m *ProxyConfig) Size() (n int) { if m.ProxyAdminPort != 0 { n += 1 + sovProxy(uint64(m.ProxyAdminPort)) } + l = len(m.AvailabilityZone) + if l > 0 { + n += 1 + l + sovProxy(uint64(l)) + } if m.ControlPlaneAuthPolicy != 0 { n += 1 + sovProxy(uint64(m.ControlPlaneAuthPolicy)) } @@ -1433,6 +1481,39 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { } m.DiscoveryAddress = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DiscoveryRefreshDelay", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowProxy + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthProxy + } + postIndex := iNdEx + msglen + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.DiscoveryRefreshDelay == nil { + m.DiscoveryRefreshDelay = &google_protobuf.Duration{} + } + if err := m.DiscoveryRefreshDelay.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex case 8: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ZipkinAddress", wireType) @@ -1543,6 +1624,35 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { break } } + case 12: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AvailabilityZone", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowProxy + } + 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 ErrInvalidLengthProxy + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.AvailabilityZone = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex case 13: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field ControlPlaneAuthPolicy", wireType) @@ -1839,57 +1949,59 @@ var ( func init() { proto.RegisterFile("mesh/v1alpha1/proxy.proto", fileDescriptorProxy) } var fileDescriptorProxy = []byte{ - // 819 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x94, 0x41, 0x6f, 0xe3, 0x44, - 0x14, 0xc7, 0xeb, 0xd2, 0x4d, 0x9c, 0x97, 0x36, 0x75, 0x67, 0x51, 0x71, 0x23, 0x28, 0xa1, 0x48, - 0x90, 0x05, 0xe4, 0x68, 0xbb, 0x12, 0xe2, 0x02, 0x22, 0xe9, 0x76, 0xd5, 0xac, 0xba, 0xdd, 0xc8, - 0x75, 0x25, 0xd8, 0xcb, 0x68, 0x32, 0x9e, 0xc6, 0xa3, 0x75, 0x66, 0xac, 0x99, 0x71, 0x21, 0xdc, - 0xb8, 0xf0, 0xc1, 0x38, 0x71, 0xe4, 0x23, 0xa0, 0x9e, 0xf8, 0x18, 0xc8, 0x33, 0x76, 0x28, 0xa8, - 0xbb, 0x7b, 0xf3, 0xfc, 0xe7, 0xf7, 0x7f, 0xfe, 0xdb, 0xef, 0xcd, 0xc0, 0xc1, 0x92, 0xe9, 0x6c, - 0x74, 0xf3, 0x98, 0xe4, 0x45, 0x46, 0x1e, 0x8f, 0x0a, 0x25, 0x7f, 0x5e, 0x45, 0x85, 0x92, 0x46, - 0xa2, 0x87, 0x5c, 0x1b, 0x2e, 0xa3, 0x0a, 0x88, 0x1a, 0xa0, 0x7f, 0xb8, 0x90, 0x72, 0x91, 0xb3, - 0x91, 0x45, 0xe6, 0xe5, 0xf5, 0x28, 0x2d, 0x15, 0x31, 0x5c, 0x0a, 0x67, 0x3a, 0xfa, 0x7d, 0x13, - 0xda, 0x89, 0x22, 0x94, 0x8b, 0x05, 0xfa, 0x16, 0x5a, 0xbf, 0xf0, 0xe2, 0x35, 0x17, 0xa1, 0x37, - 0xf0, 0x86, 0xdd, 0xe3, 0x4f, 0xa3, 0x7b, 0x2a, 0x46, 0x35, 0x1d, 0xbd, 0xb2, 0xe8, 0xd9, 0x46, - 0x5c, 0x9b, 0xd0, 0x33, 0xe8, 0xe4, 0x7c, 0x91, 0x19, 0x6d, 0x58, 0x11, 0x6e, 0xda, 0x0a, 0x9f, - 0xbd, 0xb5, 0xc2, 0x79, 0x43, 0x9f, 0x6d, 0xc4, 0xff, 0x5a, 0xfb, 0x47, 0xd0, 0x72, 0xb5, 0x51, - 0x08, 0x6d, 0x92, 0xa6, 0x8a, 0x69, 0x6d, 0x13, 0x75, 0xe2, 0x66, 0xd9, 0xff, 0xd5, 0x83, 0xce, - 0xda, 0xfe, 0x66, 0x0e, 0x7d, 0x02, 0xdb, 0x84, 0x52, 0xa6, 0x35, 0x36, 0xf2, 0x35, 0x13, 0x36, - 0x56, 0x27, 0xee, 0x3a, 0x2d, 0xa9, 0x24, 0xb4, 0x0f, 0x2d, 0xcd, 0x68, 0xa9, 0x58, 0xf8, 0xde, - 0xc0, 0x1b, 0xfa, 0x71, 0xbd, 0x42, 0x1f, 0x43, 0x97, 0x12, 0xca, 0x94, 0xc1, 0x05, 0x31, 0x59, - 0xb8, 0x65, 0x9d, 0xe0, 0xa4, 0x19, 0x31, 0xd9, 0xc4, 0x87, 0x96, 0x51, 0xd5, 0xf2, 0xe8, 0x37, - 0x1f, 0xba, 0xb3, 0xaa, 0x13, 0x27, 0x52, 0x5c, 0xf3, 0x85, 0xb5, 0xda, 0x27, 0x67, 0xf5, 0x6a, - 0xab, 0x95, 0x2a, 0x6b, 0x05, 0xcc, 0xb9, 0x20, 0x6a, 0xe5, 0x00, 0x97, 0x0a, 0x9c, 0x64, 0x81, - 0xcf, 0x61, 0x57, 0x33, 0x75, 0xc3, 0x29, 0xc3, 0x34, 0x2f, 0xb5, 0x61, 0xca, 0xa6, 0xeb, 0xc4, - 0xbd, 0x5a, 0x3e, 0x71, 0x2a, 0xfa, 0x1e, 0x7a, 0xa9, 0x22, 0x5c, 0xe0, 0xa6, 0xaf, 0x36, 0x68, - 0xf7, 0xf8, 0x20, 0x72, 0x8d, 0x8f, 0x9a, 0xc6, 0x47, 0x4f, 0x6b, 0x20, 0xde, 0xb1, 0x86, 0x66, - 0x89, 0x2e, 0x21, 0x2c, 0x88, 0x62, 0xc2, 0x60, 0x9d, 0x95, 0x26, 0x95, 0x3f, 0xdd, 0xa9, 0xf5, - 0xe0, 0x5d, 0xb5, 0xf6, 0x9d, 0xf5, 0xb2, 0x76, 0xae, 0x8b, 0x7e, 0x09, 0x7b, 0x29, 0xd7, 0x54, - 0xde, 0x30, 0xb5, 0xc2, 0x4d, 0x6f, 0x5a, 0xf6, 0x0b, 0x82, 0xf5, 0xc6, 0xb8, 0x6e, 0xd2, 0x23, - 0xe8, 0xb9, 0x11, 0x5a, 0x93, 0x7e, 0x45, 0x4e, 0x36, 0x43, 0x2f, 0xde, 0x71, 0x3b, 0x0d, 0x3a, - 0x81, 0x5d, 0x2a, 0x85, 0x60, 0xd4, 0x60, 0xc3, 0x97, 0x4c, 0x96, 0x26, 0xec, 0xbc, 0x2b, 0x63, - 0xaf, 0x76, 0x24, 0xce, 0x80, 0xbe, 0x02, 0xa4, 0x0d, 0x31, 0x3a, 0xc5, 0x65, 0x5a, 0xac, 0x5f, - 0x09, 0x2e, 0x9c, 0xdb, 0xb9, 0x4a, 0x8b, 0xe6, 0x8d, 0x43, 0x08, 0xec, 0x21, 0xc3, 0x24, 0x5d, - 0x72, 0x81, 0x0b, 0xa9, 0x4c, 0xd8, 0x1d, 0x78, 0xc3, 0x07, 0x71, 0xcf, 0xea, 0xe3, 0x4a, 0x9e, - 0x49, 0x65, 0x50, 0x0a, 0x07, 0x54, 0x0a, 0xa3, 0x64, 0x8e, 0x8b, 0x9c, 0x08, 0x86, 0x49, 0x69, - 0x32, 0x5c, 0xc8, 0x9c, 0xd3, 0x55, 0xb8, 0x33, 0xf0, 0x86, 0xbd, 0xe3, 0x47, 0xf7, 0x9e, 0x87, - 0x71, 0x69, 0x32, 0x26, 0x0c, 0xa7, 0x36, 0xef, 0xcc, 0x1a, 0xe2, 0xfd, 0xba, 0xd6, 0xac, 0x2a, - 0x55, 0x11, 0x4e, 0xaf, 0xd2, 0xd3, 0x52, 0x1b, 0xb9, 0xc4, 0xf5, 0x88, 0x5d, 0xf3, 0x9c, 0x85, - 0x3d, 0x97, 0xde, 0xed, 0xb8, 0x29, 0x7c, 0xc6, 0x73, 0x56, 0xa5, 0xaf, 0xbe, 0x08, 0x0b, 0xb2, - 0x64, 0x38, 0x67, 0x62, 0x61, 0xb2, 0x70, 0xd7, 0xa5, 0xaf, 0xf4, 0x0b, 0xb2, 0x64, 0xe7, 0x56, - 0x45, 0x03, 0x3b, 0xb3, 0xb4, 0x54, 0x8a, 0x09, 0xba, 0x0a, 0x03, 0x0b, 0xdd, 0x95, 0xd0, 0x18, - 0x3e, 0x72, 0x7f, 0x62, 0x2e, 0xa5, 0xd1, 0x46, 0x91, 0x02, 0x1b, 0xb6, 0x2c, 0x72, 0x62, 0x98, - 0x1b, 0xe3, 0x3d, 0x1b, 0xa2, 0x6f, 0xa1, 0x49, 0xc3, 0x24, 0x35, 0x62, 0xc7, 0x9a, 0xc1, 0x1e, - 0x17, 0x86, 0x29, 0xca, 0x8a, 0xea, 0x53, 0xf1, 0x52, 0xa6, 0x2c, 0x44, 0xf6, 0xd7, 0x7c, 0x73, - 0xef, 0xaf, 0xb9, 0x73, 0xaa, 0xa2, 0xa9, 0x98, 0xcb, 0x52, 0xa4, 0xd3, 0x3b, 0x05, 0x5e, 0xc8, - 0x94, 0xc5, 0x01, 0xff, 0x9f, 0x82, 0xbe, 0x86, 0xb6, 0x71, 0x77, 0x4c, 0xf8, 0xd0, 0x4e, 0xc7, - 0x87, 0x6f, 0xbb, 0x87, 0xe2, 0x06, 0x3e, 0x7a, 0x02, 0x1f, 0xbc, 0xe1, 0x25, 0x68, 0x1b, 0xfc, - 0xf8, 0xf4, 0xe9, 0x34, 0x3e, 0x3d, 0x49, 0x82, 0x0d, 0x04, 0xd0, 0x4a, 0x66, 0xf1, 0xcb, 0x1f, - 0x7e, 0x0c, 0xbc, 0xe7, 0x5b, 0x7e, 0x3b, 0xf0, 0x9f, 0x6f, 0xf9, 0xdb, 0xc1, 0xce, 0x17, 0xdf, - 0xc1, 0xfb, 0xf7, 0x35, 0x13, 0xf9, 0xb0, 0x75, 0xf1, 0xf2, 0xe2, 0x34, 0xd8, 0x40, 0x3d, 0x80, - 0x17, 0x57, 0xc9, 0xd5, 0xf8, 0x1c, 0x27, 0xe7, 0x97, 0x81, 0x87, 0xb6, 0xa1, 0x3d, 0xbd, 0x38, - 0x3b, 0x8d, 0xa7, 0x49, 0xf0, 0x77, 0x7b, 0x32, 0xfc, 0xe3, 0xf6, 0xd0, 0xfb, 0xf3, 0xf6, 0xd0, - 0xfb, 0xeb, 0xf6, 0xd0, 0x7b, 0xd5, 0x77, 0xa1, 0xb9, 0x1c, 0x91, 0x82, 0x8f, 0xfe, 0x73, 0xf1, - 0xcf, 0x5b, 0x76, 0xce, 0x9f, 0xfc, 0x13, 0x00, 0x00, 0xff, 0xff, 0x81, 0x53, 0x42, 0xee, 0x10, - 0x06, 0x00, 0x00, + // 862 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x55, 0x5d, 0x6f, 0xe3, 0x44, + 0x14, 0xad, 0x97, 0xdd, 0x7c, 0xdc, 0xb4, 0xa9, 0x3b, 0x0b, 0x5d, 0x37, 0x82, 0x12, 0x8a, 0x04, + 0x59, 0x40, 0x8e, 0xb6, 0x2b, 0x21, 0x5e, 0x40, 0x24, 0x6d, 0x57, 0x8d, 0xd4, 0xed, 0x46, 0xae, + 0x2b, 0x41, 0x5f, 0x46, 0x13, 0xfb, 0x36, 0x1e, 0xad, 0x33, 0x63, 0x8d, 0xc7, 0x85, 0xec, 0x1b, + 0xfc, 0x34, 0x9e, 0x78, 0xe4, 0x27, 0xa0, 0x3e, 0xf1, 0x33, 0x90, 0x67, 0xec, 0x6c, 0x40, 0xdd, + 0xed, 0x5b, 0xe6, 0xcc, 0x39, 0x77, 0xce, 0x99, 0x3b, 0xd7, 0x81, 0xbd, 0x05, 0xe6, 0xc9, 0xf0, + 0xe6, 0x19, 0x4b, 0xb3, 0x84, 0x3d, 0x1b, 0x66, 0x4a, 0xfe, 0xba, 0xf4, 0x33, 0x25, 0xb5, 0x24, + 0x8f, 0x79, 0xae, 0xb9, 0xf4, 0x4b, 0x82, 0x5f, 0x13, 0x7a, 0xfb, 0x73, 0x29, 0xe7, 0x29, 0x0e, + 0x0d, 0x65, 0x56, 0x5c, 0x0f, 0xe3, 0x42, 0x31, 0xcd, 0xa5, 0xb0, 0xa2, 0x83, 0x3f, 0x1e, 0x40, + 0x33, 0x54, 0x2c, 0xe2, 0x62, 0x4e, 0xbe, 0x87, 0xc6, 0x1b, 0x9e, 0xbd, 0xe6, 0xc2, 0x73, 0xfa, + 0xce, 0xa0, 0x73, 0xf8, 0xb9, 0x7f, 0x47, 0x45, 0xbf, 0x62, 0xfb, 0x57, 0x86, 0x7a, 0xba, 0x11, + 0x54, 0x22, 0xf2, 0x02, 0xda, 0x29, 0x9f, 0x27, 0x3a, 0xd7, 0x98, 0x79, 0x0f, 0x4c, 0x85, 0x2f, + 0xde, 0x5b, 0xe1, 0xac, 0x66, 0x9f, 0x6e, 0x04, 0x6f, 0xa5, 0xbd, 0x03, 0x68, 0xd8, 0xda, 0xc4, + 0x83, 0x26, 0x8b, 0x63, 0x85, 0x79, 0x6e, 0x1c, 0xb5, 0x83, 0x7a, 0xd9, 0xfb, 0xcd, 0x81, 0xf6, + 0x4a, 0xfe, 0x6e, 0x1e, 0xf9, 0x0c, 0x36, 0x59, 0x14, 0x61, 0x9e, 0x53, 0x2d, 0x5f, 0xa3, 0x30, + 0xb6, 0xda, 0x41, 0xc7, 0x62, 0x61, 0x09, 0x91, 0x5d, 0x68, 0xe4, 0x18, 0x15, 0x0a, 0xbd, 0x0f, + 0xfa, 0xce, 0xa0, 0x15, 0x54, 0x2b, 0xf2, 0x29, 0x74, 0x22, 0x16, 0xa1, 0xd2, 0x34, 0x63, 0x3a, + 0xf1, 0x1e, 0x1a, 0x25, 0x58, 0x68, 0xca, 0x74, 0x32, 0x6e, 0x41, 0x43, 0xab, 0x72, 0x79, 0xf0, + 0x7b, 0x1b, 0x3a, 0xd3, 0xb2, 0x13, 0x47, 0x52, 0x5c, 0xf3, 0xb9, 0x91, 0x9a, 0x5f, 0x56, 0xea, + 0x54, 0x52, 0x03, 0x95, 0xd2, 0x92, 0x30, 0xe3, 0x82, 0xa9, 0xa5, 0x25, 0x58, 0x57, 0x60, 0x21, + 0x43, 0xf8, 0x12, 0xb6, 0x73, 0x54, 0x37, 0x3c, 0x42, 0x1a, 0xa5, 0x45, 0xae, 0x51, 0x19, 0x77, + 0xed, 0xa0, 0x5b, 0xc1, 0x47, 0x16, 0x25, 0x3f, 0x42, 0x37, 0x56, 0x8c, 0x0b, 0x5a, 0xf7, 0xd5, + 0x18, 0xed, 0x1c, 0xee, 0xf9, 0xb6, 0xf1, 0x7e, 0xdd, 0x78, 0xff, 0xb8, 0x22, 0x04, 0x5b, 0x46, + 0x50, 0x2f, 0xc9, 0x05, 0x78, 0x19, 0x53, 0x28, 0x34, 0xcd, 0x93, 0x42, 0xc7, 0xf2, 0x97, 0xb5, + 0x5a, 0x8f, 0xee, 0xab, 0xb5, 0x6b, 0xa5, 0x17, 0x95, 0x72, 0x55, 0xf4, 0x6b, 0xd8, 0x89, 0x79, + 0x1e, 0xc9, 0x1b, 0x54, 0x4b, 0x5a, 0xf7, 0xa6, 0x61, 0x12, 0xb8, 0xab, 0x8d, 0x51, 0xd5, 0xa4, + 0x4b, 0x78, 0xf2, 0x96, 0xac, 0xf0, 0x5a, 0x61, 0x9e, 0xd0, 0x18, 0x53, 0xb6, 0xf4, 0x9a, 0xf7, + 0x18, 0x18, 0x3f, 0xf0, 0x9c, 0xe0, 0xa3, 0x95, 0x3a, 0xb0, 0xe2, 0xe3, 0x52, 0x4b, 0x9e, 0x42, + 0xd7, 0xbe, 0xcc, 0x95, 0x81, 0x56, 0x69, 0xc0, 0x48, 0xb6, 0xec, 0x4e, 0xed, 0x60, 0x0c, 0xdb, + 0x91, 0x14, 0x02, 0x23, 0x4d, 0x35, 0x5f, 0xa0, 0x2c, 0xb4, 0xd7, 0xbe, 0x2f, 0x7a, 0xb7, 0x52, + 0x84, 0x56, 0x40, 0xbe, 0x01, 0x92, 0x6b, 0xa6, 0xf3, 0x98, 0x16, 0x71, 0xb6, 0x3a, 0x12, 0x6c, + 0x66, 0xbb, 0x73, 0x19, 0x67, 0xf5, 0x89, 0x03, 0x70, 0xcd, 0xec, 0x52, 0x16, 0x2f, 0xb8, 0xa0, + 0x99, 0x54, 0xda, 0xeb, 0xf4, 0x9d, 0xc1, 0xa3, 0xa0, 0x6b, 0xf0, 0x51, 0x09, 0x4f, 0xa5, 0xd2, + 0x64, 0x08, 0x3b, 0xec, 0x86, 0xf1, 0x94, 0xcd, 0x78, 0xca, 0xf5, 0x92, 0xbe, 0x91, 0x02, 0xbd, + 0xcd, 0x55, 0x12, 0x77, 0x7d, 0xf3, 0x4a, 0x0a, 0x24, 0x31, 0xec, 0x45, 0x52, 0x68, 0x25, 0x53, + 0x9a, 0xa5, 0x4c, 0x20, 0x65, 0x85, 0x4e, 0x68, 0x26, 0x53, 0x1e, 0x2d, 0xbd, 0xad, 0xbe, 0x33, + 0xe8, 0x1e, 0x3e, 0xbd, 0x73, 0x2e, 0x47, 0x85, 0x4e, 0x50, 0x68, 0x1e, 0x99, 0x80, 0x53, 0x23, + 0x08, 0x76, 0xab, 0x5a, 0xd3, 0xb2, 0x54, 0xc9, 0xb0, 0x78, 0x19, 0x37, 0x2a, 0x72, 0x2d, 0x17, + 0xb4, 0x7a, 0xea, 0xd7, 0x3c, 0x45, 0xaf, 0x6b, 0xe3, 0xda, 0x1d, 0x3b, 0x0d, 0x2f, 0x78, 0x8a, + 0x65, 0xdc, 0xf2, 0x0a, 0xa8, 0x60, 0x0b, 0xa4, 0x29, 0x8a, 0xb9, 0x4e, 0xbc, 0x6d, 0x1b, 0xb7, + 0xc4, 0xcf, 0xd9, 0x02, 0xcf, 0x0c, 0x4a, 0xfa, 0x66, 0x76, 0xa2, 0x42, 0x29, 0x14, 0xd1, 0xd2, + 0x73, 0x0d, 0x69, 0x1d, 0x22, 0x23, 0xf8, 0xc4, 0x5e, 0xdd, 0x4c, 0x4a, 0x9d, 0x6b, 0xc5, 0x32, + 0xaa, 0x71, 0x91, 0xa5, 0x4c, 0xa3, 0x1d, 0xa7, 0x1d, 0x63, 0xa2, 0x67, 0x48, 0xe3, 0x9a, 0x13, + 0x56, 0x14, 0x33, 0x5e, 0x08, 0x3b, 0x5c, 0x68, 0x54, 0x11, 0x66, 0x65, 0x54, 0xba, 0x90, 0x31, + 0x7a, 0xc4, 0x5c, 0xcd, 0x77, 0x77, 0x5e, 0xcd, 0xda, 0x74, 0xfb, 0x13, 0x31, 0x93, 0x85, 0x88, + 0x27, 0x6b, 0x05, 0x5e, 0xca, 0x18, 0x03, 0x97, 0xff, 0x0f, 0x21, 0xdf, 0x42, 0x53, 0xdb, 0x6f, + 0x9d, 0xf7, 0xd8, 0x3c, 0xa7, 0x8f, 0xdf, 0xf7, 0x3d, 0x0c, 0x6a, 0xf2, 0xc1, 0x73, 0x78, 0xf2, + 0x8e, 0x43, 0xc8, 0x26, 0xb4, 0x82, 0x93, 0xe3, 0x49, 0x70, 0x72, 0x14, 0xba, 0x1b, 0x04, 0xa0, + 0x11, 0x4e, 0x83, 0x57, 0x3f, 0xfd, 0xec, 0x3a, 0x5f, 0xfd, 0x00, 0x1f, 0xde, 0xd5, 0x40, 0xd2, + 0x82, 0x87, 0xe7, 0xaf, 0xce, 0x4f, 0xdc, 0x0d, 0xd2, 0x05, 0x78, 0x79, 0x19, 0x5e, 0x8e, 0xce, + 0x68, 0x78, 0x76, 0xe1, 0x3a, 0x64, 0x13, 0x9a, 0x93, 0xf3, 0xd3, 0x93, 0x60, 0x12, 0xba, 0xff, + 0x34, 0xc7, 0x83, 0x3f, 0x6f, 0xf7, 0x9d, 0xbf, 0x6e, 0xf7, 0x9d, 0xbf, 0x6f, 0xf7, 0x9d, 0xab, + 0x9e, 0x35, 0xca, 0xe5, 0x90, 0x65, 0x7c, 0xf8, 0x9f, 0x3f, 0x9d, 0x59, 0xc3, 0x0c, 0xc3, 0xf3, + 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x65, 0xf7, 0xfe, 0xe0, 0x8c, 0x06, 0x00, 0x00, } diff --git a/mesh/v1alpha1/proxy.proto b/mesh/v1alpha1/proxy.proto index 0f78df160b..6a917da16d 100644 --- a/mesh/v1alpha1/proxy.proto +++ b/mesh/v1alpha1/proxy.proto @@ -106,7 +106,10 @@ message ProxyConfig { // Address of the discovery service exposing xDS with mTLS connection. string discovery_address = 6; - reserved 7; + // $hide_from_docs + // DEPRECATED. UNUSED. + // Polling interval for service discovery (used by EDS, CDS, LDS, but not RDS). (MUST BE >=1ms) + google.protobuf.Duration discovery_refresh_delay = 7 [deprecated=true]; // Address of the Zipkin service (e.g. _zipkin:9411_). // DEPRECATED: Use [tracing][istio.mesh.v1alpha1.ProxyConfig.tracing] instead. @@ -120,8 +123,13 @@ message ProxyConfig { // Port on which Envoy should listen for administrative commands. int32 proxy_admin_port = 11; - - reserved 12; + + // $hide_from_docs + // DEPRECATED. UNUSED. + // The availability zone where this Envoy instance is running. When running + // Envoy as a sidecar in Kubernetes, this flag must be one of the availability + // zones assigned to a node using failure-domain.beta.kubernetes.io/zone annotation. + string availability_zone = 12 [deprecated=true]; // Authentication policy defines the global switch to control authentication // for Envoy-to-Envoy communication for istio components Mixer and Pilot. diff --git a/python/istio_api/mesh/v1alpha1/config_pb2.py b/python/istio_api/mesh/v1alpha1/config_pb2.py index 31f46e3adb..b686c0536a 100644 --- a/python/istio_api/mesh/v1alpha1/config_pb2.py +++ b/python/istio_api/mesh/v1alpha1/config_pb2.py @@ -21,12 +21,38 @@ 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\"\x9d\x06\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\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\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\'\n\x1f\x65nable_client_side_policy_check\x18\x13 \x01(\x08\x12\x14\n\x0csds_uds_path\x18\x14 \x01(\t\x12\x16\n\x0egalley_address\x18\x16 \x01(\t\x12\x1e\n\x16\x65nable_sds_token_mount\x18\x17 \x01(\x08\"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\x0b\x10\x0cJ\x04\x08\x0f\x10\x10J\x04\x08\x10\x10\x11J\x04\x08\x11\x10\x12J\x04\x08\x12\x10\x13J\x04\x08\x15\x10\x16\x42\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\"\xac\t\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\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\x1d\n\x11\x61\x63\x63\x65ss_log_format\x18\x18 \x01(\tB\x02\x18\x01\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\x16\n\x0egalley_address\x18\x16 \x01(\t\x12\x1e\n\x16\x65nable_sds_token_mount\x18\x17 \x01(\x08\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\x42\x1cZ\x1aistio.io/api/mesh/v1alpha1b\x06proto3') , dependencies=[google_dot_protobuf_dot_duration__pb2.DESCRIPTOR,mesh_dot_v1alpha1_dot_proxy__pb2.DESCRIPTOR,]) +_MESHCONFIG_OUTBOUNDTRAFFICPOLICY_MODE = _descriptor.EnumDescriptor( + name='Mode', + full_name='istio.mesh.v1alpha1.MeshConfig.OutboundTrafficPolicy.Mode', + filename=None, + file=DESCRIPTOR, + values=[ + _descriptor.EnumValueDescriptor( + name='REGISTRY_ONLY', index=0, number=0, + options=_descriptor._ParseOptions(descriptor_pb2.EnumValueOptions(), _b('\010\001')), + type=None), + _descriptor.EnumValueDescriptor( + name='ALLOW_ANY', index=1, number=1, + options=_descriptor._ParseOptions(descriptor_pb2.EnumValueOptions(), _b('\010\001')), + type=None), + _descriptor.EnumValueDescriptor( + name='VIRTUAL_SERVICE_ONLY', index=2, number=2, + options=_descriptor._ParseOptions(descriptor_pb2.EnumValueOptions(), _b('\010\001')), + type=None), + ], + containing_type=None, + options=None, + serialized_start=1118, + serialized_end=1196, +) +_sym_db.RegisterEnumDescriptor(_MESHCONFIG_OUTBOUNDTRAFFICPOLICY_MODE) + _MESHCONFIG_INGRESSCONTROLLERMODE = _descriptor.EnumDescriptor( name='IngressControllerMode', full_name='istio.mesh.v1alpha1.MeshConfig.IngressControllerMode', @@ -48,8 +74,8 @@ ], containing_type=None, options=None, - serialized_start=775, - serialized_end=832, + serialized_start=1198, + serialized_end=1255, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_INGRESSCONTROLLERMODE) @@ -70,12 +96,43 @@ ], containing_type=None, options=None, - serialized_start=834, - serialized_end=872, + serialized_start=1257, + serialized_end=1295, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_AUTHPOLICY) +_MESHCONFIG_OUTBOUNDTRAFFICPOLICY = _descriptor.Descriptor( + name='OutboundTrafficPolicy', + full_name='istio.mesh.v1alpha1.MeshConfig.OutboundTrafficPolicy', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='mode', full_name='istio.mesh.v1alpha1.MeshConfig.OutboundTrafficPolicy.mode', index=0, + number=1, type=14, cpp_type=8, label=1, + has_default_value=False, default_value=0, + 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), + ], + extensions=[ + ], + nested_types=[], + enum_types=[ + _MESHCONFIG_OUTBOUNDTRAFFICPOLICY_MODE, + ], + options=None, + is_extendable=False, + syntax='proto3', + extension_ranges=[], + oneofs=[ + ], + serialized_start=1015, + serialized_end=1196, +) + _MESHCONFIG = _descriptor.Descriptor( name='MeshConfig', full_name='istio.mesh.v1alpha1.MeshConfig', @@ -154,56 +211,84 @@ is_extension=False, extension_scope=None, options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')), file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='enable_tracing', full_name='istio.mesh.v1alpha1.MeshConfig.enable_tracing', index=10, + name='rds_refresh_delay', full_name='istio.mesh.v1alpha1.MeshConfig.rds_refresh_delay', index=10, + number=11, 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_tracing', full_name='istio.mesh.v1alpha1.MeshConfig.enable_tracing', index=11, number=12, 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='access_log_file', full_name='istio.mesh.v1alpha1.MeshConfig.access_log_file', index=11, + name='access_log_file', full_name='istio.mesh.v1alpha1.MeshConfig.access_log_file', index=12, number=13, 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='access_log_format', full_name='istio.mesh.v1alpha1.MeshConfig.access_log_format', index=12, + name='access_log_format', full_name='istio.mesh.v1alpha1.MeshConfig.access_log_format', index=13, number=24, 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), + options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')), file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='default_config', full_name='istio.mesh.v1alpha1.MeshConfig.default_config', index=13, + name='default_config', full_name='istio.mesh.v1alpha1.MeshConfig.default_config', index=14, 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='enable_client_side_policy_check', full_name='istio.mesh.v1alpha1.MeshConfig.enable_client_side_policy_check', index=14, + name='mixer_address', full_name='istio.mesh.v1alpha1.MeshConfig.mixer_address', index=15, + 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=16, + 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=17, 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=15, + name='sds_uds_path', full_name='istio.mesh.v1alpha1.MeshConfig.sds_uds_path', index=18, 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='galley_address', full_name='istio.mesh.v1alpha1.MeshConfig.galley_address', index=16, + name='sds_refresh_delay', full_name='istio.mesh.v1alpha1.MeshConfig.sds_refresh_delay', index=19, + 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='galley_address', full_name='istio.mesh.v1alpha1.MeshConfig.galley_address', index=20, number=22, 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='enable_sds_token_mount', full_name='istio.mesh.v1alpha1.MeshConfig.enable_sds_token_mount', index=17, + name='enable_sds_token_mount', full_name='istio.mesh.v1alpha1.MeshConfig.enable_sds_token_mount', index=21, 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, @@ -212,7 +297,7 @@ ], extensions=[ ], - nested_types=[], + nested_types=[_MESHCONFIG_OUTBOUNDTRAFFICPOLICY, ], enum_types=[ _MESHCONFIG_INGRESSCONTROLLERMODE, _MESHCONFIG_AUTHPOLICY, @@ -224,28 +309,60 @@ oneofs=[ ], serialized_start=111, - serialized_end=908, + serialized_end=1307, ) +_MESHCONFIG_OUTBOUNDTRAFFICPOLICY.fields_by_name['mode'].enum_type = _MESHCONFIG_OUTBOUNDTRAFFICPOLICY_MODE +_MESHCONFIG_OUTBOUNDTRAFFICPOLICY.containing_type = _MESHCONFIG +_MESHCONFIG_OUTBOUNDTRAFFICPOLICY_MODE.containing_type = _MESHCONFIG_OUTBOUNDTRAFFICPOLICY _MESHCONFIG.fields_by_name['connect_timeout'].message_type = google_dot_protobuf_dot_duration__pb2._DURATION _MESHCONFIG.fields_by_name['ingress_controller_mode'].enum_type = _MESHCONFIG_INGRESSCONTROLLERMODE _MESHCONFIG.fields_by_name['auth_policy'].enum_type = _MESHCONFIG_AUTHPOLICY +_MESHCONFIG.fields_by_name['rds_refresh_delay'].message_type = google_dot_protobuf_dot_duration__pb2._DURATION _MESHCONFIG.fields_by_name['default_config'].message_type = mesh_dot_v1alpha1_dot_proxy__pb2._PROXYCONFIG +_MESHCONFIG.fields_by_name['outbound_traffic_policy'].message_type = _MESHCONFIG_OUTBOUNDTRAFFICPOLICY +_MESHCONFIG.fields_by_name['sds_refresh_delay'].message_type = google_dot_protobuf_dot_duration__pb2._DURATION _MESHCONFIG_INGRESSCONTROLLERMODE.containing_type = _MESHCONFIG _MESHCONFIG_AUTHPOLICY.containing_type = _MESHCONFIG DESCRIPTOR.message_types_by_name['MeshConfig'] = _MESHCONFIG _sym_db.RegisterFileDescriptor(DESCRIPTOR) MeshConfig = _reflection.GeneratedProtocolMessageType('MeshConfig', (_message.Message,), dict( + + OutboundTrafficPolicy = _reflection.GeneratedProtocolMessageType('OutboundTrafficPolicy', (_message.Message,), dict( + DESCRIPTOR = _MESHCONFIG_OUTBOUNDTRAFFICPOLICY, + __module__ = 'mesh.v1alpha1.config_pb2' + # @@protoc_insertion_point(class_scope:istio.mesh.v1alpha1.MeshConfig.OutboundTrafficPolicy) + )) + , DESCRIPTOR = _MESHCONFIG, __module__ = 'mesh.v1alpha1.config_pb2' # @@protoc_insertion_point(class_scope:istio.mesh.v1alpha1.MeshConfig) )) _sym_db.RegisterMessage(MeshConfig) +_sym_db.RegisterMessage(MeshConfig.OutboundTrafficPolicy) DESCRIPTOR.has_options = True DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z\032istio.io/api/mesh/v1alpha1')) +_MESHCONFIG_OUTBOUNDTRAFFICPOLICY_MODE.values_by_name["REGISTRY_ONLY"].has_options = True +_MESHCONFIG_OUTBOUNDTRAFFICPOLICY_MODE.values_by_name["REGISTRY_ONLY"]._options = _descriptor._ParseOptions(descriptor_pb2.EnumValueOptions(), _b('\010\001')) +_MESHCONFIG_OUTBOUNDTRAFFICPOLICY_MODE.values_by_name["ALLOW_ANY"].has_options = True +_MESHCONFIG_OUTBOUNDTRAFFICPOLICY_MODE.values_by_name["ALLOW_ANY"]._options = _descriptor._ParseOptions(descriptor_pb2.EnumValueOptions(), _b('\010\001')) +_MESHCONFIG_OUTBOUNDTRAFFICPOLICY_MODE.values_by_name["VIRTUAL_SERVICE_ONLY"].has_options = True +_MESHCONFIG_OUTBOUNDTRAFFICPOLICY_MODE.values_by_name["VIRTUAL_SERVICE_ONLY"]._options = _descriptor._ParseOptions(descriptor_pb2.EnumValueOptions(), _b('\010\001')) +_MESHCONFIG_OUTBOUNDTRAFFICPOLICY.fields_by_name['mode'].has_options = True +_MESHCONFIG_OUTBOUNDTRAFFICPOLICY.fields_by_name['mode']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')) _MESHCONFIG.fields_by_name['auth_policy'].has_options = True _MESHCONFIG.fields_by_name['auth_policy']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')) +_MESHCONFIG.fields_by_name['rds_refresh_delay'].has_options = True +_MESHCONFIG.fields_by_name['rds_refresh_delay']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')) +_MESHCONFIG.fields_by_name['access_log_format'].has_options = True +_MESHCONFIG.fields_by_name['access_log_format']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')) +_MESHCONFIG.fields_by_name['mixer_address'].has_options = True +_MESHCONFIG.fields_by_name['mixer_address']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')) +_MESHCONFIG.fields_by_name['outbound_traffic_policy'].has_options = True +_MESHCONFIG.fields_by_name['outbound_traffic_policy']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')) +_MESHCONFIG.fields_by_name['sds_refresh_delay'].has_options = True +_MESHCONFIG.fields_by_name['sds_refresh_delay']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')) # @@protoc_insertion_point(module_scope) diff --git a/python/istio_api/mesh/v1alpha1/proxy_pb2.py b/python/istio_api/mesh/v1alpha1/proxy_pb2.py index 187ad57971..faff41274d 100644 --- a/python/istio_api/mesh/v1alpha1/proxy_pb2.py +++ b/python/istio_api/mesh/v1alpha1/proxy_pb2.py @@ -21,7 +21,7 @@ name='mesh/v1alpha1/proxy.proto', package='istio.mesh.v1alpha1', syntax='proto3', - serialized_pb=_b('\n\x19mesh/v1alpha1/proxy.proto\x12\x13istio.mesh.v1alpha1\x1a\x1egoogle/protobuf/duration.proto\"\xfb\x01\n\x07Tracing\x12\x35\n\x06zipkin\x18\x01 \x01(\x0b\x32#.istio.mesh.v1alpha1.Tracing.ZipkinH\x00\x12;\n\tlightstep\x18\x02 \x01(\x0b\x32&.istio.mesh.v1alpha1.Tracing.LightstepH\x00\x1a\x19\n\x06Zipkin\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x1aW\n\tLightstep\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x14\n\x0c\x61\x63\x63\x65ss_token\x18\x02 \x01(\t\x12\x0e\n\x06secure\x18\x03 \x01(\x08\x12\x13\n\x0b\x63\x61\x63\x65rt_path\x18\x04 \x01(\tB\x08\n\x06tracer\"\xe6\x05\n\x0bProxyConfig\x12\x13\n\x0b\x63onfig_path\x18\x01 \x01(\t\x12\x13\n\x0b\x62inary_path\x18\x02 \x01(\t\x12\x17\n\x0fservice_cluster\x18\x03 \x01(\t\x12\x31\n\x0e\x64rain_duration\x18\x04 \x01(\x0b\x32\x19.google.protobuf.Duration\x12;\n\x18parent_shutdown_duration\x18\x05 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x19\n\x11\x64iscovery_address\x18\x06 \x01(\t\x12\x1a\n\x0ezipkin_address\x18\x08 \x01(\tB\x02\x18\x01\x12\x32\n\x0f\x63onnect_timeout\x18\t \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x1a\n\x12statsd_udp_address\x18\n \x01(\t\x12\x18\n\x10proxy_admin_port\x18\x0b \x01(\x05\x12L\n\x19\x63ontrol_plane_auth_policy\x18\r \x01(\x0e\x32).istio.mesh.v1alpha1.AuthenticationPolicy\x12\x1a\n\x12\x63ustom_config_file\x18\x0e \x01(\t\x12\x18\n\x10stat_name_length\x18\x0f \x01(\x05\x12\x13\n\x0b\x63oncurrency\x18\x10 \x01(\x05\x12%\n\x1dproxy_bootstrap_template_path\x18\x11 \x01(\t\x12S\n\x11interception_mode\x18\x12 \x01(\x0e\x32\x38.istio.mesh.v1alpha1.ProxyConfig.InboundInterceptionMode\x12-\n\x07tracing\x18\x13 \x01(\x0b\x32\x1c.istio.mesh.v1alpha1.Tracing\"3\n\x17InboundInterceptionMode\x12\x0c\n\x08REDIRECT\x10\x00\x12\n\n\x06TPROXY\x10\x01J\x04\x08\x07\x10\x08J\x04\x08\x0c\x10\r*>\n\x14\x41uthenticationPolicy\x12\x08\n\x04NONE\x10\x00\x12\x0e\n\nMUTUAL_TLS\x10\x01\x12\x0c\n\x07INHERIT\x10\xe8\x07\x42\x1cZ\x1aistio.io/api/mesh/v1alpha1b\x06proto3') + serialized_pb=_b('\n\x19mesh/v1alpha1/proxy.proto\x12\x13istio.mesh.v1alpha1\x1a\x1egoogle/protobuf/duration.proto\"\xfb\x01\n\x07Tracing\x12\x35\n\x06zipkin\x18\x01 \x01(\x0b\x32#.istio.mesh.v1alpha1.Tracing.ZipkinH\x00\x12;\n\tlightstep\x18\x02 \x01(\x0b\x32&.istio.mesh.v1alpha1.Tracing.LightstepH\x00\x1a\x19\n\x06Zipkin\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x1aW\n\tLightstep\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x14\n\x0c\x61\x63\x63\x65ss_token\x18\x02 \x01(\t\x12\x0e\n\x06secure\x18\x03 \x01(\x08\x12\x13\n\x0b\x63\x61\x63\x65rt_path\x18\x04 \x01(\tB\x08\n\x06tracer\"\xb9\x06\n\x0bProxyConfig\x12\x13\n\x0b\x63onfig_path\x18\x01 \x01(\t\x12\x13\n\x0b\x62inary_path\x18\x02 \x01(\t\x12\x17\n\x0fservice_cluster\x18\x03 \x01(\t\x12\x31\n\x0e\x64rain_duration\x18\x04 \x01(\x0b\x32\x19.google.protobuf.Duration\x12;\n\x18parent_shutdown_duration\x18\x05 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x19\n\x11\x64iscovery_address\x18\x06 \x01(\t\x12>\n\x17\x64iscovery_refresh_delay\x18\x07 \x01(\x0b\x32\x19.google.protobuf.DurationB\x02\x18\x01\x12\x1a\n\x0ezipkin_address\x18\x08 \x01(\tB\x02\x18\x01\x12\x32\n\x0f\x63onnect_timeout\x18\t \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x1a\n\x12statsd_udp_address\x18\n \x01(\t\x12\x18\n\x10proxy_admin_port\x18\x0b \x01(\x05\x12\x1d\n\x11\x61vailability_zone\x18\x0c \x01(\tB\x02\x18\x01\x12L\n\x19\x63ontrol_plane_auth_policy\x18\r \x01(\x0e\x32).istio.mesh.v1alpha1.AuthenticationPolicy\x12\x1a\n\x12\x63ustom_config_file\x18\x0e \x01(\t\x12\x18\n\x10stat_name_length\x18\x0f \x01(\x05\x12\x13\n\x0b\x63oncurrency\x18\x10 \x01(\x05\x12%\n\x1dproxy_bootstrap_template_path\x18\x11 \x01(\t\x12S\n\x11interception_mode\x18\x12 \x01(\x0e\x32\x38.istio.mesh.v1alpha1.ProxyConfig.InboundInterceptionMode\x12-\n\x07tracing\x18\x13 \x01(\x0b\x32\x1c.istio.mesh.v1alpha1.Tracing\"3\n\x17InboundInterceptionMode\x12\x0c\n\x08REDIRECT\x10\x00\x12\n\n\x06TPROXY\x10\x01*>\n\x14\x41uthenticationPolicy\x12\x08\n\x04NONE\x10\x00\x12\x0e\n\nMUTUAL_TLS\x10\x01\x12\x0c\n\x07INHERIT\x10\xe8\x07\x42\x1cZ\x1aistio.io/api/mesh/v1alpha1b\x06proto3') , dependencies=[google_dot_protobuf_dot_duration__pb2.DESCRIPTOR,]) @@ -46,8 +46,8 @@ ], containing_type=None, options=None, - serialized_start=1081, - serialized_end=1143, + serialized_start=1164, + serialized_end=1226, ) _sym_db.RegisterEnumDescriptor(_AUTHENTICATIONPOLICY) @@ -74,8 +74,8 @@ ], containing_type=None, options=None, - serialized_start=1016, - serialized_end=1067, + serialized_start=1111, + serialized_end=1162, ) _sym_db.RegisterEnumDescriptor(_PROXYCONFIG_INBOUNDINTERCEPTIONMODE) @@ -252,77 +252,91 @@ is_extension=False, extension_scope=None, options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='zipkin_address', full_name='istio.mesh.v1alpha1.ProxyConfig.zipkin_address', index=6, + name='discovery_refresh_delay', full_name='istio.mesh.v1alpha1.ProxyConfig.discovery_refresh_delay', index=6, + number=7, 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='zipkin_address', full_name='istio.mesh.v1alpha1.ProxyConfig.zipkin_address', index=7, number=8, 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='connect_timeout', full_name='istio.mesh.v1alpha1.ProxyConfig.connect_timeout', index=7, + name='connect_timeout', full_name='istio.mesh.v1alpha1.ProxyConfig.connect_timeout', index=8, number=9, 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='statsd_udp_address', full_name='istio.mesh.v1alpha1.ProxyConfig.statsd_udp_address', index=8, + name='statsd_udp_address', full_name='istio.mesh.v1alpha1.ProxyConfig.statsd_udp_address', index=9, number=10, 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='proxy_admin_port', full_name='istio.mesh.v1alpha1.ProxyConfig.proxy_admin_port', index=9, + name='proxy_admin_port', full_name='istio.mesh.v1alpha1.ProxyConfig.proxy_admin_port', index=10, number=11, 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, options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='control_plane_auth_policy', full_name='istio.mesh.v1alpha1.ProxyConfig.control_plane_auth_policy', index=10, + name='availability_zone', full_name='istio.mesh.v1alpha1.ProxyConfig.availability_zone', index=11, + number=12, 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='control_plane_auth_policy', full_name='istio.mesh.v1alpha1.ProxyConfig.control_plane_auth_policy', index=12, number=13, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='custom_config_file', full_name='istio.mesh.v1alpha1.ProxyConfig.custom_config_file', index=11, + name='custom_config_file', full_name='istio.mesh.v1alpha1.ProxyConfig.custom_config_file', index=13, number=14, 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='stat_name_length', full_name='istio.mesh.v1alpha1.ProxyConfig.stat_name_length', index=12, + name='stat_name_length', full_name='istio.mesh.v1alpha1.ProxyConfig.stat_name_length', index=14, number=15, 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, options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='concurrency', full_name='istio.mesh.v1alpha1.ProxyConfig.concurrency', index=13, + name='concurrency', full_name='istio.mesh.v1alpha1.ProxyConfig.concurrency', index=15, number=16, 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, options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='proxy_bootstrap_template_path', full_name='istio.mesh.v1alpha1.ProxyConfig.proxy_bootstrap_template_path', index=14, + name='proxy_bootstrap_template_path', full_name='istio.mesh.v1alpha1.ProxyConfig.proxy_bootstrap_template_path', index=16, number=17, 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='interception_mode', full_name='istio.mesh.v1alpha1.ProxyConfig.interception_mode', index=15, + name='interception_mode', full_name='istio.mesh.v1alpha1.ProxyConfig.interception_mode', index=17, number=18, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='tracing', full_name='istio.mesh.v1alpha1.ProxyConfig.tracing', index=16, + name='tracing', full_name='istio.mesh.v1alpha1.ProxyConfig.tracing', index=18, number=19, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -342,7 +356,7 @@ oneofs=[ ], serialized_start=337, - serialized_end=1079, + serialized_end=1162, ) _TRACING_ZIPKIN.containing_type = _TRACING @@ -357,6 +371,7 @@ _TRACING.fields_by_name['lightstep'].containing_oneof = _TRACING.oneofs_by_name['tracer'] _PROXYCONFIG.fields_by_name['drain_duration'].message_type = google_dot_protobuf_dot_duration__pb2._DURATION _PROXYCONFIG.fields_by_name['parent_shutdown_duration'].message_type = google_dot_protobuf_dot_duration__pb2._DURATION +_PROXYCONFIG.fields_by_name['discovery_refresh_delay'].message_type = google_dot_protobuf_dot_duration__pb2._DURATION _PROXYCONFIG.fields_by_name['connect_timeout'].message_type = google_dot_protobuf_dot_duration__pb2._DURATION _PROXYCONFIG.fields_by_name['control_plane_auth_policy'].enum_type = _AUTHENTICATIONPOLICY _PROXYCONFIG.fields_by_name['interception_mode'].enum_type = _PROXYCONFIG_INBOUNDINTERCEPTIONMODE @@ -400,6 +415,10 @@ DESCRIPTOR.has_options = True DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z\032istio.io/api/mesh/v1alpha1')) +_PROXYCONFIG.fields_by_name['discovery_refresh_delay'].has_options = True +_PROXYCONFIG.fields_by_name['discovery_refresh_delay']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')) _PROXYCONFIG.fields_by_name['zipkin_address'].has_options = True _PROXYCONFIG.fields_by_name['zipkin_address']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')) +_PROXYCONFIG.fields_by_name['availability_zone'].has_options = True +_PROXYCONFIG.fields_by_name['availability_zone']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')) # @@protoc_insertion_point(module_scope) From 0eb4e64a44b0c2bbf76376294ca07f3a1e95faaf Mon Sep 17 00:00:00 2001 From: ozben Date: Fri, 19 Oct 2018 13:45:30 -0700 Subject: [PATCH 2/2] Remove $hide_from_docs --- mesh/v1alpha1/config.pb.go | 123 ++++++++---------- mesh/v1alpha1/config.proto | 14 +- mesh/v1alpha1/istio.mesh.v1alpha1.pb.html | 128 ++++++++++++++++++- mesh/v1alpha1/proxy.pb.go | 2 - mesh/v1alpha1/proxy.proto | 2 - python/istio_api/mesh/v1alpha1/config_pb2.py | 24 ++-- 6 files changed, 192 insertions(+), 101 deletions(-) diff --git a/mesh/v1alpha1/config.pb.go b/mesh/v1alpha1/config.pb.go index e6d2227347..6e4c5eddbe 100644 --- a/mesh/v1alpha1/config.pb.go +++ b/mesh/v1alpha1/config.pb.go @@ -96,19 +96,15 @@ func (MeshConfig_AuthPolicy) EnumDescriptor() ([]byte, []int) { return fileDescriptorConfig, []int{0, 1} } -// $hide_from_docs // DEPRECATED. UNUSED. type MeshConfig_OutboundTrafficPolicy_Mode int32 const ( - // $hide_from_docs // outbound traffic will be restricted to services defined in the service registry as well as those defined // through ServiceEntries MeshConfig_OutboundTrafficPolicy_REGISTRY_ONLY MeshConfig_OutboundTrafficPolicy_Mode = 0 - // $hide_from_docs // outbound traffic to unknown destinations will be allowed MeshConfig_OutboundTrafficPolicy_ALLOW_ANY MeshConfig_OutboundTrafficPolicy_Mode = 1 - // $hide_from_docs // not implemented. outbound traffic will be restricted to destinations defined in VirtualServices only MeshConfig_OutboundTrafficPolicy_VIRTUAL_SERVICE_ONLY MeshConfig_OutboundTrafficPolicy_Mode = 2 ) @@ -173,7 +169,6 @@ type MeshConfig struct { IngressControllerMode MeshConfig_IngressControllerMode `protobuf:"varint,9,opt,name=ingress_controller_mode,json=ingressControllerMode,proto3,enum=istio.mesh.v1alpha1.MeshConfig_IngressControllerMode" json:"ingress_controller_mode,omitempty"` // $hide_from_docs AuthPolicy MeshConfig_AuthPolicy `protobuf:"varint,10,opt,name=auth_policy,json=authPolicy,proto3,enum=istio.mesh.v1alpha1.MeshConfig_AuthPolicy" json:"auth_policy,omitempty"` - // $hide_from_docs // DEPRECATED. UNUSED. Polling interval for RDS (MUST BE >=1ms) RdsRefreshDelay *google_protobuf.Duration `protobuf:"bytes,11,opt,name=rds_refresh_delay,json=rdsRefreshDelay" json:"rds_refresh_delay,omitempty"` // Flag to control generation of trace spans and request IDs. @@ -182,7 +177,6 @@ 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"` - // DEPRECATED. // Format for the proxy access log (text or json). // Default value is text. AccessLogFormat string `protobuf:"bytes,24,opt,name=access_log_format,json=accessLogFormat,proto3" json:"access_log_format,omitempty"` @@ -192,11 +186,9 @@ type MeshConfig struct { // and remain constant for the duration of the pod. The rest of the mesh config can be changed // at runtime and config gets distributed dynamically. DefaultConfig *ProxyConfig `protobuf:"bytes,14,opt,name=default_config,json=defaultConfig" json:"default_config,omitempty"` - // $hide_from_docs // DEPRECATED. UNUSED. Mixer address. This option will be removed soon. Please // use mixer_check and mixer_report. MixerAddress string `protobuf:"bytes,16,opt,name=mixer_address,json=mixerAddress,proto3" json:"mixer_address,omitempty"` - // $hide_from_docs // DEPRECATED. UNUSED. // Set the default behavior of the sidecar for handling outbound traffic from the application. // While the default mode should work out of the box, if your application uses one or more external services that @@ -210,7 +202,6 @@ type MeshConfig struct { // Unix Domain Socket through which envoy communicates with NodeAgent SDS to get key/cert for mTLS. // Use secret-mount files instead of SDS if set to empty. SdsUdsPath string `protobuf:"bytes,20,opt,name=sds_uds_path,json=sdsUdsPath,proto3" json:"sds_uds_path,omitempty"` - // $hide_from_docs // DEPRECATED. UNUSED. // Polling interval for SDS (MUST BE >=1ms) SdsRefreshDelay *google_protobuf.Duration `protobuf:"bytes,21,opt,name=sds_refresh_delay,json=sdsRefreshDelay" json:"sds_refresh_delay,omitempty"` @@ -383,10 +374,8 @@ func (m *MeshConfig) GetEnableSdsTokenMount() bool { return false } -// $hide_from_docs // DEPRECATED. UNUSED. type MeshConfig_OutboundTrafficPolicy struct { - // $hide_from_docs // DEPRECATED. UNUSED. Mode MeshConfig_OutboundTrafficPolicy_Mode `protobuf:"varint,1,opt,name=mode,proto3,enum=istio.mesh.v1alpha1.MeshConfig_OutboundTrafficPolicy_Mode" json:"mode,omitempty"` } @@ -1560,60 +1549,60 @@ func init() { proto.RegisterFile("mesh/v1alpha1/config.proto", fileDescriptorCon var fileDescriptorConfig = []byte{ // 886 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xd1, 0x4e, 0x1b, 0x47, - 0x14, 0x65, 0x89, 0x03, 0xe6, 0x82, 0xed, 0xf5, 0x10, 0x87, 0x89, 0x5b, 0x51, 0x8b, 0xaa, 0x89, - 0x15, 0x55, 0x6b, 0x85, 0xa8, 0x0f, 0xed, 0x9b, 0x31, 0x26, 0x75, 0x64, 0x6c, 0xb4, 0x5e, 0x52, - 0xd1, 0x97, 0xd1, 0xb2, 0x3b, 0xf6, 0x8e, 0xb2, 0xde, 0x71, 0x77, 0x66, 0xa3, 0xf0, 0x55, 0xfd, - 0x80, 0xfe, 0x40, 0x1f, 0xfb, 0x09, 0x15, 0x5f, 0x52, 0xed, 0x9d, 0xb5, 0x01, 0xc5, 0x12, 0x55, - 0x1e, 0x39, 0xe7, 0xdc, 0xb9, 0x7b, 0xcf, 0xb9, 0x17, 0x43, 0x73, 0xce, 0x55, 0xd4, 0xf9, 0xf4, - 0xc6, 0x8f, 0x17, 0x91, 0xff, 0xa6, 0x13, 0xc8, 0x64, 0x2a, 0x66, 0xce, 0x22, 0x95, 0x5a, 0x92, - 0x7d, 0xa1, 0xb4, 0x90, 0x4e, 0xae, 0x70, 0x96, 0x8a, 0xe6, 0xe1, 0x4c, 0xca, 0x59, 0xcc, 0x3b, - 0x28, 0xb9, 0xce, 0xa6, 0x9d, 0x30, 0x4b, 0x7d, 0x2d, 0x64, 0x62, 0x8a, 0x9a, 0x2f, 0x1e, 0x3e, - 0xb8, 0x48, 0xe5, 0xe7, 0x1b, 0x43, 0x1d, 0xfd, 0xb9, 0x07, 0x70, 0xce, 0x55, 0xd4, 0xc3, 0x26, - 0xe4, 0x47, 0x20, 0x73, 0xf1, 0x99, 0xa7, 0x2c, 0x88, 0x78, 0xf0, 0x91, 0x29, 0x9e, 0x7e, 0xe2, - 0x29, 0xb5, 0x5a, 0x56, 0x7b, 0xc7, 0xb5, 0x91, 0xe9, 0xe5, 0xc4, 0x04, 0x71, 0xe2, 0xc0, 0xbe, - 0x51, 0xa7, 0x7c, 0x21, 0x53, 0xbd, 0x94, 0x6f, 0xa2, 0xbc, 0x8e, 0x94, 0x8b, 0x4c, 0xa1, 0x3f, - 0x86, 0x46, 0x28, 0x94, 0x7f, 0x1d, 0x73, 0xb6, 0x90, 0xb1, 0x08, 0x6e, 0x4c, 0x1b, 0x45, 0x9f, - 0xb4, 0xac, 0x76, 0xd9, 0xdd, 0x2f, 0xc8, 0x0b, 0xe4, 0xb0, 0x91, 0x22, 0xaf, 0xa1, 0x8e, 0xdf, - 0xcb, 0x62, 0xa1, 0x34, 0x4f, 0x58, 0xfe, 0x1c, 0x2d, 0xb5, 0xac, 0xf6, 0x53, 0xb7, 0x86, 0xc4, - 0x10, 0xf1, 0x0b, 0x99, 0x6a, 0xf2, 0x12, 0x0c, 0xc4, 0x22, 0xad, 0x17, 0x46, 0xf9, 0x14, 0x95, - 0x15, 0x84, 0x7f, 0xd5, 0x7a, 0x81, 0xba, 0x13, 0xa8, 0x05, 0x32, 0x49, 0x78, 0xa0, 0x99, 0x16, - 0x73, 0x2e, 0x33, 0x4d, 0xb7, 0x5a, 0x56, 0x7b, 0xf7, 0xf8, 0x85, 0x63, 0x9c, 0x74, 0x96, 0x4e, - 0x3a, 0xa7, 0x85, 0x93, 0x6e, 0xb5, 0xa8, 0xf0, 0x4c, 0x01, 0xf9, 0x1e, 0x2a, 0x22, 0x99, 0xa5, - 0x5c, 0x29, 0x16, 0xc4, 0xbe, 0x52, 0x74, 0x1b, 0xa7, 0xde, 0x2b, 0xc0, 0x5e, 0x8e, 0x91, 0x57, - 0x50, 0x5b, 0x8a, 0x72, 0x6f, 0x44, 0xc0, 0x69, 0x19, 0x65, 0xd5, 0x02, 0x9e, 0x18, 0x94, 0xcc, - 0xe1, 0x60, 0xf5, 0x9a, 0x4c, 0x74, 0x2a, 0xe3, 0x98, 0xa7, 0x6c, 0x2e, 0x43, 0x4e, 0x77, 0x5a, - 0x56, 0xbb, 0x7a, 0xfc, 0x93, 0xb3, 0x26, 0x78, 0xe7, 0x2e, 0x39, 0x67, 0x50, 0xf4, 0x5d, 0x55, - 0x9f, 0xcb, 0x90, 0xbb, 0x0d, 0xb1, 0x0e, 0x26, 0x63, 0xd8, 0xf5, 0x33, 0x1d, 0x15, 0x29, 0x50, - 0xc0, 0x16, 0xaf, 0x1f, 0x6b, 0xd1, 0xcd, 0x74, 0x64, 0xb2, 0x39, 0xd9, 0xa4, 0x96, 0x0b, 0xfe, - 0xea, 0x6f, 0x32, 0x80, 0x7a, 0x1a, 0x2a, 0x96, 0xf2, 0x69, 0xca, 0x55, 0xc4, 0x42, 0x1e, 0xfb, - 0x37, 0x74, 0xf7, 0x11, 0x4f, 0xf1, 0x95, 0x5a, 0x1a, 0x2a, 0xd7, 0x94, 0x9d, 0xe6, 0x55, 0xe4, - 0x07, 0xa8, 0xf2, 0x04, 0x77, 0x44, 0xa7, 0x7e, 0x20, 0x92, 0x19, 0xdd, 0xc3, 0xed, 0xa8, 0x18, - 0xd4, 0x33, 0x60, 0x9e, 0xb5, 0x1f, 0x04, 0xb9, 0x61, 0xb1, 0x9c, 0xb1, 0xa9, 0x88, 0x39, 0xad, - 0xa0, 0xb5, 0x15, 0x03, 0x0f, 0xe5, 0xec, 0x4c, 0xc4, 0x9c, 0xbc, 0x83, 0x6a, 0xc8, 0xa7, 0x7e, - 0x16, 0x6b, 0x66, 0x0e, 0x89, 0x56, 0xf1, 0xb3, 0x5a, 0x6b, 0xa7, 0xbd, 0xc8, 0xf7, 0xc4, 0x8c, - 0xeb, 0x56, 0x8a, 0xba, 0xe2, 0x34, 0x5e, 0x41, 0xc5, 0x2c, 0xbb, 0x1f, 0x86, 0xb9, 0xa5, 0xd4, - 0xce, 0xdb, 0xe1, 0x0c, 0x7b, 0x48, 0x74, 0x0d, 0x4e, 0xfe, 0x80, 0x03, 0x99, 0xe9, 0x6b, 0x99, - 0x25, 0x61, 0x3e, 0xc2, 0x74, 0x2a, 0x82, 0xa5, 0xd1, 0x75, 0x6c, 0xfd, 0x68, 0x96, 0xe3, 0xa2, - 0xdc, 0x33, 0xd5, 0xf7, 0x3c, 0x6f, 0xc8, 0x75, 0x14, 0x39, 0x85, 0xef, 0x0a, 0xcf, 0x82, 0x58, - 0xf0, 0x44, 0x33, 0x25, 0xc2, 0x87, 0x37, 0x46, 0xf7, 0xd1, 0xc4, 0x6f, 0x8c, 0xac, 0x87, 0xaa, - 0x89, 0x08, 0xef, 0xdf, 0x1a, 0x69, 0xc1, 0x9e, 0x0a, 0x15, 0xcb, 0x42, 0xc5, 0x16, 0xbe, 0x8e, - 0xe8, 0x33, 0xf4, 0x13, 0x54, 0xa8, 0x2e, 0x43, 0x75, 0xe1, 0xeb, 0x28, 0x8f, 0x59, 0x7d, 0x11, - 0x73, 0xe3, 0x7f, 0xc5, 0xac, 0xbe, 0x8c, 0x79, 0xe6, 0xc7, 0x31, 0xbf, 0x59, 0xf9, 0xf9, 0xdc, - 0xc4, 0x67, 0xd0, 0xa5, 0x99, 0x6f, 0xe1, 0x79, 0x31, 0x59, 0xde, 0x58, 0xcb, 0x8f, 0x3c, 0x61, - 0x73, 0x99, 0x25, 0x9a, 0x1e, 0x98, 0xff, 0x19, 0x86, 0x9d, 0x84, 0xca, 0xcb, 0xb9, 0xf3, 0x9c, - 0x22, 0x0e, 0xd4, 0xef, 0xef, 0x86, 0x4c, 0xe7, 0xbe, 0xa6, 0x74, 0x15, 0x57, 0xed, 0x6e, 0x43, - 0x90, 0x6a, 0xfe, 0x65, 0x41, 0x63, 0xad, 0xe7, 0xc4, 0x85, 0x12, 0x1e, 0xa1, 0x85, 0x17, 0xf2, - 0xcb, 0x57, 0x05, 0xe7, 0xe4, 0x27, 0x87, 0x8d, 0xf1, 0xad, 0xa3, 0x11, 0x94, 0xf0, 0x08, 0x1b, - 0x50, 0x71, 0xfb, 0xef, 0x06, 0x13, 0xcf, 0xbd, 0x62, 0xe3, 0xd1, 0xf0, 0xca, 0xde, 0x68, 0x6e, - 0x96, 0x2d, 0x52, 0x87, 0x9d, 0xee, 0x70, 0x38, 0xfe, 0x8d, 0x75, 0x47, 0x57, 0xb6, 0x85, 0xd0, - 0xb7, 0xf0, 0xec, 0xc3, 0xc0, 0xf5, 0x2e, 0xbb, 0x43, 0x36, 0xe9, 0xbb, 0x1f, 0x06, 0xbd, 0xbe, - 0x29, 0xd8, 0xcc, 0xd9, 0xa3, 0x9f, 0xa1, 0xb1, 0xf6, 0xf8, 0xc9, 0x36, 0x3c, 0x19, 0x9f, 0x9d, - 0xd9, 0x1b, 0x64, 0x17, 0xb6, 0x4f, 0xfb, 0x67, 0xdd, 0xcb, 0xa1, 0x67, 0x5b, 0x04, 0x60, 0x6b, - 0xe2, 0xb9, 0x83, 0x9e, 0x67, 0x6f, 0x1e, 0xbd, 0x04, 0xb8, 0x3b, 0x6a, 0x52, 0x86, 0xd2, 0x68, - 0x3c, 0xea, 0xdb, 0x1b, 0xa4, 0x0a, 0x70, 0x7e, 0x89, 0xfd, 0xbc, 0xe1, 0xc4, 0xb6, 0xde, 0x97, - 0xca, 0x35, 0xdb, 0x7e, 0x5f, 0x2a, 0x13, 0x7b, 0xff, 0xa4, 0xfd, 0xf7, 0xed, 0xa1, 0xf5, 0xcf, - 0xed, 0xa1, 0xf5, 0xef, 0xed, 0xa1, 0xf5, 0x7b, 0xd3, 0x38, 0x22, 0x64, 0xc7, 0x5f, 0x88, 0xce, - 0x83, 0xdf, 0x99, 0xeb, 0x2d, 0x5c, 0x85, 0xb7, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x49, 0xde, - 0xf3, 0xf3, 0xd0, 0x06, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xdb, 0x6e, 0xdb, 0x46, + 0x10, 0x35, 0x1d, 0xc5, 0x96, 0xc7, 0x96, 0x44, 0xad, 0xa2, 0x98, 0x51, 0x0b, 0x57, 0x70, 0xd1, + 0x44, 0x08, 0x0a, 0x0a, 0x71, 0xd0, 0x87, 0xf6, 0x4d, 0x96, 0xe5, 0x54, 0x81, 0x2c, 0x19, 0x14, + 0x9d, 0xc2, 0x7d, 0x59, 0xd0, 0xe4, 0x4a, 0x5c, 0x84, 0xe2, 0xaa, 0xdc, 0x65, 0x10, 0x7f, 0x53, + 0x3f, 0xa1, 0x3f, 0xd0, 0xc7, 0x7e, 0x42, 0xe1, 0x2f, 0x29, 0x76, 0x96, 0xf2, 0x05, 0x11, 0xe0, + 0x22, 0x8f, 0x3e, 0xe7, 0xcc, 0x8e, 0xe6, 0x9c, 0x19, 0x1a, 0x5a, 0x0b, 0x26, 0xe3, 0xee, 0xa7, + 0x37, 0x41, 0xb2, 0x8c, 0x83, 0x37, 0xdd, 0x50, 0xa4, 0x33, 0x3e, 0x77, 0x97, 0x99, 0x50, 0x82, + 0x34, 0xb8, 0x54, 0x5c, 0xb8, 0x5a, 0xe1, 0xae, 0x14, 0xad, 0x83, 0xb9, 0x10, 0xf3, 0x84, 0x75, + 0x51, 0x72, 0x95, 0xcf, 0xba, 0x51, 0x9e, 0x05, 0x8a, 0x8b, 0xd4, 0x14, 0xb5, 0x5e, 0x3c, 0x7c, + 0x70, 0x99, 0x89, 0xcf, 0xd7, 0x86, 0x3a, 0xfc, 0x73, 0x0f, 0xe0, 0x8c, 0xc9, 0xb8, 0x8f, 0x4d, + 0xc8, 0x8f, 0x40, 0x16, 0xfc, 0x33, 0xcb, 0x68, 0x18, 0xb3, 0xf0, 0x23, 0x95, 0x2c, 0xfb, 0xc4, + 0x32, 0xc7, 0x6a, 0x5b, 0x9d, 0x1d, 0xcf, 0x46, 0xa6, 0xaf, 0x89, 0x29, 0xe2, 0xc4, 0x85, 0x86, + 0x51, 0x67, 0x6c, 0x29, 0x32, 0xb5, 0x92, 0x6f, 0xa2, 0xbc, 0x8e, 0x94, 0x87, 0x4c, 0xa1, 0x3f, + 0x82, 0x66, 0xc4, 0x65, 0x70, 0x95, 0x30, 0xba, 0x14, 0x09, 0x0f, 0xaf, 0x4d, 0x1b, 0xe9, 0x3c, + 0x69, 0x5b, 0x9d, 0xb2, 0xd7, 0x28, 0xc8, 0x73, 0xe4, 0xb0, 0x91, 0x24, 0xaf, 0xa1, 0x8e, 0xbf, + 0x97, 0x26, 0x5c, 0x2a, 0x96, 0x52, 0xfd, 0x9c, 0x53, 0x6a, 0x5b, 0x9d, 0xa7, 0x5e, 0x0d, 0x89, + 0x11, 0xe2, 0xe7, 0x22, 0x53, 0xe4, 0x25, 0x18, 0x88, 0xc6, 0x4a, 0x2d, 0x8d, 0xf2, 0x29, 0x2a, + 0x2b, 0x08, 0xff, 0xaa, 0xd4, 0x12, 0x75, 0xc7, 0x50, 0x0b, 0x45, 0x9a, 0xb2, 0x50, 0x51, 0xc5, + 0x17, 0x4c, 0xe4, 0xca, 0xd9, 0x6a, 0x5b, 0x9d, 0xdd, 0xa3, 0x17, 0xae, 0x71, 0xd2, 0x5d, 0x39, + 0xe9, 0x9e, 0x14, 0x4e, 0x7a, 0xd5, 0xa2, 0xc2, 0x37, 0x05, 0xe4, 0x7b, 0xa8, 0xf0, 0x74, 0x9e, + 0x31, 0x29, 0x69, 0x98, 0x04, 0x52, 0x3a, 0xdb, 0x38, 0xf5, 0x5e, 0x01, 0xf6, 0x35, 0x46, 0x5e, + 0x41, 0x6d, 0x25, 0xd2, 0xde, 0xf0, 0x90, 0x39, 0x65, 0x94, 0x55, 0x0b, 0x78, 0x6a, 0x50, 0xb2, + 0x80, 0xfd, 0xdb, 0xd7, 0x44, 0xaa, 0x32, 0x91, 0x24, 0x2c, 0xa3, 0x0b, 0x11, 0x31, 0x67, 0xa7, + 0x6d, 0x75, 0xaa, 0x47, 0x3f, 0xb9, 0x6b, 0x82, 0x77, 0xef, 0x92, 0x73, 0x87, 0x45, 0xdf, 0xdb, + 0xea, 0x33, 0x11, 0x31, 0xaf, 0xc9, 0xd7, 0xc1, 0x64, 0x02, 0xbb, 0x41, 0xae, 0xe2, 0x22, 0x05, + 0x07, 0xb0, 0xc5, 0xeb, 0xc7, 0x5a, 0xf4, 0x72, 0x15, 0x9b, 0x6c, 0x8e, 0x37, 0x1d, 0xcb, 0x83, + 0xe0, 0xf6, 0x6f, 0x32, 0x84, 0x7a, 0x16, 0x49, 0x9a, 0xb1, 0x59, 0xc6, 0x64, 0x4c, 0x23, 0x96, + 0x04, 0xd7, 0xce, 0xee, 0x23, 0x9e, 0xe2, 0x2b, 0xb5, 0x2c, 0x92, 0x9e, 0x29, 0x3b, 0xd1, 0x55, + 0xe4, 0x07, 0xa8, 0xb2, 0x14, 0x77, 0x44, 0x65, 0x41, 0xc8, 0xd3, 0xb9, 0xb3, 0x87, 0xdb, 0x51, + 0x31, 0xa8, 0x6f, 0x40, 0x9d, 0x75, 0x10, 0x86, 0xda, 0xb0, 0x44, 0xcc, 0xe9, 0x8c, 0x27, 0xcc, + 0xa9, 0xa0, 0xb5, 0x15, 0x03, 0x8f, 0xc4, 0xfc, 0x94, 0x27, 0x8c, 0xbc, 0x83, 0x6a, 0xc4, 0x66, + 0x41, 0x9e, 0x28, 0x6a, 0x0e, 0xc9, 0xa9, 0xe2, 0xcf, 0x6a, 0xaf, 0x9d, 0xf6, 0x5c, 0xef, 0x89, + 0x19, 0xd7, 0xab, 0x14, 0x75, 0xc5, 0x69, 0xbc, 0x82, 0x8a, 0x59, 0xf6, 0x20, 0x8a, 0xb4, 0xa5, + 0x8e, 0xad, 0xdb, 0xe1, 0x0c, 0x7b, 0x48, 0xf4, 0x0c, 0x4e, 0xfe, 0x80, 0x7d, 0x91, 0xab, 0x2b, + 0x91, 0xa7, 0x91, 0x1e, 0x61, 0x36, 0xe3, 0xe1, 0xca, 0xe8, 0x3a, 0xb6, 0x7e, 0x34, 0xcb, 0x49, + 0x51, 0xee, 0x9b, 0xea, 0x7b, 0x9e, 0x37, 0xc5, 0x3a, 0x8a, 0x9c, 0xc0, 0x77, 0x85, 0x67, 0x61, + 0xc2, 0x59, 0xaa, 0xa8, 0xe4, 0xd1, 0xc3, 0x1b, 0x73, 0x1a, 0x68, 0xe2, 0x37, 0x46, 0xd6, 0x47, + 0xd5, 0x94, 0x47, 0xf7, 0x6f, 0x8d, 0xb4, 0x61, 0x4f, 0x46, 0x92, 0xe6, 0x91, 0xa4, 0xcb, 0x40, + 0xc5, 0xce, 0x33, 0xf4, 0x13, 0x64, 0x24, 0x2f, 0x22, 0x79, 0x1e, 0xa8, 0x58, 0xc7, 0x2c, 0xbf, + 0x88, 0xb9, 0xf9, 0xbf, 0x62, 0x96, 0x5f, 0xc6, 0x3c, 0x0f, 0x92, 0x84, 0x5d, 0xdf, 0xfa, 0xf9, + 0xdc, 0xc4, 0x67, 0xd0, 0x95, 0x99, 0x6f, 0xe1, 0x79, 0x31, 0x99, 0x6e, 0xac, 0xc4, 0x47, 0x96, + 0xd2, 0x85, 0xc8, 0x53, 0xe5, 0xec, 0x9b, 0x6f, 0x86, 0x61, 0xa7, 0x91, 0xf4, 0x35, 0x77, 0xa6, + 0x29, 0xfd, 0xcd, 0xb8, 0xbf, 0x1b, 0x22, 0x5b, 0x04, 0xca, 0x71, 0xf0, 0xf9, 0xda, 0xdd, 0x76, + 0x20, 0xdc, 0xfa, 0xcb, 0x82, 0xe6, 0x5a, 0xbf, 0x89, 0x07, 0x25, 0x3c, 0x40, 0x0b, 0xaf, 0xe3, + 0x97, 0xaf, 0x0a, 0xcd, 0xd5, 0xe7, 0x86, 0x06, 0xe0, 0x5b, 0x87, 0x63, 0x28, 0xe1, 0x01, 0x36, + 0xa1, 0xe2, 0x0d, 0xde, 0x0d, 0xa7, 0xbe, 0x77, 0x49, 0x27, 0xe3, 0xd1, 0xa5, 0xbd, 0xd1, 0xda, + 0x2c, 0x5b, 0xa4, 0x0e, 0x3b, 0xbd, 0xd1, 0x68, 0xf2, 0x1b, 0xed, 0x8d, 0x2f, 0x6d, 0x0b, 0xa1, + 0x6f, 0xe1, 0xd9, 0x87, 0xa1, 0xe7, 0x5f, 0xf4, 0x46, 0x74, 0x3a, 0xf0, 0x3e, 0x0c, 0xfb, 0x03, + 0x53, 0xb0, 0xa9, 0xd9, 0xc3, 0x9f, 0xa1, 0xb9, 0xf6, 0xf0, 0xc9, 0x36, 0x3c, 0x99, 0x9c, 0x9e, + 0xda, 0x1b, 0x64, 0x17, 0xb6, 0x4f, 0x06, 0xa7, 0xbd, 0x8b, 0x91, 0x6f, 0x5b, 0x04, 0x60, 0x6b, + 0xea, 0x7b, 0xc3, 0xbe, 0x6f, 0x6f, 0x1e, 0xbe, 0x04, 0xb8, 0x3b, 0x68, 0x52, 0x86, 0xd2, 0x78, + 0x32, 0x1e, 0xd8, 0x1b, 0xa4, 0x0a, 0x70, 0x76, 0x81, 0xfd, 0xfc, 0xd1, 0xd4, 0xb6, 0xde, 0x97, + 0xca, 0x35, 0xdb, 0x7e, 0x5f, 0x2a, 0x13, 0xbb, 0x71, 0xdc, 0xf9, 0xfb, 0xe6, 0xc0, 0xfa, 0xe7, + 0xe6, 0xc0, 0xfa, 0xf7, 0xe6, 0xc0, 0xfa, 0xbd, 0x65, 0x1c, 0xe1, 0xa2, 0x1b, 0x2c, 0x79, 0xf7, + 0xc1, 0xff, 0x98, 0xab, 0x2d, 0x5c, 0x83, 0xb7, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0xa4, 0xb7, + 0xfd, 0xaa, 0xcc, 0x06, 0x00, 0x00, } diff --git a/mesh/v1alpha1/config.proto b/mesh/v1alpha1/config.proto index 3fc78ab46d..6cf076432b 100644 --- a/mesh/v1alpha1/config.proto +++ b/mesh/v1alpha1/config.proto @@ -104,7 +104,6 @@ message MeshConfig { // $hide_from_docs AuthPolicy auth_policy = 10 [deprecated=true]; - // $hide_from_docs // DEPRECATED. UNUSED. Polling interval for RDS (MUST BE >=1ms) google.protobuf.Duration rds_refresh_delay = 11 [deprecated=true]; @@ -116,10 +115,9 @@ message MeshConfig { // Empty value disables access logging. string access_log_file = 13; - // DEPRECATED. // Format for the proxy access log (text or json). // Default value is text. - string access_log_format = 24 [deprecated=true]; + string access_log_format = 24; // Default proxy config used by the proxy injection mechanism operating in the mesh // (e.g. Kubernetes admission controller) @@ -130,36 +128,27 @@ message MeshConfig { reserved 15; - // $hide_from_docs // DEPRECATED. UNUSED. Mixer address. This option will be removed soon. Please // use mixer_check and mixer_report. string mixer_address = 16 [deprecated=true]; - - // $hide_from_docs // DEPRECATED. UNUSED. message OutboundTrafficPolicy { - // $hide_from_docs // DEPRECATED. UNUSED. enum Mode { - // $hide_from_docs // outbound traffic will be restricted to services defined in the service registry as well as those defined // through ServiceEntries REGISTRY_ONLY = 0 [deprecated=true]; - // $hide_from_docs // outbound traffic to unknown destinations will be allowed ALLOW_ANY = 1 [deprecated=true]; - // $hide_from_docs // not implemented. outbound traffic will be restricted to destinations defined in VirtualServices only VIRTUAL_SERVICE_ONLY = 2 [deprecated=true]; } - // $hide_from_docs // DEPRECATED. UNUSED. Mode mode = 1 [deprecated=true]; } - // $hide_from_docs // DEPRECATED. UNUSED. // Set the default behavior of the sidecar for handling outbound traffic from the application. // While the default mode should work out of the box, if your application uses one or more external services that @@ -178,7 +167,6 @@ message MeshConfig { // Use secret-mount files instead of SDS if set to empty. string sds_uds_path = 20; - // $hide_from_docs // DEPRECATED. UNUSED. // Polling interval for SDS (MUST BE >=1ms) google.protobuf.Duration sds_refresh_delay = 21 [deprecated=true]; diff --git a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html index 8495af8802..f16fae5d0e 100644 --- a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html +++ b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html @@ -4,7 +4,7 @@ generator: protoc-gen-docs aliases: - /docs/reference/config/service-mesh.html -number_of_entries: 10 +number_of_entries: 12 ---

AuthenticationPolicy

@@ -149,6 +149,14 @@

MeshConfig

Defines whether to use Istio ingress controller for annotated or all ingress resources.

+ + + +rdsRefreshDelay +google.protobuf.Duration + +

DEPRECATED. UNUSED. Polling interval for RDS (MUST BE >=1ms)

+ @@ -169,12 +177,11 @@

MeshConfig

- + accessLogFormat string -

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

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

@@ -189,6 +196,29 @@

MeshConfig

and remain constant for the duration of the pod. The rest of the mesh config can be changed at runtime and config gets distributed dynamically.

+ + + +mixerAddress +string + +

DEPRECATED. UNUSED. Mixer address. This option will be removed soon. Please +use mixercheck and mixerreport.

+ + + + +outboundTrafficPolicy +MeshConfig.OutboundTrafficPolicy + +

DEPRECATED. UNUSED. +Set the default behavior of the sidecar for handling outbound traffic from the application. +While the default mode should work out of the box, if your application uses one or more external services that +are not known apriori, setting the policy to ALLOWANY will cause the sidecars to route traffic to the any +requested destination. +Users are strongly encouraged to use ServiceEntries to explicitly declare any external dependencies, +instead of using allowany.

+ @@ -206,6 +236,15 @@

MeshConfig

Unix Domain Socket through which envoy communicates with NodeAgent SDS to get key/cert for mTLS. Use secret-mount files instead of SDS if set to empty.

+ + + +sdsRefreshDelay +google.protobuf.Duration + +

DEPRECATED. UNUSED. +Polling interval for SDS (MUST BE >=1ms)

+ @@ -256,6 +295,67 @@

MeshConfig.IngressControllerMode

a secondary ingress controller (e.g., in addition to a cloud-provided ingress controller).

+ + + + +
+

MeshConfig.OutboundTrafficPolicy

+
+

DEPRECATED. UNUSED.

+ + + + + + + + + + + + + + + + +
FieldTypeDescription
modeMeshConfig.OutboundTrafficPolicy.Mode +

DEPRECATED. UNUSED.

+ +
+
+

MeshConfig.OutboundTrafficPolicy.Mode

+
+

DEPRECATED. UNUSED.

+ + + + + + + + + + + + + + + + + + + + @@ -436,6 +536,15 @@

ProxyConfig

+ + + + + @@ -469,6 +578,17 @@

ProxyConfig

+ + + + + diff --git a/mesh/v1alpha1/proxy.pb.go b/mesh/v1alpha1/proxy.pb.go index 0f163e5fcd..02759f5f4e 100644 --- a/mesh/v1alpha1/proxy.pb.go +++ b/mesh/v1alpha1/proxy.pb.go @@ -298,7 +298,6 @@ type ProxyConfig struct { ParentShutdownDuration *google_protobuf.Duration `protobuf:"bytes,5,opt,name=parent_shutdown_duration,json=parentShutdownDuration" json:"parent_shutdown_duration,omitempty"` // Address of the discovery service exposing xDS with mTLS connection. DiscoveryAddress string `protobuf:"bytes,6,opt,name=discovery_address,json=discoveryAddress,proto3" json:"discovery_address,omitempty"` - // $hide_from_docs // DEPRECATED. UNUSED. // Polling interval for service discovery (used by EDS, CDS, LDS, but not RDS). (MUST BE >=1ms) DiscoveryRefreshDelay *google_protobuf.Duration `protobuf:"bytes,7,opt,name=discovery_refresh_delay,json=discoveryRefreshDelay" json:"discovery_refresh_delay,omitempty"` @@ -311,7 +310,6 @@ type ProxyConfig struct { StatsdUdpAddress string `protobuf:"bytes,10,opt,name=statsd_udp_address,json=statsdUdpAddress,proto3" json:"statsd_udp_address,omitempty"` // Port on which Envoy should listen for administrative commands. ProxyAdminPort int32 `protobuf:"varint,11,opt,name=proxy_admin_port,json=proxyAdminPort,proto3" json:"proxy_admin_port,omitempty"` - // $hide_from_docs // DEPRECATED. UNUSED. // The availability zone where this Envoy instance is running. When running // Envoy as a sidecar in Kubernetes, this flag must be one of the availability diff --git a/mesh/v1alpha1/proxy.proto b/mesh/v1alpha1/proxy.proto index 6a917da16d..edb2322a61 100644 --- a/mesh/v1alpha1/proxy.proto +++ b/mesh/v1alpha1/proxy.proto @@ -106,7 +106,6 @@ message ProxyConfig { // Address of the discovery service exposing xDS with mTLS connection. string discovery_address = 6; - // $hide_from_docs // DEPRECATED. UNUSED. // Polling interval for service discovery (used by EDS, CDS, LDS, but not RDS). (MUST BE >=1ms) google.protobuf.Duration discovery_refresh_delay = 7 [deprecated=true]; @@ -124,7 +123,6 @@ message ProxyConfig { // Port on which Envoy should listen for administrative commands. int32 proxy_admin_port = 11; - // $hide_from_docs // DEPRECATED. UNUSED. // The availability zone where this Envoy instance is running. When running // Envoy as a sidecar in Kubernetes, this flag must be one of the availability diff --git a/python/istio_api/mesh/v1alpha1/config_pb2.py b/python/istio_api/mesh/v1alpha1/config_pb2.py index b686c0536a..7b812eb962 100644 --- a/python/istio_api/mesh/v1alpha1/config_pb2.py +++ b/python/istio_api/mesh/v1alpha1/config_pb2.py @@ -21,7 +21,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\"\xac\t\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\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\x1d\n\x11\x61\x63\x63\x65ss_log_format\x18\x18 \x01(\tB\x02\x18\x01\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\x16\n\x0egalley_address\x18\x16 \x01(\t\x12\x1e\n\x16\x65nable_sds_token_mount\x18\x17 \x01(\x08\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\x42\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\"\xa8\t\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\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\x16\n\x0egalley_address\x18\x16 \x01(\t\x12\x1e\n\x16\x65nable_sds_token_mount\x18\x17 \x01(\x08\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\x42\x1cZ\x1aistio.io/api/mesh/v1alpha1b\x06proto3') , dependencies=[google_dot_protobuf_dot_duration__pb2.DESCRIPTOR,mesh_dot_v1alpha1_dot_proxy__pb2.DESCRIPTOR,]) @@ -48,8 +48,8 @@ ], containing_type=None, options=None, - serialized_start=1118, - serialized_end=1196, + serialized_start=1114, + serialized_end=1192, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_OUTBOUNDTRAFFICPOLICY_MODE) @@ -74,8 +74,8 @@ ], containing_type=None, options=None, - serialized_start=1198, - serialized_end=1255, + serialized_start=1194, + serialized_end=1251, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_INGRESSCONTROLLERMODE) @@ -96,8 +96,8 @@ ], containing_type=None, options=None, - serialized_start=1257, - serialized_end=1295, + serialized_start=1253, + serialized_end=1291, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_AUTHPOLICY) @@ -129,8 +129,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1015, - serialized_end=1196, + serialized_start=1011, + serialized_end=1192, ) _MESHCONFIG = _descriptor.Descriptor( @@ -237,7 +237,7 @@ 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='default_config', full_name='istio.mesh.v1alpha1.MeshConfig.default_config', index=14, number=14, type=11, cpp_type=10, label=1, @@ -309,7 +309,7 @@ oneofs=[ ], serialized_start=111, - serialized_end=1307, + serialized_end=1303, ) _MESHCONFIG_OUTBOUNDTRAFFICPOLICY.fields_by_name['mode'].enum_type = _MESHCONFIG_OUTBOUNDTRAFFICPOLICY_MODE @@ -357,8 +357,6 @@ _MESHCONFIG.fields_by_name['auth_policy']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')) _MESHCONFIG.fields_by_name['rds_refresh_delay'].has_options = True _MESHCONFIG.fields_by_name['rds_refresh_delay']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')) -_MESHCONFIG.fields_by_name['access_log_format'].has_options = True -_MESHCONFIG.fields_by_name['access_log_format']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')) _MESHCONFIG.fields_by_name['mixer_address'].has_options = True _MESHCONFIG.fields_by_name['mixer_address']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')) _MESHCONFIG.fields_by_name['outbound_traffic_policy'].has_options = True
NameDescription
REGISTRY_ONLY +

outbound traffic will be restricted to services defined in the service registry as well as those defined +through ServiceEntries

+ +
ALLOW_ANY +

outbound traffic to unknown destinations will be allowed

+ +
VIRTUAL_SERVICE_ONLY +

not implemented. outbound traffic will be restricted to destinations defined in VirtualServices only

+

Address of the discovery service exposing xDS with mTLS connection.

+
discoveryRefreshDelaygoogle.protobuf.Duration +

DEPRECATED. UNUSED. +Polling interval for service discovery (used by EDS, CDS, LDS, but not RDS). (MUST BE >=1ms)

+

Port on which Envoy should listen for administrative commands.

+
availabilityZonestring +

DEPRECATED. UNUSED. +The availability zone where this Envoy instance is running. When running +Envoy as a sidecar in Kubernetes, this flag must be one of the availability +zones assigned to a node using failure-domain.beta.kubernetes.io/zone annotation.

+