From 9a5e7b5f76eaa14bb5119f8d175bf884134b4c2d Mon Sep 17 00:00:00 2001 From: Gregory Hanson Date: Tue, 5 Mar 2019 13:41:16 -0600 Subject: [PATCH 1/2] add configurable dns refresh rate to mesh for strict dns cluster, issue #12181 --- mesh/v1alpha1/config.pb.go | 260 ++++++++++++------- mesh/v1alpha1/config.proto | 4 +- mesh/v1alpha1/istio.mesh.v1alpha1.pb.html | 8 + python/istio_api/mesh/v1alpha1/config_pb2.py | 52 ++-- 4 files changed, 202 insertions(+), 122 deletions(-) diff --git a/mesh/v1alpha1/config.pb.go b/mesh/v1alpha1/config.pb.go index b8950e80436..2adfe66184f 100644 --- a/mesh/v1alpha1/config.pb.go +++ b/mesh/v1alpha1/config.pb.go @@ -313,10 +313,12 @@ type MeshConfig struct { // configuring the control-plane runtime from configuration of the mesh. RootNamespace string `protobuf:"bytes,34,opt,name=root_namespace,json=rootNamespace,proto3" json:"root_namespace,omitempty"` // Locality based load balancing distribution or failover settings. - LocalityLbSetting *LocalityLoadBalancerSetting `protobuf:"bytes,35,opt,name=locality_lb_setting,json=localityLbSetting,proto3" json:"locality_lb_setting,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + LocalityLbSetting *LocalityLoadBalancerSetting `protobuf:"bytes,35,opt,name=locality_lb_setting,json=localityLbSetting,proto3" json:"locality_lb_setting,omitempty"` + // Configures DNS refresh rate for Envoy clusters of type STRICT_DNS + DnsRefreshRate *types.Duration `protobuf:"bytes,36,opt,name=dns_refresh_rate,json=dnsRefreshRate,proto3" json:"dns_refresh_rate,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *MeshConfig) Reset() { *m = MeshConfig{} } @@ -587,6 +589,13 @@ func (m *MeshConfig) GetLocalityLbSetting() *LocalityLoadBalancerSetting { return nil } +func (m *MeshConfig) GetDnsRefreshRate() *types.Duration { + if m != nil { + return m.DnsRefreshRate + } + return nil +} + type MeshConfig_OutboundTrafficPolicy struct { Mode MeshConfig_OutboundTrafficPolicy_Mode `protobuf:"varint,1,opt,name=mode,proto3,enum=istio.mesh.v1alpha1.MeshConfig_OutboundTrafficPolicy_Mode" json:"mode,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -958,99 +967,100 @@ func init() { func init() { proto.RegisterFile("mesh/v1alpha1/config.proto", fileDescriptor_b5c7ece76d5d5022) } var fileDescriptor_b5c7ece76d5d5022 = []byte{ - // 1461 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xdd, 0x72, 0xdb, 0xb8, - 0x15, 0x36, 0x65, 0x25, 0x96, 0x8f, 0x7e, 0x4c, 0xc1, 0x71, 0x96, 0x56, 0xba, 0x5e, 0x59, 0x3b, - 0x49, 0x34, 0x9e, 0x0e, 0xdd, 0xd8, 0xb3, 0x33, 0xc9, 0xf6, 0xca, 0x96, 0xe4, 0x8d, 0xbd, 0xb2, - 0xe5, 0xa1, 0xe8, 0xb4, 0x69, 0x2f, 0x50, 0x98, 0x84, 0x24, 0xd4, 0x14, 0xc1, 0x21, 0x40, 0x27, - 0x7a, 0xa7, 0x76, 0xa6, 0x8f, 0xd1, 0xcb, 0x3e, 0x42, 0x27, 0x77, 0x7d, 0x8b, 0x0e, 0x01, 0xd2, - 0x52, 0xbc, 0x9a, 0xb8, 0xe9, 0xde, 0x11, 0xdf, 0xf9, 0xce, 0x07, 0xe2, 0x9c, 0x83, 0x8f, 0x84, - 0xc6, 0x94, 0x8a, 0xc9, 0xfe, 0xed, 0x2b, 0x12, 0x44, 0x13, 0xf2, 0x6a, 0xdf, 0xe3, 0xe1, 0x88, - 0x8d, 0xed, 0x28, 0xe6, 0x92, 0xa3, 0x4d, 0x26, 0x24, 0xe3, 0x76, 0xca, 0xb0, 0x73, 0x46, 0x63, - 0x67, 0xcc, 0xf9, 0x38, 0xa0, 0xfb, 0x8a, 0x72, 0x9d, 0x8c, 0xf6, 0xfd, 0x24, 0x26, 0x92, 0xf1, - 0x50, 0x27, 0x35, 0xb6, 0x3f, 0x17, 0x8c, 0x62, 0xfe, 0x71, 0x96, 0x85, 0xf6, 0x42, 0x2a, 0x3f, - 0xf0, 0xf8, 0x86, 0x85, 0xe3, 0x9c, 0x70, 0xb8, 0xef, 0x53, 0x21, 0x59, 0xa8, 0x14, 0x70, 0x9c, - 0x04, 0x54, 0x73, 0x5b, 0xff, 0x41, 0x00, 0xe7, 0x54, 0x4c, 0x3a, 0xea, 0x85, 0xd0, 0x6f, 0x01, - 0x4d, 0xd9, 0x47, 0x1a, 0x63, 0x6f, 0x42, 0xbd, 0x1b, 0x2c, 0x68, 0x7c, 0x4b, 0x63, 0xcb, 0x68, - 0x1a, 0xed, 0x75, 0xc7, 0x54, 0x91, 0x4e, 0x1a, 0x18, 0x2a, 0x1c, 0xd9, 0xb0, 0xa9, 0xd9, 0x31, - 0x8d, 0x78, 0x2c, 0x73, 0x7a, 0x41, 0xd1, 0xeb, 0x2a, 0xe4, 0xa8, 0x48, 0xc6, 0x3f, 0x80, 0x2d, - 0x9f, 0x09, 0x72, 0x1d, 0x50, 0x1c, 0xf1, 0x80, 0x79, 0x33, 0xbd, 0x8d, 0xb0, 0x56, 0x9b, 0x46, - 0xbb, 0xe4, 0x6c, 0x66, 0xc1, 0x4b, 0x15, 0x53, 0x1b, 0x09, 0x74, 0x08, 0x4f, 0x17, 0xb9, 0x78, - 0x44, 0x58, 0x80, 0x79, 0x44, 0x43, 0x6b, 0x5b, 0x27, 0x45, 0x73, 0xf6, 0x09, 0x61, 0xc1, 0x20, - 0xa2, 0x21, 0xba, 0x84, 0xe7, 0x82, 0xf9, 0xd4, 0x23, 0x31, 0x96, 0x1c, 0x4b, 0x1a, 0xd0, 0x29, - 0x95, 0xf1, 0x0c, 0x0b, 0x2a, 0x44, 0x5a, 0x00, 0x32, 0x1a, 0xb1, 0x90, 0xc9, 0x99, 0xb5, 0xa3, - 0x34, 0x76, 0x33, 0xb2, 0xcb, 0xdd, 0x9c, 0x3a, 0xd4, 0xcc, 0xa3, 0x8c, 0x88, 0xf6, 0xa0, 0xae, - 0x4a, 0x8c, 0x03, 0x26, 0x24, 0x0d, 0x71, 0x7a, 0x2a, 0xab, 0xd8, 0x34, 0xda, 0x8f, 0x9c, 0x0d, - 0x15, 0xe8, 0x2b, 0xfc, 0x92, 0xc7, 0x12, 0xbd, 0x00, 0x0d, 0xe1, 0x89, 0x94, 0x91, 0x66, 0x3e, - 0x52, 0xcc, 0xaa, 0x82, 0xdf, 0x4a, 0x19, 0x29, 0xde, 0x31, 0x6c, 0x78, 0x3c, 0x0c, 0xa9, 0x27, - 0xb1, 0x64, 0x53, 0xca, 0x13, 0x69, 0x3d, 0x6e, 0x1a, 0xed, 0xf2, 0xc1, 0xb6, 0xad, 0x9b, 0x6f, - 0xe7, 0xcd, 0xb7, 0xbb, 0x59, 0xf3, 0x9d, 0x5a, 0x96, 0xe1, 0xea, 0x04, 0xc4, 0xa1, 0x2a, 0xbd, - 0x08, 0xdf, 0x50, 0x1a, 0x91, 0x80, 0xdd, 0x52, 0xeb, 0x37, 0x4a, 0xe1, 0xcc, 0xd6, 0x33, 0x35, - 0x9f, 0x84, 0x7c, 0xb2, 0x0e, 0xed, 0x8e, 0x56, 0x60, 0x3c, 0xbc, 0xe4, 0x3c, 0x18, 0x52, 0x29, - 0x59, 0x38, 0x16, 0xb6, 0xdb, 0xb9, 0x9c, 0x3f, 0x7b, 0xd1, 0xcf, 0xb9, 0xa2, 0x53, 0x91, 0x0b, - 0x2b, 0xf4, 0x3d, 0x54, 0x59, 0x38, 0x8e, 0xa9, 0x10, 0xd8, 0x0b, 0x88, 0x10, 0xd6, 0x9a, 0xea, - 0x76, 0x25, 0x03, 0x3b, 0x29, 0x86, 0x5e, 0xc2, 0x46, 0x4e, 0x4a, 0x67, 0x82, 0x79, 0xd4, 0x2a, - 0x29, 0x5a, 0x2d, 0x83, 0x87, 0x1a, 0x45, 0x53, 0xf8, 0xe6, 0x4e, 0x8d, 0x87, 0x32, 0xe6, 0x41, - 0x40, 0x63, 0x3c, 0xe5, 0x3e, 0xb5, 0xd6, 0x9b, 0x46, 0xbb, 0x76, 0xf0, 0x83, 0xbd, 0xe4, 0x72, - 0xd8, 0xf3, 0x89, 0xb5, 0x4f, 0xb3, 0x7d, 0xef, 0xb2, 0xcf, 0xb9, 0x4f, 0x9d, 0x2d, 0xb6, 0x0c, - 0x46, 0x03, 0x28, 0x93, 0x44, 0x4e, 0xb2, 0xe9, 0xb3, 0x40, 0x6d, 0xb1, 0xf7, 0xd0, 0x16, 0x47, - 0x89, 0x9c, 0xe8, 0x99, 0x3c, 0x2e, 0x58, 0x86, 0x03, 0xe4, 0x6e, 0x8d, 0x4e, 0xa1, 0x1e, 0xfb, - 0x02, 0xc7, 0x74, 0x14, 0x53, 0x31, 0xc1, 0x3e, 0x0d, 0xc8, 0xcc, 0x2a, 0x3f, 0xd0, 0x44, 0xa5, - 0xb2, 0x11, 0xfb, 0xc2, 0xd1, 0x69, 0xdd, 0x34, 0x0b, 0x3d, 0x87, 0x1a, 0x0d, 0xd5, 0xdd, 0x90, - 0x31, 0xf1, 0x58, 0x38, 0xb6, 0x2a, 0x6a, 0x38, 0xab, 0x1a, 0x75, 0x35, 0x98, 0x0e, 0x17, 0xf1, - 0xbc, 0xb4, 0x60, 0x01, 0x1f, 0xe3, 0x11, 0x0b, 0xa8, 0x55, 0x55, 0xa5, 0xad, 0x6a, 0xb8, 0xcf, - 0xc7, 0x27, 0x2c, 0xa0, 0xe9, 0xc0, 0x2e, 0xf2, 0x78, 0x3c, 0x25, 0xd2, 0xb2, 0x14, 0x73, 0x63, - 0xce, 0x54, 0x30, 0x22, 0xb0, 0xb9, 0xc0, 0xa5, 0xa1, 0xc7, 0xfd, 0x74, 0xff, 0x67, 0xaa, 0x3c, - 0xaf, 0x1e, 0x2c, 0x4f, 0xae, 0xd6, 0xcb, 0x12, 0x9d, 0x3a, 0xb9, 0x0f, 0xa1, 0x9f, 0xa0, 0xe6, - 0xd3, 0x11, 0x49, 0x02, 0x89, 0xb5, 0xf7, 0x59, 0x35, 0x55, 0xa5, 0xe6, 0x52, 0xf5, 0xcb, 0xf4, - 0x9e, 0x68, 0x79, 0xa7, 0x9a, 0xe5, 0x65, 0x0e, 0xf5, 0x12, 0xaa, 0xda, 0x73, 0x88, 0xef, 0xa7, - 0x1d, 0xb6, 0xcc, 0xf4, 0x4c, 0xaa, 0xa4, 0x15, 0x15, 0x38, 0xd2, 0x78, 0x3a, 0x5a, 0x3c, 0x91, - 0xd7, 0x3c, 0x09, 0xfd, 0xb4, 0xa2, 0xa3, 0x11, 0xf3, 0xf2, 0xbe, 0xd7, 0xd5, 0xd6, 0x0f, 0x8e, - 0xd6, 0x20, 0x4b, 0x77, 0x75, 0xb6, 0x6e, 0xb9, 0xb3, 0xc5, 0x97, 0xc1, 0xa8, 0x0b, 0xdf, 0x65, - 0xed, 0xf3, 0x02, 0x46, 0x43, 0x89, 0x53, 0x4f, 0xf9, 0xcc, 0xe6, 0xac, 0x4d, 0xd5, 0xcf, 0x67, - 0x9a, 0xd6, 0x51, 0xac, 0x21, 0xf3, 0x17, 0xed, 0x0e, 0x35, 0xa1, 0x22, 0x7c, 0x81, 0x13, 0x5f, - 0xe0, 0x88, 0xc8, 0x89, 0xf5, 0x44, 0x35, 0x0c, 0x84, 0x2f, 0xae, 0x7c, 0x71, 0x49, 0xe4, 0x24, - 0x9d, 0x38, 0xf1, 0x8b, 0x89, 0xdb, 0xfa, 0x9f, 0x26, 0x4e, 0xdc, 0x9b, 0xb8, 0xb7, 0x50, 0xd3, - 0xbd, 0xc0, 0x82, 0x27, 0xb1, 0x47, 0x85, 0xf5, 0xb4, 0xb9, 0xda, 0x2e, 0x1f, 0xec, 0x2e, 0x2d, - 0x8c, 0x2e, 0xca, 0x50, 0x31, 0x9d, 0xaa, 0xb7, 0xb0, 0x52, 0x26, 0x9d, 0x1d, 0x3e, 0x7d, 0x37, - 0xc9, 0x6f, 0x68, 0x88, 0xa7, 0x3c, 0x09, 0xa5, 0xf5, 0x8d, 0x36, 0x69, 0x1d, 0x1d, 0xfa, 0xc2, - 0x4d, 0x63, 0xe7, 0x69, 0x08, 0xed, 0x01, 0x52, 0x67, 0x15, 0x14, 0xdf, 0xbc, 0x16, 0x58, 0x10, - 0xfc, 0xd7, 0x0f, 0xd2, 0xfa, 0x56, 0x25, 0xd4, 0xd2, 0x13, 0x0b, 0xfa, 0xf3, 0x6b, 0x31, 0x24, - 0x67, 0x1f, 0x24, 0xda, 0x85, 0x8a, 0x8c, 0x13, 0x21, 0xb1, 0xcf, 0xa7, 0x84, 0x85, 0x56, 0x43, - 0xd5, 0xa5, 0xac, 0xb0, 0xae, 0x82, 0xd0, 0x1b, 0xd8, 0xce, 0x27, 0x2c, 0xf3, 0x1c, 0x4c, 0x3f, - 0xaa, 0xcf, 0x92, 0xe4, 0xd6, 0x77, 0xcd, 0xd5, 0xf6, 0xba, 0xf3, 0x34, 0x23, 0x64, 0xee, 0xd3, - 0x53, 0x61, 0x97, 0xa3, 0xb7, 0xb0, 0x9b, 0xa7, 0xde, 0xb2, 0x58, 0x26, 0x24, 0x58, 0x22, 0xd1, - 0x54, 0x12, 0xdf, 0x66, 0xc4, 0x77, 0x9a, 0x77, 0x5f, 0xe9, 0x0c, 0x5a, 0xb9, 0xd2, 0xfd, 0x0f, - 0xee, 0x82, 0xd4, 0xae, 0x92, 0xda, 0xc9, 0x98, 0xdd, 0x39, 0xd1, 0x49, 0x82, 0xb9, 0xd6, 0x73, - 0xa8, 0xc5, 0x9c, 0x4b, 0x1c, 0x92, 0x29, 0x15, 0x11, 0xf1, 0xa8, 0xd5, 0xd2, 0x17, 0x3d, 0x45, - 0x2f, 0x72, 0x10, 0xfd, 0x05, 0x36, 0x03, 0xee, 0x91, 0x80, 0xc9, 0x19, 0x0e, 0xae, 0xb1, 0xd0, - 0x1e, 0x6e, 0x7d, 0xaf, 0x46, 0xe2, 0x77, 0x4b, 0x5b, 0xd9, 0xcf, 0xf8, 0x7d, 0x4e, 0xfc, 0x63, - 0x12, 0x90, 0xd0, 0xa3, 0x71, 0xe6, 0xfd, 0x4e, 0x3d, 0x17, 0xeb, 0x5f, 0x67, 0x50, 0xe3, 0xef, - 0x06, 0x6c, 0x2d, 0xbd, 0x0b, 0xe8, 0x02, 0x8a, 0xca, 0xab, 0x0d, 0xe5, 0x14, 0x3f, 0xfe, 0x5f, - 0x17, 0xca, 0x56, 0x86, 0xad, 0x74, 0x5a, 0x5d, 0x28, 0x2a, 0x9f, 0xae, 0x43, 0xd5, 0xe9, 0xfd, - 0x74, 0x3a, 0x74, 0x9d, 0xf7, 0x78, 0x70, 0xd1, 0x7f, 0x6f, 0xae, 0xa0, 0x2a, 0xac, 0x1f, 0xf5, - 0xfb, 0x83, 0x3f, 0xe0, 0xa3, 0x8b, 0xf7, 0xa6, 0xd1, 0x2a, 0x96, 0x0a, 0x66, 0x61, 0xef, 0xc9, - 0xbb, 0x53, 0xc7, 0xbd, 0x3a, 0xea, 0xe3, 0x61, 0xcf, 0x79, 0x77, 0xda, 0xe9, 0x29, 0x72, 0xeb, - 0x0d, 0x6c, 0x2d, 0xfd, 0x2a, 0xa0, 0x35, 0x58, 0x1d, 0x9c, 0x9c, 0x98, 0x2b, 0xa8, 0x0c, 0x6b, - 0xdd, 0xde, 0xc9, 0xd1, 0x55, 0xdf, 0x35, 0x0d, 0x04, 0xf0, 0x78, 0xe8, 0x3a, 0xa7, 0x1d, 0xd7, - 0x2c, 0xb4, 0x5e, 0x00, 0xcc, 0xdd, 0x1e, 0x95, 0xa0, 0x78, 0x31, 0xb8, 0xe8, 0x99, 0x2b, 0xa8, - 0x06, 0x70, 0x7e, 0xa5, 0x76, 0x72, 0xfb, 0x43, 0xd3, 0x68, 0xbd, 0x84, 0xfa, 0x2f, 0x6c, 0x2f, - 0xa5, 0xbb, 0xbd, 0x3f, 0xba, 0xe6, 0x4a, 0xfa, 0x74, 0x36, 0x1c, 0x5c, 0x98, 0xc6, 0x59, 0xb1, - 0xb4, 0x61, 0x9a, 0x67, 0xc5, 0x12, 0x32, 0x37, 0x5b, 0x02, 0x2a, 0x8b, 0x97, 0x08, 0x59, 0xb0, - 0x96, 0x9b, 0x98, 0xfe, 0xc3, 0xca, 0x97, 0xe8, 0x14, 0x2a, 0x32, 0x10, 0x79, 0x2f, 0x85, 0xfa, - 0xa3, 0x2a, 0x1f, 0xbc, 0xf8, 0xc2, 0x47, 0xdd, 0xed, 0x0f, 0xf3, 0xaf, 0xb7, 0x53, 0x96, 0x81, - 0xc8, 0x17, 0xad, 0x7f, 0xac, 0xc2, 0xb3, 0x2f, 0xf4, 0x1b, 0xfd, 0x19, 0xc0, 0x67, 0x42, 0xc6, - 0xec, 0x3a, 0x91, 0x69, 0x23, 0x53, 0x03, 0xf8, 0xfd, 0xd7, 0x4e, 0x8d, 0xdd, 0xbd, 0x93, 0x70, - 0x16, 0xe4, 0xd0, 0x15, 0x94, 0xd2, 0xff, 0x35, 0xae, 0xff, 0x0a, 0x53, 0xe9, 0x37, 0x5f, 0x2d, - 0x7d, 0x92, 0x09, 0x38, 0x77, 0x52, 0x8d, 0xbf, 0x19, 0x00, 0xf3, 0x1d, 0x11, 0x82, 0xe2, 0x28, - 0xe6, 0xd3, 0xac, 0x88, 0xea, 0x19, 0x0d, 0xa1, 0x20, 0x79, 0xb6, 0x67, 0xe7, 0x57, 0x1c, 0xc7, - 0x76, 0x79, 0x2f, 0x94, 0xf1, 0xcc, 0x29, 0x48, 0xde, 0xf8, 0x01, 0xd6, 0xb2, 0x25, 0x32, 0x61, - 0xf5, 0x86, 0xce, 0xb2, 0x2d, 0xd3, 0x47, 0xf4, 0x04, 0x1e, 0xdd, 0x92, 0x20, 0xa1, 0xaa, 0x59, - 0x55, 0x47, 0x2f, 0x7e, 0x2c, 0xbc, 0x36, 0x1a, 0x36, 0x94, 0xf2, 0x43, 0x2c, 0x7d, 0xd7, 0x5a, - 0xf6, 0xae, 0x29, 0x52, 0x90, 0xfc, 0xb8, 0xfd, 0xcf, 0x4f, 0x3b, 0xc6, 0xbf, 0x3e, 0xed, 0x18, - 0xff, 0xfe, 0xb4, 0x63, 0xfc, 0xa9, 0xa1, 0x5f, 0x9e, 0xf1, 0x7d, 0x12, 0xb1, 0xfd, 0xcf, 0xfe, - 0xfa, 0xaf, 0x1f, 0x2b, 0xa7, 0x3f, 0xfc, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5b, 0xff, 0xe8, - 0x08, 0x5e, 0x0c, 0x00, 0x00, + // 1482 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x57, 0xdd, 0x72, 0xdb, 0xb8, + 0x15, 0x0e, 0x65, 0x25, 0x96, 0x8f, 0x7e, 0x4c, 0x41, 0x71, 0x96, 0x56, 0xba, 0x5e, 0x59, 0xdb, + 0x24, 0x1a, 0x4f, 0x87, 0x6e, 0xec, 0xd9, 0x99, 0x64, 0x7b, 0x65, 0x4b, 0xf2, 0xc6, 0x5e, 0xd9, + 0xf2, 0x50, 0x74, 0xda, 0xb4, 0x17, 0x28, 0x4c, 0x42, 0x12, 0x6a, 0x8a, 0xe0, 0x10, 0xa0, 0x13, + 0xbd, 0x53, 0xdb, 0xe9, 0x63, 0xf4, 0xb2, 0x8f, 0xd0, 0xc9, 0x93, 0x74, 0x08, 0x90, 0x96, 0xe2, + 0xd5, 0xac, 0xbb, 0xed, 0x9d, 0xf0, 0x9d, 0xef, 0x7c, 0x20, 0xce, 0xf9, 0x70, 0x48, 0x41, 0x73, + 0x46, 0xc5, 0x74, 0xff, 0xf6, 0x35, 0x09, 0xa2, 0x29, 0x79, 0xbd, 0xef, 0xf1, 0x70, 0xcc, 0x26, + 0x76, 0x14, 0x73, 0xc9, 0x51, 0x83, 0x09, 0xc9, 0xb8, 0x9d, 0x32, 0xec, 0x9c, 0xd1, 0xdc, 0x99, + 0x70, 0x3e, 0x09, 0xe8, 0xbe, 0xa2, 0x5c, 0x27, 0xe3, 0x7d, 0x3f, 0x89, 0x89, 0x64, 0x3c, 0xd4, + 0x49, 0xcd, 0xed, 0x2f, 0x05, 0xa3, 0x98, 0x7f, 0x9a, 0x67, 0xa1, 0xbd, 0x90, 0xca, 0x8f, 0x3c, + 0xbe, 0x61, 0xe1, 0x24, 0x27, 0x1c, 0xee, 0xfb, 0x54, 0x48, 0x16, 0x2a, 0x05, 0x1c, 0x27, 0x01, + 0xd5, 0xdc, 0xf6, 0xdf, 0x1b, 0x00, 0xe7, 0x54, 0x4c, 0xbb, 0xea, 0x81, 0xd0, 0x6f, 0x00, 0xcd, + 0xd8, 0x27, 0x1a, 0x63, 0x6f, 0x4a, 0xbd, 0x1b, 0x2c, 0x68, 0x7c, 0x4b, 0x63, 0xcb, 0x68, 0x19, + 0x9d, 0x0d, 0xc7, 0x54, 0x91, 0x6e, 0x1a, 0x18, 0x29, 0x1c, 0xd9, 0xd0, 0xd0, 0xec, 0x98, 0x46, + 0x3c, 0x96, 0x39, 0xbd, 0xa0, 0xe8, 0x75, 0x15, 0x72, 0x54, 0x24, 0xe3, 0x1f, 0xc0, 0x96, 0xcf, + 0x04, 0xb9, 0x0e, 0x28, 0x8e, 0x78, 0xc0, 0xbc, 0xb9, 0xde, 0x46, 0x58, 0x6b, 0x2d, 0xa3, 0x53, + 0x72, 0x1a, 0x59, 0xf0, 0x52, 0xc5, 0xd4, 0x46, 0x02, 0x1d, 0xc2, 0xb3, 0x65, 0x2e, 0x1e, 0x13, + 0x16, 0x60, 0x1e, 0xd1, 0xd0, 0xda, 0xd6, 0x49, 0xd1, 0x82, 0x7d, 0x42, 0x58, 0x30, 0x8c, 0x68, + 0x88, 0x2e, 0xe1, 0x85, 0x60, 0x3e, 0xf5, 0x48, 0x8c, 0x25, 0xc7, 0x92, 0x06, 0x74, 0x46, 0x65, + 0x3c, 0xc7, 0x82, 0x0a, 0x91, 0x16, 0x80, 0x8c, 0xc7, 0x2c, 0x64, 0x72, 0x6e, 0xed, 0x28, 0x8d, + 0xdd, 0x8c, 0xec, 0x72, 0x37, 0xa7, 0x8e, 0x34, 0xf3, 0x28, 0x23, 0xa2, 0x3d, 0xa8, 0xab, 0x12, + 0xe3, 0x80, 0x09, 0x49, 0x43, 0x9c, 0x9e, 0xca, 0x2a, 0xb6, 0x8c, 0xce, 0x63, 0x67, 0x53, 0x05, + 0x06, 0x0a, 0xbf, 0xe4, 0xb1, 0x44, 0x2f, 0x41, 0x43, 0x78, 0x2a, 0x65, 0xa4, 0x99, 0x8f, 0x15, + 0xb3, 0xaa, 0xe0, 0x77, 0x52, 0x46, 0x8a, 0x77, 0x0c, 0x9b, 0x1e, 0x0f, 0x43, 0xea, 0x49, 0x2c, + 0xd9, 0x8c, 0xf2, 0x44, 0x5a, 0x4f, 0x5a, 0x46, 0xa7, 0x7c, 0xb0, 0x6d, 0xeb, 0xe6, 0xdb, 0x79, + 0xf3, 0xed, 0x5e, 0xd6, 0x7c, 0xa7, 0x96, 0x65, 0xb8, 0x3a, 0x01, 0x71, 0xa8, 0x4a, 0x2f, 0xc2, + 0x37, 0x94, 0x46, 0x24, 0x60, 0xb7, 0xd4, 0xfa, 0x95, 0x52, 0x38, 0xb3, 0xb5, 0xa7, 0x16, 0x4e, + 0xc8, 0x9d, 0x75, 0x68, 0x77, 0xb5, 0x02, 0xe3, 0xe1, 0x25, 0xe7, 0xc1, 0x88, 0x4a, 0xc9, 0xc2, + 0x89, 0xb0, 0xdd, 0xee, 0xe5, 0xe2, 0xb7, 0x17, 0xfd, 0x98, 0x2b, 0x3a, 0x15, 0xb9, 0xb4, 0x42, + 0xdf, 0x42, 0x95, 0x85, 0x93, 0x98, 0x0a, 0x81, 0xbd, 0x80, 0x08, 0x61, 0xad, 0xab, 0x6e, 0x57, + 0x32, 0xb0, 0x9b, 0x62, 0xe8, 0x15, 0x6c, 0xe6, 0xa4, 0xd4, 0x13, 0xcc, 0xa3, 0x56, 0x49, 0xd1, + 0x6a, 0x19, 0x3c, 0xd2, 0x28, 0x9a, 0xc1, 0x57, 0x77, 0x6a, 0x3c, 0x94, 0x31, 0x0f, 0x02, 0x1a, + 0xe3, 0x19, 0xf7, 0xa9, 0xb5, 0xd1, 0x32, 0x3a, 0xb5, 0x83, 0xef, 0xec, 0x15, 0x97, 0xc3, 0x5e, + 0x38, 0xd6, 0x3e, 0xcd, 0xf6, 0xbd, 0xcb, 0x3e, 0xe7, 0x3e, 0x75, 0xb6, 0xd8, 0x2a, 0x18, 0x0d, + 0xa1, 0x4c, 0x12, 0x39, 0xcd, 0xdc, 0x67, 0x81, 0xda, 0x62, 0xef, 0xa1, 0x2d, 0x8e, 0x12, 0x39, + 0xd5, 0x9e, 0x3c, 0x2e, 0x58, 0x86, 0x03, 0xe4, 0x6e, 0x8d, 0x4e, 0xa1, 0x1e, 0xfb, 0x02, 0xc7, + 0x74, 0x1c, 0x53, 0x31, 0xc5, 0x3e, 0x0d, 0xc8, 0xdc, 0x2a, 0x3f, 0xd0, 0x44, 0xa5, 0xb2, 0x19, + 0xfb, 0xc2, 0xd1, 0x69, 0xbd, 0x34, 0x0b, 0xbd, 0x80, 0x1a, 0x0d, 0xd5, 0xdd, 0x90, 0x31, 0xf1, + 0x58, 0x38, 0xb1, 0x2a, 0xca, 0x9c, 0x55, 0x8d, 0xba, 0x1a, 0x4c, 0xcd, 0x45, 0x3c, 0x2f, 0x2d, + 0x58, 0xc0, 0x27, 0x78, 0xcc, 0x02, 0x6a, 0x55, 0x55, 0x69, 0xab, 0x1a, 0x1e, 0xf0, 0xc9, 0x09, + 0x0b, 0x68, 0x6a, 0xd8, 0x65, 0x1e, 0x8f, 0x67, 0x44, 0x5a, 0x96, 0x62, 0x6e, 0x2e, 0x98, 0x0a, + 0x46, 0x04, 0x1a, 0x4b, 0x5c, 0x1a, 0x7a, 0xdc, 0x4f, 0xf7, 0x7f, 0xae, 0xca, 0xf3, 0xfa, 0xc1, + 0xf2, 0xe4, 0x6a, 0xfd, 0x2c, 0xd1, 0xa9, 0x93, 0xfb, 0x10, 0xfa, 0x01, 0x6a, 0x3e, 0x1d, 0x93, + 0x24, 0x90, 0x58, 0xcf, 0x3e, 0xab, 0xa6, 0xaa, 0xd4, 0x5a, 0xa9, 0x7e, 0x99, 0xde, 0x13, 0x2d, + 0xef, 0x54, 0xb3, 0xbc, 0x6c, 0x42, 0xbd, 0x82, 0xaa, 0x9e, 0x39, 0xc4, 0xf7, 0xd3, 0x0e, 0x5b, + 0x66, 0x7a, 0x26, 0x55, 0xd2, 0x8a, 0x0a, 0x1c, 0x69, 0x3c, 0xb5, 0x16, 0x4f, 0xe4, 0x35, 0x4f, + 0x42, 0x3f, 0xad, 0xe8, 0x78, 0xcc, 0xbc, 0xbc, 0xef, 0x75, 0xb5, 0xf5, 0x83, 0xd6, 0x1a, 0x66, + 0xe9, 0xae, 0xce, 0xd6, 0x2d, 0x77, 0xb6, 0xf8, 0x2a, 0x18, 0xf5, 0xe0, 0x9b, 0xac, 0x7d, 0x5e, + 0xc0, 0x68, 0x28, 0x71, 0x3a, 0x53, 0xbe, 0x18, 0x73, 0x56, 0x43, 0xf5, 0xf3, 0xb9, 0xa6, 0x75, + 0x15, 0x6b, 0xc4, 0xfc, 0xe5, 0x71, 0x87, 0x5a, 0x50, 0x11, 0xbe, 0xc0, 0x89, 0x2f, 0x70, 0x44, + 0xe4, 0xd4, 0x7a, 0xaa, 0x1a, 0x06, 0xc2, 0x17, 0x57, 0xbe, 0xb8, 0x24, 0x72, 0x9a, 0x3a, 0x4e, + 0xfc, 0xc4, 0x71, 0x5b, 0xff, 0x95, 0xe3, 0xc4, 0x3d, 0xc7, 0xbd, 0x83, 0x9a, 0xee, 0x05, 0x16, + 0x3c, 0x89, 0x3d, 0x2a, 0xac, 0x67, 0xad, 0xb5, 0x4e, 0xf9, 0x60, 0x77, 0x65, 0x61, 0x74, 0x51, + 0x46, 0x8a, 0xe9, 0x54, 0xbd, 0xa5, 0x95, 0x1a, 0xd2, 0xd9, 0xe1, 0xd3, 0x67, 0x93, 0xfc, 0x86, + 0x86, 0x78, 0xc6, 0x93, 0x50, 0x5a, 0x5f, 0xe9, 0x21, 0xad, 0xa3, 0x23, 0x5f, 0xb8, 0x69, 0xec, + 0x3c, 0x0d, 0xa1, 0x3d, 0x40, 0xea, 0xac, 0x82, 0xe2, 0x9b, 0x37, 0x02, 0x0b, 0x82, 0xff, 0xf2, + 0x51, 0x5a, 0x5f, 0xab, 0x84, 0x5a, 0x7a, 0x62, 0x41, 0x7f, 0x7c, 0x23, 0x46, 0xe4, 0xec, 0xa3, + 0x44, 0xbb, 0x50, 0x91, 0x71, 0x22, 0x24, 0xf6, 0xf9, 0x8c, 0xb0, 0xd0, 0x6a, 0xaa, 0xba, 0x94, + 0x15, 0xd6, 0x53, 0x10, 0x7a, 0x0b, 0xdb, 0xb9, 0xc3, 0xb2, 0x99, 0x83, 0xe9, 0x27, 0xf5, 0x5a, + 0x92, 0xdc, 0xfa, 0xa6, 0xb5, 0xd6, 0xd9, 0x70, 0x9e, 0x65, 0x84, 0x6c, 0xfa, 0xf4, 0x55, 0xd8, + 0xe5, 0xe8, 0x1d, 0xec, 0xe6, 0xa9, 0xb7, 0x2c, 0x96, 0x09, 0x09, 0x56, 0x48, 0xb4, 0x94, 0xc4, + 0xd7, 0x19, 0xf1, 0xbd, 0xe6, 0xdd, 0x57, 0x3a, 0x83, 0x76, 0xae, 0x74, 0xff, 0x85, 0xbb, 0x24, + 0xb5, 0xab, 0xa4, 0x76, 0x32, 0x66, 0x6f, 0x41, 0x74, 0x92, 0x60, 0xa1, 0xf5, 0x02, 0x6a, 0x31, + 0xe7, 0x12, 0x87, 0x64, 0x46, 0x45, 0x44, 0x3c, 0x6a, 0xb5, 0xf5, 0x45, 0x4f, 0xd1, 0x8b, 0x1c, + 0x44, 0x7f, 0x86, 0x46, 0xc0, 0x3d, 0x12, 0x30, 0x39, 0xc7, 0xc1, 0x35, 0x16, 0x7a, 0x86, 0x5b, + 0xdf, 0x2a, 0x4b, 0xfc, 0x76, 0x65, 0x2b, 0x07, 0x19, 0x7f, 0xc0, 0x89, 0x7f, 0x4c, 0x02, 0x12, + 0x7a, 0x34, 0xce, 0x66, 0xbf, 0x53, 0xcf, 0xc5, 0x06, 0xd7, 0x19, 0x84, 0xba, 0x60, 0xfa, 0xe1, + 0xc2, 0x72, 0x31, 0x91, 0xd4, 0xfa, 0xf5, 0x83, 0x2f, 0x2a, 0x3f, 0xcc, 0xdd, 0xe6, 0x10, 0x49, + 0x9b, 0x7f, 0x33, 0x60, 0x6b, 0xe5, 0x85, 0x42, 0x17, 0x50, 0x54, 0x03, 0xdf, 0x50, 0xe3, 0xe6, + 0xfb, 0xff, 0xe9, 0x56, 0xda, 0x6a, 0xea, 0x2b, 0x9d, 0x76, 0x0f, 0x8a, 0x6a, 0xd8, 0xd7, 0xa1, + 0xea, 0xf4, 0x7f, 0x38, 0x1d, 0xb9, 0xce, 0x07, 0x3c, 0xbc, 0x18, 0x7c, 0x30, 0x1f, 0xa1, 0x2a, + 0x6c, 0x1c, 0x0d, 0x06, 0xc3, 0xdf, 0xe3, 0xa3, 0x8b, 0x0f, 0xa6, 0xd1, 0x2e, 0x96, 0x0a, 0x66, + 0x61, 0xef, 0xe9, 0xfb, 0x53, 0xc7, 0xbd, 0x3a, 0x1a, 0xe0, 0x51, 0xdf, 0x79, 0x7f, 0xda, 0xed, + 0x2b, 0x72, 0xfb, 0x2d, 0x6c, 0xad, 0x7c, 0xb5, 0xa0, 0x75, 0x58, 0x1b, 0x9e, 0x9c, 0x98, 0x8f, + 0x50, 0x19, 0xd6, 0x7b, 0xfd, 0x93, 0xa3, 0xab, 0x81, 0x6b, 0x1a, 0x08, 0xe0, 0xc9, 0xc8, 0x75, + 0x4e, 0xbb, 0xae, 0x59, 0x68, 0xbf, 0x04, 0x58, 0xbc, 0x32, 0x50, 0x09, 0x8a, 0x17, 0xc3, 0x8b, + 0xbe, 0xf9, 0x08, 0xd5, 0x00, 0xce, 0xaf, 0xd4, 0x4e, 0xee, 0x60, 0x64, 0x1a, 0xed, 0x57, 0x50, + 0xff, 0xc9, 0xec, 0x4c, 0xe9, 0x6e, 0xff, 0x0f, 0xae, 0xf9, 0x28, 0xfd, 0x75, 0x36, 0x1a, 0x5e, + 0x98, 0xc6, 0x59, 0xb1, 0xb4, 0x69, 0x9a, 0x67, 0xc5, 0x12, 0x32, 0x1b, 0x6d, 0x01, 0x95, 0xe5, + 0x9b, 0x88, 0x2c, 0x58, 0xcf, 0x27, 0xa1, 0xfe, 0x4c, 0xcb, 0x97, 0xe8, 0x14, 0x2a, 0x32, 0x10, + 0xb9, 0x21, 0x84, 0xfa, 0x2c, 0x2b, 0x1f, 0xbc, 0xfc, 0x99, 0x2f, 0x03, 0x77, 0x30, 0xca, 0x3f, + 0x01, 0x9c, 0xb2, 0x0c, 0x44, 0xbe, 0x68, 0xff, 0x63, 0x0d, 0x9e, 0xff, 0x8c, 0x69, 0xd0, 0x9f, + 0x00, 0x7c, 0x26, 0x64, 0xcc, 0xae, 0x13, 0x99, 0x36, 0x32, 0x9d, 0x22, 0xbf, 0xfb, 0xa5, 0xd6, + 0xb3, 0x7b, 0x77, 0x12, 0xce, 0x92, 0x1c, 0xba, 0x82, 0x52, 0xfa, 0xd1, 0xc7, 0xf5, 0xa7, 0x65, + 0x2a, 0xfd, 0xf6, 0x17, 0x4b, 0x9f, 0x64, 0x02, 0xce, 0x9d, 0x54, 0xf3, 0xaf, 0x06, 0xc0, 0x62, + 0x47, 0x84, 0xa0, 0x38, 0x8e, 0xf9, 0x2c, 0x2b, 0xa2, 0xfa, 0x8d, 0x46, 0x50, 0x90, 0x3c, 0xdb, + 0xb3, 0xfb, 0x7f, 0x1c, 0xc7, 0x76, 0x79, 0x3f, 0x94, 0xf1, 0xdc, 0x29, 0x48, 0xde, 0xfc, 0x0e, + 0xd6, 0xb3, 0x25, 0x32, 0x61, 0xed, 0x86, 0xce, 0xb3, 0x2d, 0xd3, 0x9f, 0xe8, 0x29, 0x3c, 0xbe, + 0x25, 0x41, 0x42, 0x55, 0xb3, 0xaa, 0x8e, 0x5e, 0x7c, 0x5f, 0x78, 0x63, 0x34, 0x6d, 0x28, 0xe5, + 0x87, 0x58, 0xf9, 0xac, 0xb5, 0xec, 0x59, 0x53, 0xa4, 0x20, 0xf9, 0x71, 0xe7, 0x9f, 0x9f, 0x77, + 0x8c, 0x7f, 0x7d, 0xde, 0x31, 0xfe, 0xfd, 0x79, 0xc7, 0xf8, 0x63, 0x53, 0x3f, 0x3c, 0xe3, 0xfb, + 0x24, 0x62, 0xfb, 0x5f, 0xfc, 0x75, 0xb8, 0x7e, 0xa2, 0x2e, 0xef, 0xe1, 0x7f, 0x02, 0x00, 0x00, + 0xff, 0xff, 0x33, 0x88, 0x4e, 0x58, 0xa3, 0x0c, 0x00, 0x00, } func (m *MeshConfig) Marshal() (dAtA []byte, err error) { @@ -1388,6 +1398,18 @@ func (m *MeshConfig) MarshalTo(dAtA []byte) (int, error) { } i += n7 } + if m.DnsRefreshRate != nil { + dAtA[i] = 0xa2 + i++ + dAtA[i] = 0x2 + i++ + i = encodeVarintConfig(dAtA, i, uint64(m.DnsRefreshRate.Size())) + n8, err := m.DnsRefreshRate.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n8 + } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) } @@ -1445,11 +1467,11 @@ func (m *ConfigSource) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x12 i++ i = encodeVarintConfig(dAtA, i, uint64(m.TlsSettings.Size())) - n8, err := m.TlsSettings.MarshalTo(dAtA[i:]) + n9, err := m.TlsSettings.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n8 + i += n9 } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) @@ -1721,6 +1743,10 @@ func (m *MeshConfig) Size() (n int) { l = m.LocalityLbSetting.Size() n += 2 + l + sovConfig(uint64(l)) } + if m.DnsRefreshRate != nil { + l = m.DnsRefreshRate.Size() + n += 2 + l + sovConfig(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -2809,6 +2835,42 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 36: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DnsRefreshRate", 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 < 0 { + return ErrInvalidLengthConfig + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.DnsRefreshRate == nil { + m.DnsRefreshRate = &types.Duration{} + } + if err := m.DnsRefreshRate.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipConfig(dAtA[iNdEx:]) diff --git a/mesh/v1alpha1/config.proto b/mesh/v1alpha1/config.proto index f31c0d2c523..062e1e60e89 100644 --- a/mesh/v1alpha1/config.proto +++ b/mesh/v1alpha1/config.proto @@ -279,9 +279,11 @@ message MeshConfig { // Locality based load balancing distribution or failover settings. LocalityLoadBalancerSetting locality_lb_setting = 35; + // Configures DNS refresh rate for Envoy clusters of type STRICT_DNS + google.protobuf.Duration dns_refresh_rate = 36; // $hide_from_docs - // Next available field number: 36 + // Next available field number: 37 } // ConfigSource describes information about a configuration store inside a diff --git a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html index 9be1af96825..d4d0be852ae 100644 --- a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html +++ b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html @@ -486,6 +486,14 @@

