diff --git a/contrib/envoy/extensions/network/connection_balance/dlb/v3alpha/dlb.pb.go b/contrib/envoy/extensions/network/connection_balance/dlb/v3alpha/dlb.pb.go index 3f53c3d6e7..095447033f 100755 --- a/contrib/envoy/extensions/network/connection_balance/dlb/v3alpha/dlb.pb.go +++ b/contrib/envoy/extensions/network/connection_balance/dlb/v3alpha/dlb.pb.go @@ -21,6 +21,60 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// The fallback policy if any error occurs. +// The default policy is None. +type Dlb_FallbackPolicy int32 + +const ( + // No fallback policy. + Dlb_None Dlb_FallbackPolicy = 0 + // Fall back to Nop Connection Balance. + Dlb_NopConnectionBalance Dlb_FallbackPolicy = 1 + // Fall back to Exact Connection Balance. + Dlb_ExactConnectionBalance Dlb_FallbackPolicy = 2 +) + +// Enum value maps for Dlb_FallbackPolicy. +var ( + Dlb_FallbackPolicy_name = map[int32]string{ + 0: "None", + 1: "NopConnectionBalance", + 2: "ExactConnectionBalance", + } + Dlb_FallbackPolicy_value = map[string]int32{ + "None": 0, + "NopConnectionBalance": 1, + "ExactConnectionBalance": 2, + } +) + +func (x Dlb_FallbackPolicy) Enum() *Dlb_FallbackPolicy { + p := new(Dlb_FallbackPolicy) + *p = x + return p +} + +func (x Dlb_FallbackPolicy) String() string { + return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) +} + +func (Dlb_FallbackPolicy) Descriptor() protoreflect.EnumDescriptor { + return file_contrib_envoy_extensions_network_connection_balance_dlb_v3alpha_dlb_proto_enumTypes[0].Descriptor() +} + +func (Dlb_FallbackPolicy) Type() protoreflect.EnumType { + return &file_contrib_envoy_extensions_network_connection_balance_dlb_v3alpha_dlb_proto_enumTypes[0] +} + +func (x Dlb_FallbackPolicy) Number() protoreflect.EnumNumber { + return protoreflect.EnumNumber(x) +} + +// Deprecated: Use Dlb_FallbackPolicy.Descriptor instead. +func (Dlb_FallbackPolicy) EnumDescriptor() ([]byte, []int) { + return file_contrib_envoy_extensions_network_connection_balance_dlb_v3alpha_dlb_proto_rawDescGZIP(), []int{0, 0} +} + // The Dlb is a hardware managed system of queues and arbiters connecting producers and consumers. It is a PCIE device // in the CPU package. It interacts with software running on cores and potentially other devices. The Dlb implements the // following balancing features: @@ -43,7 +97,8 @@ type Dlb struct { Id uint32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` // Maximum number of retries when sending to DLB device fails. // No retry as default. - MaxRetries uint32 `protobuf:"varint,2,opt,name=max_retries,json=maxRetries,proto3" json:"max_retries,omitempty"` + MaxRetries uint32 `protobuf:"varint,2,opt,name=max_retries,json=maxRetries,proto3" json:"max_retries,omitempty"` + FallbackPolicy Dlb_FallbackPolicy `protobuf:"varint,3,opt,name=fallback_policy,json=fallbackPolicy,proto3,enum=envoy.extensions.network.connection_balance.dlb.v3alpha.Dlb_FallbackPolicy" json:"fallback_policy,omitempty"` } func (x *Dlb) Reset() { @@ -92,6 +147,13 @@ func (x *Dlb) GetMaxRetries() uint32 { return 0 } +func (x *Dlb) GetFallbackPolicy() Dlb_FallbackPolicy { + if x != nil { + return x.FallbackPolicy + } + return Dlb_None +} + var File_contrib_envoy_extensions_network_connection_balance_dlb_v3alpha_dlb_proto protoreflect.FileDescriptor var file_contrib_envoy_extensions_network_connection_balance_dlb_v3alpha_dlb_proto_rawDesc = []byte{ @@ -105,23 +167,35 @@ var file_contrib_envoy_extensions_network_connection_balance_dlb_v3alpha_dlb_pro 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x64, 0x6c, 0x62, 0x2e, 0x76, 0x33, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x22, 0x36, 0x0a, 0x03, 0x44, 0x6c, 0x62, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x6d, 0x61, - 0x78, 0x5f, 0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, - 0x0a, 0x6d, 0x61, 0x78, 0x52, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x42, 0xbb, 0x01, 0xba, 0x80, - 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x45, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, - 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, - 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x63, - 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, - 0x65, 0x2e, 0x64, 0x6c, 0x62, 0x2e, 0x76, 0x33, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x42, 0x08, 0x44, - 0x6c, 0x62, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x5e, 0x67, 0x69, 0x74, 0x68, 0x75, - 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, - 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, - 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, - 0x6e, 0x73, 0x2f, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x2f, 0x64, 0x6c, - 0x62, 0x2f, 0x76, 0x33, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x6f, 0x74, 0x6f, 0x22, 0xfe, 0x01, 0x0a, 0x03, 0x44, 0x6c, 0x62, 0x12, 0x0e, 0x0a, 0x02, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x6d, + 0x61, 0x78, 0x5f, 0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, + 0x52, 0x0a, 0x6d, 0x61, 0x78, 0x52, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x12, 0x74, 0x0a, 0x0f, + 0x66, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x4b, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, + 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, + 0x2e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x62, 0x61, 0x6c, 0x61, + 0x6e, 0x63, 0x65, 0x2e, 0x64, 0x6c, 0x62, 0x2e, 0x76, 0x33, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x2e, + 0x44, 0x6c, 0x62, 0x2e, 0x46, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x50, 0x6f, 0x6c, 0x69, + 0x63, 0x79, 0x52, 0x0e, 0x66, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x50, 0x6f, 0x6c, 0x69, + 0x63, 0x79, 0x22, 0x50, 0x0a, 0x0e, 0x46, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x50, 0x6f, + 0x6c, 0x69, 0x63, 0x79, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x6f, 0x6e, 0x65, 0x10, 0x00, 0x12, 0x18, + 0x0a, 0x14, 0x4e, 0x6f, 0x70, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, + 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x10, 0x01, 0x12, 0x1a, 0x0a, 0x16, 0x45, 0x78, 0x61, 0x63, + 0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x61, 0x6c, 0x61, 0x6e, + 0x63, 0x65, 0x10, 0x02, 0x42, 0xbb, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, + 0x45, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, + 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, + 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x64, 0x6c, 0x62, 0x2e, 0x76, + 0x33, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x42, 0x08, 0x44, 0x6c, 0x62, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x50, 0x01, 0x5a, 0x5e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, + 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, + 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, + 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x6e, 0x65, 0x74, 0x77, + 0x6f, 0x72, 0x6b, 0x2f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x62, + 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x2f, 0x64, 0x6c, 0x62, 0x2f, 0x76, 0x33, 0x61, 0x6c, 0x70, + 0x68, 0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -136,16 +210,19 @@ func file_contrib_envoy_extensions_network_connection_balance_dlb_v3alpha_dlb_pr return file_contrib_envoy_extensions_network_connection_balance_dlb_v3alpha_dlb_proto_rawDescData } +var file_contrib_envoy_extensions_network_connection_balance_dlb_v3alpha_dlb_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_contrib_envoy_extensions_network_connection_balance_dlb_v3alpha_dlb_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_contrib_envoy_extensions_network_connection_balance_dlb_v3alpha_dlb_proto_goTypes = []interface{}{ - (*Dlb)(nil), // 0: envoy.extensions.network.connection_balance.dlb.v3alpha.Dlb + (Dlb_FallbackPolicy)(0), // 0: envoy.extensions.network.connection_balance.dlb.v3alpha.Dlb.FallbackPolicy + (*Dlb)(nil), // 1: envoy.extensions.network.connection_balance.dlb.v3alpha.Dlb } var file_contrib_envoy_extensions_network_connection_balance_dlb_v3alpha_dlb_proto_depIdxs = []int32{ - 0, // [0:0] is the sub-list for method output_type - 0, // [0:0] is the sub-list for method input_type - 0, // [0:0] is the sub-list for extension type_name - 0, // [0:0] is the sub-list for extension extendee - 0, // [0:0] is the sub-list for field type_name + 0, // 0: envoy.extensions.network.connection_balance.dlb.v3alpha.Dlb.fallback_policy:type_name -> envoy.extensions.network.connection_balance.dlb.v3alpha.Dlb.FallbackPolicy + 1, // [1:1] is the sub-list for method output_type + 1, // [1:1] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name } func init() { file_contrib_envoy_extensions_network_connection_balance_dlb_v3alpha_dlb_proto_init() } @@ -172,13 +249,14 @@ func file_contrib_envoy_extensions_network_connection_balance_dlb_v3alpha_dlb_pr File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_contrib_envoy_extensions_network_connection_balance_dlb_v3alpha_dlb_proto_rawDesc, - NumEnums: 0, + NumEnums: 1, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, GoTypes: file_contrib_envoy_extensions_network_connection_balance_dlb_v3alpha_dlb_proto_goTypes, DependencyIndexes: file_contrib_envoy_extensions_network_connection_balance_dlb_v3alpha_dlb_proto_depIdxs, + EnumInfos: file_contrib_envoy_extensions_network_connection_balance_dlb_v3alpha_dlb_proto_enumTypes, MessageInfos: file_contrib_envoy_extensions_network_connection_balance_dlb_v3alpha_dlb_proto_msgTypes, }.Build() File_contrib_envoy_extensions_network_connection_balance_dlb_v3alpha_dlb_proto = out.File diff --git a/contrib/envoy/extensions/network/connection_balance/dlb/v3alpha/dlb.pb.validate.go b/contrib/envoy/extensions/network/connection_balance/dlb/v3alpha/dlb.pb.validate.go index ac5725abaa..1650c36eb6 100755 --- a/contrib/envoy/extensions/network/connection_balance/dlb/v3alpha/dlb.pb.validate.go +++ b/contrib/envoy/extensions/network/connection_balance/dlb/v3alpha/dlb.pb.validate.go @@ -60,6 +60,8 @@ func (m *Dlb) validate(all bool) error { // no validation rules for MaxRetries + // no validation rules for FallbackPolicy + if len(errors) > 0 { return DlbMultiError(errors) } diff --git a/envoy/COMMIT b/envoy/COMMIT index 6325c041b5..873aa11053 100644 --- a/envoy/COMMIT +++ b/envoy/COMMIT @@ -1 +1 @@ -d9ba9d17016296c50069584905dee1a19427d42e +8a4cf41e72a201b463361be4aec4e30baf853fa2