MeshConfig

Locality based load balancing distribution or failover settings.

+ + + +dnsRefreshRate +google.protobuf.Duration + +

Configures DNS refresh rate for Envoy clusters of type STRICT_DNS

+ diff --git a/python/istio_api/mesh/v1alpha1/config_pb2.py b/python/istio_api/mesh/v1alpha1/config_pb2.py index b8d0290a1b3..27427a80009 100644 --- a/python/istio_api/mesh/v1alpha1/config_pb2.py +++ b/python/istio_api/mesh/v1alpha1/config_pb2.py @@ -22,7 +22,7 @@ name='mesh/v1alpha1/config.proto', package='istio.mesh.v1alpha1', syntax='proto3', - serialized_pb=_b('\n\x1amesh/v1alpha1/config.proto\x12\x13istio.mesh.v1alpha1\x1a\x1egoogle/protobuf/duration.proto\x1a\x19mesh/v1alpha1/proxy.proto\x1a*networking/v1alpha3/destination_rule.proto\"\xf7\r\n\nMeshConfig\x12\x1a\n\x12mixer_check_server\x18\x01 \x01(\t\x12\x1b\n\x13mixer_report_server\x18\x02 \x01(\t\x12\x1d\n\x15\x64isable_policy_checks\x18\x03 \x01(\x08\x12\x1e\n\x16policy_check_fail_open\x18\x19 \x01(\x08\x12-\n%sidecar_to_telemetry_session_affinity\x18\x1e \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\x61\n\rtcp_keepalive\x18\x1c \x01(\x0b\x32J.istio.networking.v1alpha3.ConnectionPoolSettings.TCPSettings.TcpKeepalive\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\x12N\n\x13\x61\x63\x63\x65ss_log_encoding\x18\x1b \x01(\x0e\x32\x31.istio.mesh.v1alpha1.MeshConfig.AccessLogEncoding\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\x12V\n\x17outbound_traffic_policy\x18\x11 \x01(\x0b\x32\x35.istio.mesh.v1alpha1.MeshConfig.OutboundTrafficPolicy\x12\'\n\x1f\x65nable_client_side_policy_check\x18\x13 \x01(\x08\x12\x14\n\x0csds_uds_path\x18\x14 \x01(\t\x12\x38\n\x11sds_refresh_delay\x18\x15 \x01(\x0b\x32\x19.google.protobuf.DurationB\x02\x18\x01\x12\x39\n\x0e\x63onfig_sources\x18\x16 \x03(\x0b\x32!.istio.mesh.v1alpha1.ConfigSource\x12\x1e\n\x16\x65nable_sds_token_mount\x18\x17 \x01(\x08\x12\x1a\n\x12sds_use_k8s_sa_jwt\x18\x1d \x01(\x08\x12\x14\n\x0ctrust_domain\x18\x1a \x01(\t\x12!\n\x19\x64\x65\x66\x61ult_service_export_to\x18\x1f \x03(\t\x12)\n!default_virtual_service_export_to\x18 \x03(\t\x12*\n\"default_destination_rule_export_to\x18! \x03(\t\x12\x16\n\x0eroot_namespace\x18\" \x01(\t\x12M\n\x13locality_lb_setting\x18# \x01(\x0b\x32\x30.istio.mesh.v1alpha1.LocalityLoadBalancerSetting\x1a\xa7\x01\n\x15OutboundTrafficPolicy\x12H\n\x04mode\x18\x01 \x01(\x0e\x32:.istio.mesh.v1alpha1.MeshConfig.OutboundTrafficPolicy.Mode\"D\n\x04Mode\x12\x11\n\rREGISTRY_ONLY\x10\x00\x12\r\n\tALLOW_ANY\x10\x01\"\x04\x08\x02\x10\x02*\x14VIRTUAL_SERVICE_ONLY\"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\x01\"\'\n\x11\x41\x63\x63\x65ssLogEncoding\x12\x08\n\x04TEXT\x10\x00\x12\x08\n\x04JSON\x10\x01J\x04\x08\x0f\x10\x10J\x04\x08\x12\x10\x13\"]\n\x0c\x43onfigSource\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12<\n\x0ctls_settings\x18\x02 \x01(\x0b\x32&.istio.networking.v1alpha3.TLSSettings\"\xfa\x02\n\x1bLocalityLoadBalancerSetting\x12O\n\ndistribute\x18\x01 \x03(\x0b\x32;.istio.mesh.v1alpha1.LocalityLoadBalancerSetting.Distribute\x12K\n\x08\x66\x61ilover\x18\x02 \x03(\x0b\x32\x39.istio.mesh.v1alpha1.LocalityLoadBalancerSetting.Failover\x1a\x96\x01\n\nDistribute\x12\x0c\n\x04\x66rom\x18\x01 \x01(\t\x12O\n\x02to\x18\x02 \x03(\x0b\x32\x43.istio.mesh.v1alpha1.LocalityLoadBalancerSetting.Distribute.ToEntry\x1a)\n\x07ToEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\r:\x02\x38\x01\x1a$\n\x08\x46\x61ilover\x12\x0c\n\x04\x66rom\x18\x01 \x01(\t\x12\n\n\x02to\x18\x02 \x01(\tB\x1cZ\x1aistio.io/api/mesh/v1alpha1b\x06proto3') + serialized_pb=_b('\n\x1amesh/v1alpha1/config.proto\x12\x13istio.mesh.v1alpha1\x1a\x1egoogle/protobuf/duration.proto\x1a\x19mesh/v1alpha1/proxy.proto\x1a*networking/v1alpha3/destination_rule.proto\"\xac\x0e\n\nMeshConfig\x12\x1a\n\x12mixer_check_server\x18\x01 \x01(\t\x12\x1b\n\x13mixer_report_server\x18\x02 \x01(\t\x12\x1d\n\x15\x64isable_policy_checks\x18\x03 \x01(\x08\x12\x1e\n\x16policy_check_fail_open\x18\x19 \x01(\x08\x12-\n%sidecar_to_telemetry_session_affinity\x18\x1e \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\x61\n\rtcp_keepalive\x18\x1c \x01(\x0b\x32J.istio.networking.v1alpha3.ConnectionPoolSettings.TCPSettings.TcpKeepalive\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\x12N\n\x13\x61\x63\x63\x65ss_log_encoding\x18\x1b \x01(\x0e\x32\x31.istio.mesh.v1alpha1.MeshConfig.AccessLogEncoding\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\x12V\n\x17outbound_traffic_policy\x18\x11 \x01(\x0b\x32\x35.istio.mesh.v1alpha1.MeshConfig.OutboundTrafficPolicy\x12\'\n\x1f\x65nable_client_side_policy_check\x18\x13 \x01(\x08\x12\x14\n\x0csds_uds_path\x18\x14 \x01(\t\x12\x38\n\x11sds_refresh_delay\x18\x15 \x01(\x0b\x32\x19.google.protobuf.DurationB\x02\x18\x01\x12\x39\n\x0e\x63onfig_sources\x18\x16 \x03(\x0b\x32!.istio.mesh.v1alpha1.ConfigSource\x12\x1e\n\x16\x65nable_sds_token_mount\x18\x17 \x01(\x08\x12\x1a\n\x12sds_use_k8s_sa_jwt\x18\x1d \x01(\x08\x12\x14\n\x0ctrust_domain\x18\x1a \x01(\t\x12!\n\x19\x64\x65\x66\x61ult_service_export_to\x18\x1f \x03(\t\x12)\n!default_virtual_service_export_to\x18 \x03(\t\x12*\n\"default_destination_rule_export_to\x18! \x03(\t\x12\x16\n\x0eroot_namespace\x18\" \x01(\t\x12M\n\x13locality_lb_setting\x18# \x01(\x0b\x32\x30.istio.mesh.v1alpha1.LocalityLoadBalancerSetting\x12\x33\n\x10\x64ns_refresh_rate\x18$ \x01(\x0b\x32\x19.google.protobuf.Duration\x1a\xa7\x01\n\x15OutboundTrafficPolicy\x12H\n\x04mode\x18\x01 \x01(\x0e\x32:.istio.mesh.v1alpha1.MeshConfig.OutboundTrafficPolicy.Mode\"D\n\x04Mode\x12\x11\n\rREGISTRY_ONLY\x10\x00\x12\r\n\tALLOW_ANY\x10\x01\"\x04\x08\x02\x10\x02*\x14VIRTUAL_SERVICE_ONLY\"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\x01\"\'\n\x11\x41\x63\x63\x65ssLogEncoding\x12\x08\n\x04TEXT\x10\x00\x12\x08\n\x04JSON\x10\x01J\x04\x08\x0f\x10\x10J\x04\x08\x12\x10\x13\"]\n\x0c\x43onfigSource\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12<\n\x0ctls_settings\x18\x02 \x01(\x0b\x32&.istio.networking.v1alpha3.TLSSettings\"\xfa\x02\n\x1bLocalityLoadBalancerSetting\x12O\n\ndistribute\x18\x01 \x03(\x0b\x32;.istio.mesh.v1alpha1.LocalityLoadBalancerSetting.Distribute\x12K\n\x08\x66\x61ilover\x18\x02 \x03(\x0b\x32\x39.istio.mesh.v1alpha1.LocalityLoadBalancerSetting.Failover\x1a\x96\x01\n\nDistribute\x12\x0c\n\x04\x66rom\x18\x01 \x01(\t\x12O\n\x02to\x18\x02 \x03(\x0b\x32\x43.istio.mesh.v1alpha1.LocalityLoadBalancerSetting.Distribute.ToEntry\x1a)\n\x07ToEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\r:\x02\x38\x01\x1a$\n\x08\x46\x61ilover\x12\x0c\n\x04\x66rom\x18\x01 \x01(\t\x12\n\n\x02to\x18\x02 \x01(\tB\x1cZ\x1aistio.io/api/mesh/v1alpha1b\x06proto3') , dependencies=[google_dot_protobuf_dot_duration__pb2.DESCRIPTOR,mesh_dot_v1alpha1_dot_proxy__pb2.DESCRIPTOR,networking_dot_v1alpha3_dot_destination__rule__pb2.DESCRIPTOR,]) @@ -45,8 +45,8 @@ ], containing_type=None, options=None, - serialized_start=1718, - serialized_end=1786, + serialized_start=1771, + serialized_end=1839, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_OUTBOUNDTRAFFICPOLICY_MODE) @@ -71,8 +71,8 @@ ], containing_type=None, options=None, - serialized_start=1788, - serialized_end=1845, + serialized_start=1841, + serialized_end=1898, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_INGRESSCONTROLLERMODE) @@ -93,8 +93,8 @@ ], containing_type=None, options=None, - serialized_start=1847, - serialized_end=1885, + serialized_start=1900, + serialized_end=1938, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_AUTHPOLICY) @@ -115,8 +115,8 @@ ], containing_type=None, options=None, - serialized_start=1887, - serialized_end=1926, + serialized_start=1940, + serialized_end=1979, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_ACCESSLOGENCODING) @@ -148,8 +148,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1619, - serialized_end=1786, + serialized_start=1672, + serialized_end=1839, ) _MESHCONFIG = _descriptor.Descriptor( @@ -390,6 +390,13 @@ message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='dns_refresh_rate', full_name='istio.mesh.v1alpha1.MeshConfig.dns_refresh_rate', index=33, + number=36, 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), ], extensions=[ ], @@ -406,7 +413,7 @@ oneofs=[ ], serialized_start=155, - serialized_end=1938, + serialized_end=1991, ) @@ -443,8 +450,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1940, - serialized_end=2033, + serialized_start=1993, + serialized_end=2086, ) @@ -481,8 +488,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2335, - serialized_end=2376, + serialized_start=2388, + serialized_end=2429, ) _LOCALITYLOADBALANCERSETTING_DISTRIBUTE = _descriptor.Descriptor( @@ -518,8 +525,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2226, - serialized_end=2376, + serialized_start=2279, + serialized_end=2429, ) _LOCALITYLOADBALANCERSETTING_FAILOVER = _descriptor.Descriptor( @@ -555,8 +562,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2378, - serialized_end=2414, + serialized_start=2431, + serialized_end=2467, ) _LOCALITYLOADBALANCERSETTING = _descriptor.Descriptor( @@ -592,8 +599,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2036, - serialized_end=2414, + serialized_start=2089, + serialized_end=2467, ) _MESHCONFIG_OUTBOUNDTRAFFICPOLICY.fields_by_name['mode'].enum_type = _MESHCONFIG_OUTBOUNDTRAFFICPOLICY_MODE @@ -610,6 +617,7 @@ _MESHCONFIG.fields_by_name['sds_refresh_delay'].message_type = google_dot_protobuf_dot_duration__pb2._DURATION _MESHCONFIG.fields_by_name['config_sources'].message_type = _CONFIGSOURCE _MESHCONFIG.fields_by_name['locality_lb_setting'].message_type = _LOCALITYLOADBALANCERSETTING +_MESHCONFIG.fields_by_name['dns_refresh_rate'].message_type = google_dot_protobuf_dot_duration__pb2._DURATION _MESHCONFIG_INGRESSCONTROLLERMODE.containing_type = _MESHCONFIG _MESHCONFIG_AUTHPOLICY.containing_type = _MESHCONFIG _MESHCONFIG_ACCESSLOGENCODING.containing_type = _MESHCONFIG From 6372293f550461835b6fc6590527e3593e7e884b Mon Sep 17 00:00:00 2001 From: Gregory Hanson Date: Tue, 5 Mar 2019 14:07:19 -0600 Subject: [PATCH 2/2] add lock file --- proto.lock | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/proto.lock b/proto.lock index e928431dd2e..6aeb94677d1 100644 --- a/proto.lock +++ b/proto.lock @@ -1000,6 +1000,11 @@ "id": 35, "name": "locality_lb_setting", "type": "LocalityLoadBalancerSetting" + }, + { + "id": 36, + "name": "dns_refresh_rate", + "type": "google.protobuf.Duration" } ], "reserved_ids": [