diff --git a/pkg/api/executor.pb.go b/pkg/api/executor.pb.go index 7a38f573bb1..c2966395808 100644 --- a/pkg/api/executor.pb.go +++ b/pkg/api/executor.pb.go @@ -255,141 +255,50 @@ func (m *ExecutorCancelRequest) GetPriorityClasses() []string { return nil } -type ByPriorityClass struct { - PriorityClasses []string `protobuf:"bytes,1,rep,name=priorityClasses,proto3" json:"priorityClasses,omitempty"` -} - -func (m *ByPriorityClass) Reset() { *m = ByPriorityClass{} } -func (m *ByPriorityClass) String() string { return proto.CompactTextString(m) } -func (*ByPriorityClass) ProtoMessage() {} -func (*ByPriorityClass) Descriptor() ([]byte, []int) { - return fileDescriptor_506cd9cd149291ea, []int{4} -} -func (m *ByPriorityClass) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ByPriorityClass) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ByPriorityClass.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ByPriorityClass) XXX_Merge(src proto.Message) { - xxx_messageInfo_ByPriorityClass.Merge(m, src) -} -func (m *ByPriorityClass) XXX_Size() int { - return m.Size() -} -func (m *ByPriorityClass) XXX_DiscardUnknown() { - xxx_messageInfo_ByPriorityClass.DiscardUnknown(m) -} - -var xxx_messageInfo_ByPriorityClass proto.InternalMessageInfo - -func (m *ByPriorityClass) GetPriorityClasses() []string { - if m != nil { - return m.PriorityClasses - } - return nil -} - -type ByPriorityQueue struct { - Queues []string `protobuf:"bytes,1,rep,name=queues,proto3" json:"queues,omitempty"` -} - -func (m *ByPriorityQueue) Reset() { *m = ByPriorityQueue{} } -func (m *ByPriorityQueue) String() string { return proto.CompactTextString(m) } -func (*ByPriorityQueue) ProtoMessage() {} -func (*ByPriorityQueue) Descriptor() ([]byte, []int) { - return fileDescriptor_506cd9cd149291ea, []int{5} -} -func (m *ByPriorityQueue) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ByPriorityQueue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ByPriorityQueue.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ByPriorityQueue) XXX_Merge(src proto.Message) { - xxx_messageInfo_ByPriorityQueue.Merge(m, src) -} -func (m *ByPriorityQueue) XXX_Size() int { - return m.Size() -} -func (m *ByPriorityQueue) XXX_DiscardUnknown() { - xxx_messageInfo_ByPriorityQueue.DiscardUnknown(m) -} - -var xxx_messageInfo_ByPriorityQueue proto.InternalMessageInfo - -func (m *ByPriorityQueue) GetQueues() []string { - if m != nil { - return m.Queues - } - return nil -} - func init() { proto.RegisterType((*ExecutorSettingsUpsertRequest)(nil), "api.ExecutorSettingsUpsertRequest") proto.RegisterType((*ExecutorSettingsDeleteRequest)(nil), "api.ExecutorSettingsDeleteRequest") proto.RegisterType((*ExecutorPreemptRequest)(nil), "api.ExecutorPreemptRequest") proto.RegisterType((*ExecutorCancelRequest)(nil), "api.ExecutorCancelRequest") - proto.RegisterType((*ByPriorityClass)(nil), "api.ByPriorityClass") - proto.RegisterType((*ByPriorityQueue)(nil), "api.ByPriorityQueue") } func init() { proto.RegisterFile("pkg/api/executor.proto", fileDescriptor_506cd9cd149291ea) } var fileDescriptor_506cd9cd149291ea = []byte{ - // 538 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x94, 0x3f, 0x6f, 0xd3, 0x40, - 0x18, 0xc6, 0x7b, 0x09, 0xaa, 0xd2, 0x13, 0xa2, 0xc5, 0x02, 0x2b, 0x38, 0xad, 0x1d, 0x2c, 0xd1, - 0x46, 0x55, 0x65, 0x8b, 0xb2, 0x31, 0x80, 0x48, 0xa9, 0x3a, 0x52, 0x82, 0x58, 0xba, 0xa0, 0x8b, - 0xf3, 0x12, 0x0c, 0xb1, 0xef, 0xea, 0x3b, 0x23, 0x22, 0xd4, 0x85, 0x4f, 0x80, 0xc4, 0x77, 0x81, - 0x81, 0x2f, 0xc0, 0x58, 0x89, 0x85, 0xc9, 0x42, 0x09, 0x0b, 0xfe, 0x14, 0xc8, 0x67, 0x3b, 0x9c, - 0x03, 0x25, 0x94, 0x8d, 0x2d, 0xf7, 0xfe, 0x79, 0x7e, 0xef, 0x5d, 0xde, 0xc7, 0x58, 0x67, 0x2f, - 0x86, 0x2e, 0x61, 0xbe, 0x0b, 0xaf, 0xc0, 0x8b, 0x05, 0x8d, 0x1c, 0x16, 0x51, 0x41, 0xb5, 0x3a, - 0x61, 0xbe, 0xb1, 0x3e, 0xa4, 0x74, 0x38, 0x02, 0x99, 0x27, 0x61, 0x48, 0x05, 0x11, 0x3e, 0x0d, - 0x79, 0x5e, 0x62, 0xb4, 0x8a, 0xac, 0x3c, 0xf5, 0xe3, 0xa7, 0x2e, 0x04, 0x4c, 0x8c, 0xf3, 0xa4, - 0xfd, 0x11, 0xe1, 0x8d, 0xfd, 0x42, 0xf2, 0x11, 0x08, 0xe1, 0x87, 0x43, 0xfe, 0x98, 0x71, 0x88, - 0x44, 0x0f, 0x8e, 0x63, 0xe0, 0x42, 0xdb, 0xc4, 0x17, 0x42, 0x12, 0x40, 0x13, 0xb5, 0x51, 0x67, - 0xa5, 0xab, 0xa5, 0x89, 0x75, 0x29, 0x3b, 0xef, 0xd0, 0xc0, 0x17, 0x52, 0xa9, 0x27, 0xf3, 0xda, - 0x2e, 0x6e, 0x78, 0x34, 0x1a, 0xd0, 0x10, 0x06, 0xcd, 0x5a, 0x1b, 0x75, 0x1a, 0x5d, 0x3d, 0x4d, - 0x2c, 0xad, 0x8c, 0x29, 0xf5, 0xb3, 0x3a, 0xed, 0x0e, 0xbe, 0x98, 0xff, 0xee, 0x01, 0xe1, 0x34, - 0x6c, 0xd6, 0x25, 0xc3, 0x48, 0x13, 0x4b, 0x57, 0xe3, 0x4a, 0x6f, 0xa5, 0xde, 0x3e, 0xf8, 0x75, - 0xf8, 0xfb, 0x30, 0x02, 0x01, 0xe7, 0x1c, 0xde, 0xfe, 0x80, 0xb0, 0x5e, 0x2a, 0x1d, 0x46, 0x90, - 0xa5, 0xce, 0x7b, 0xff, 0x1d, 0xbc, 0x7c, 0x1c, 0x43, 0x0c, 0xbc, 0x59, 0x6b, 0xd7, 0x3b, 0x2b, - 0xdd, 0x2b, 0x69, 0x62, 0xad, 0xe5, 0x11, 0xa5, 0xb6, 0xa8, 0xd1, 0x0e, 0xf0, 0x2a, 0x8b, 0x7c, - 0x1a, 0xf9, 0x62, 0xbc, 0x37, 0x22, 0x9c, 0x03, 0x6f, 0xd6, 0x65, 0xdb, 0x46, 0x9a, 0x58, 0xd7, - 0xe6, 0x52, 0x4a, 0xff, 0x7c, 0x97, 0xfd, 0x1e, 0xe1, 0xab, 0xe5, 0xe4, 0x7b, 0x24, 0xf4, 0x60, - 0xf4, 0x9f, 0x0c, 0x7e, 0x84, 0x57, 0xbb, 0xe3, 0x43, 0x35, 0xf8, 0x3b, 0x6d, 0xf4, 0x4f, 0xda, - 0x77, 0x55, 0xed, 0x87, 0xd9, 0xe0, 0xca, 0x2d, 0xd1, 0xe2, 0x5b, 0xee, 0x7e, 0xaf, 0xe3, 0x46, - 0xf9, 0xaa, 0xda, 0x09, 0xd6, 0x73, 0x4b, 0xcc, 0xef, 0x9a, 0x66, 0x3b, 0x84, 0xf9, 0xce, 0x1f, - 0xfd, 0x63, 0xe8, 0x4e, 0xee, 0x3f, 0xa7, 0xf4, 0x9f, 0xb3, 0x9f, 0xa1, 0xec, 0xad, 0x37, 0x9f, - 0xbf, 0xbd, 0xab, 0x5d, 0x37, 0xd6, 0xdd, 0x97, 0x37, 0x67, 0xae, 0x7e, 0xc2, 0x0b, 0x0d, 0xf7, - 0x75, 0xf6, 0xdf, 0x9c, 0xdc, 0x46, 0xdb, 0x19, 0x3e, 0x5f, 0xea, 0xbf, 0xc4, 0x57, 0x1c, 0xb0, - 0x08, 0xbf, 0xbd, 0x10, 0xcf, 0xf0, 0xe5, 0xc2, 0x11, 0x0f, 0xc2, 0xd9, 0x93, 0xb4, 0x2a, 0xe4, - 0xaa, 0x63, 0xce, 0x44, 0x6e, 0x4a, 0x64, 0xdb, 0x6e, 0xa9, 0x48, 0x97, 0xe5, 0xcd, 0x0a, 0x31, - 0xc0, 0x6b, 0xf9, 0x26, 0x2b, 0x40, 0xa3, 0x02, 0xac, 0x2c, 0xfa, 0x99, 0xbc, 0x1b, 0x92, 0x67, - 0xd9, 0x46, 0x85, 0xe7, 0xc9, 0xde, 0x9f, 0xb8, 0xee, 0xbd, 0x4f, 0x13, 0x13, 0x9d, 0x4e, 0x4c, - 0xf4, 0x75, 0x62, 0xa2, 0xb7, 0x53, 0x73, 0xe9, 0x74, 0x6a, 0x2e, 0x7d, 0x99, 0x9a, 0x4b, 0x47, - 0x5b, 0x43, 0x5f, 0x3c, 0x8b, 0xfb, 0x8e, 0x47, 0x03, 0x97, 0x44, 0x01, 0x19, 0x10, 0x16, 0xd1, - 0xe7, 0xe0, 0x89, 0xe2, 0xe4, 0x16, 0x1f, 0xe5, 0xfe, 0xb2, 0x24, 0xdf, 0xfa, 0x11, 0x00, 0x00, - 0xff, 0xff, 0xb2, 0x2b, 0x9f, 0xa8, 0xa6, 0x05, 0x00, 0x00, + // 513 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x94, 0x31, 0x6f, 0xd3, 0x40, + 0x14, 0xc7, 0x73, 0x09, 0xaa, 0xd2, 0x13, 0x82, 0x62, 0x81, 0x65, 0x9c, 0xd6, 0x0e, 0x96, 0x68, + 0xa3, 0xaa, 0xb2, 0x45, 0xd9, 0x18, 0x90, 0x48, 0xa9, 0x3a, 0x82, 0x82, 0x58, 0x58, 0xd0, 0xc5, + 0x79, 0x18, 0x43, 0xec, 0xbb, 0xfa, 0xce, 0x88, 0x0a, 0x75, 0xe1, 0x13, 0x20, 0xf1, 0x5d, 0x60, + 0xe0, 0x0b, 0x30, 0x56, 0x62, 0x61, 0xb2, 0x50, 0xc2, 0x82, 0x3f, 0x05, 0xf2, 0x9d, 0x1d, 0xec, + 0xa0, 0x52, 0x3a, 0x76, 0xcb, 0xbd, 0xf7, 0xff, 0xbf, 0xdf, 0xbb, 0xf8, 0x6f, 0x63, 0x9d, 0xbd, + 0x0e, 0x3c, 0xc2, 0x42, 0x0f, 0xde, 0x82, 0x9f, 0x0a, 0x9a, 0xb8, 0x2c, 0xa1, 0x82, 0x6a, 0x1d, + 0xc2, 0x42, 0x73, 0x3d, 0xa0, 0x34, 0x98, 0x82, 0xec, 0x93, 0x38, 0xa6, 0x82, 0x88, 0x90, 0xc6, + 0x5c, 0x49, 0xcc, 0x5e, 0xd9, 0x95, 0xa7, 0x71, 0xfa, 0xc2, 0x83, 0x88, 0x89, 0x23, 0xd5, 0x74, + 0xbe, 0x20, 0xbc, 0xb1, 0x5f, 0x8e, 0x7c, 0x02, 0x42, 0x84, 0x71, 0xc0, 0x9f, 0x32, 0x0e, 0x89, + 0x18, 0xc1, 0x61, 0x0a, 0x5c, 0x68, 0x9b, 0xf8, 0x52, 0x4c, 0x22, 0x30, 0x50, 0x1f, 0x0d, 0x56, + 0x87, 0x5a, 0x9e, 0xd9, 0x57, 0x8a, 0xf3, 0x0e, 0x8d, 0x42, 0x21, 0x27, 0x8d, 0x64, 0x5f, 0xdb, + 0xc5, 0x5d, 0x9f, 0x26, 0x13, 0x1a, 0xc3, 0xc4, 0x68, 0xf7, 0xd1, 0xa0, 0x3b, 0xd4, 0xf3, 0xcc, + 0xd6, 0xaa, 0x5a, 0x4d, 0xbf, 0xd0, 0x69, 0xf7, 0xf1, 0x65, 0xf5, 0x7b, 0x04, 0x84, 0xd3, 0xd8, + 0xe8, 0x48, 0x86, 0x99, 0x67, 0xb6, 0x5e, 0xaf, 0xd7, 0xbc, 0x0d, 0xbd, 0x73, 0xf0, 0xf7, 0xf2, + 0x0f, 0x61, 0x0a, 0x02, 0xce, 0xb9, 0xbc, 0xf3, 0x19, 0x61, 0xbd, 0x9a, 0xf4, 0x38, 0x81, 0xa2, + 0x75, 0xde, 0xfb, 0xef, 0xe0, 0x95, 0xc3, 0x14, 0x52, 0xe0, 0x46, 0xbb, 0xdf, 0x19, 0xac, 0x0e, + 0xaf, 0xe7, 0x99, 0xbd, 0xa6, 0x2a, 0x35, 0x6d, 0xa9, 0xd1, 0x0e, 0xf0, 0x55, 0x96, 0x84, 0x34, + 0x09, 0xc5, 0xd1, 0xde, 0x94, 0x70, 0x0e, 0xdc, 0xe8, 0x48, 0xdb, 0x46, 0x9e, 0xd9, 0x37, 0x97, + 0x5a, 0x35, 0xff, 0xb2, 0xcb, 0xf9, 0x84, 0xf0, 0x8d, 0x6a, 0xf3, 0x3d, 0x12, 0xfb, 0x30, 0xbd, + 0x18, 0x8b, 0xef, 0xfe, 0xea, 0xe0, 0x6e, 0xb5, 0xb8, 0x76, 0x8c, 0x75, 0x95, 0xba, 0xe5, 0xc7, + 0xa9, 0x39, 0x2e, 0x61, 0xa1, 0xfb, 0xcf, 0x88, 0x9a, 0xba, 0xab, 0x22, 0xee, 0x56, 0x11, 0x77, + 0xf7, 0x0b, 0xa6, 0xb3, 0xf5, 0xfe, 0xdb, 0xcf, 0x8f, 0xed, 0x5b, 0xe6, 0xba, 0xf7, 0xe6, 0xce, + 0xe2, 0xc5, 0x79, 0xce, 0xcb, 0x19, 0xde, 0xbb, 0xe2, 0xfa, 0xc7, 0xf7, 0xd0, 0x76, 0x81, 0x57, + 0xb9, 0xf9, 0x4f, 0x7c, 0x23, 0x64, 0x67, 0xe1, 0xb7, 0xcf, 0xc4, 0x33, 0x7c, 0xad, 0x0c, 0xdd, + 0xa3, 0x78, 0xf1, 0x97, 0xf4, 0x1a, 0xe4, 0x66, 0x28, 0x4f, 0x45, 0x6e, 0x4a, 0x64, 0xdf, 0xe9, + 0xd5, 0x91, 0x1e, 0x53, 0xe6, 0x1a, 0x31, 0xc2, 0x6b, 0x2a, 0x2c, 0x35, 0xa0, 0xd9, 0x00, 0x36, + 0xb2, 0x74, 0x2a, 0xef, 0xb6, 0xe4, 0xd9, 0x8e, 0xd9, 0xe0, 0xf9, 0xd2, 0xfb, 0x07, 0x37, 0x7c, + 0xf0, 0x75, 0x66, 0xa1, 0x93, 0x99, 0x85, 0x7e, 0xcc, 0x2c, 0xf4, 0x61, 0x6e, 0xb5, 0x4e, 0xe6, + 0x56, 0xeb, 0xfb, 0xdc, 0x6a, 0x3d, 0xdb, 0x0a, 0x42, 0xf1, 0x32, 0x1d, 0xbb, 0x3e, 0x8d, 0x3c, + 0x92, 0x44, 0x64, 0x42, 0x58, 0x42, 0x5f, 0x81, 0x2f, 0xca, 0x93, 0x57, 0x7e, 0xf7, 0xc6, 0x2b, + 0x92, 0x7c, 0xf7, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xed, 0x8b, 0x50, 0xc7, 0x09, 0x05, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -753,70 +662,6 @@ func (m *ExecutorCancelRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *ByPriorityClass) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ByPriorityClass) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ByPriorityClass) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.PriorityClasses) > 0 { - for iNdEx := len(m.PriorityClasses) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.PriorityClasses[iNdEx]) - copy(dAtA[i:], m.PriorityClasses[iNdEx]) - i = encodeVarintExecutor(dAtA, i, uint64(len(m.PriorityClasses[iNdEx]))) - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - -func (m *ByPriorityQueue) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ByPriorityQueue) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ByPriorityQueue) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Queues) > 0 { - for iNdEx := len(m.Queues) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.Queues[iNdEx]) - copy(dAtA[i:], m.Queues[iNdEx]) - i = encodeVarintExecutor(dAtA, i, uint64(len(m.Queues[iNdEx]))) - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - func encodeVarintExecutor(dAtA []byte, offset int, v uint64) int { offset -= sovExecutor(v) base := offset @@ -911,36 +756,6 @@ func (m *ExecutorCancelRequest) Size() (n int) { return n } -func (m *ByPriorityClass) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.PriorityClasses) > 0 { - for _, s := range m.PriorityClasses { - l = len(s) - n += 1 + l + sovExecutor(uint64(l)) - } - } - return n -} - -func (m *ByPriorityQueue) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Queues) > 0 { - for _, s := range m.Queues { - l = len(s) - n += 1 + l + sovExecutor(uint64(l)) - } - } - return n -} - func sovExecutor(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -1455,170 +1270,6 @@ func (m *ExecutorCancelRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *ByPriorityClass) 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 ErrIntOverflowExecutor - } - 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: ByPriorityClass: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ByPriorityClass: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PriorityClasses", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowExecutor - } - 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 ErrInvalidLengthExecutor - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthExecutor - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.PriorityClasses = append(m.PriorityClasses, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipExecutor(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthExecutor - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ByPriorityQueue) 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 ErrIntOverflowExecutor - } - 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: ByPriorityQueue: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ByPriorityQueue: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Queues", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowExecutor - } - 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 ErrInvalidLengthExecutor - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthExecutor - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Queues = append(m.Queues, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipExecutor(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthExecutor - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func skipExecutor(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/pkg/api/executor.proto b/pkg/api/executor.proto index 2d55399139d..1e6f2c91160 100644 --- a/pkg/api/executor.proto +++ b/pkg/api/executor.proto @@ -56,11 +56,3 @@ message ExecutorCancelRequest { repeated string queues = 2; repeated string priorityClasses = 3; } - -message ByPriorityClass { - repeated string priorityClasses = 1; -} - -message ByPriorityQueue { - repeated string queues = 1; -} diff --git a/pkg/controlplaneevents/events.pb.go b/pkg/controlplaneevents/events.pb.go index daa7b6b130f..d5812bba0b5 100644 --- a/pkg/controlplaneevents/events.pb.go +++ b/pkg/controlplaneevents/events.pb.go @@ -375,102 +375,12 @@ func (m *CancelOnExecutor) GetPriorityClasses() []string { return nil } -type ByPriorityClass struct { - PriorityClasses []string `protobuf:"bytes,1,rep,name=priorityClasses,proto3" json:"priorityClasses,omitempty"` -} - -func (m *ByPriorityClass) Reset() { *m = ByPriorityClass{} } -func (m *ByPriorityClass) String() string { return proto.CompactTextString(m) } -func (*ByPriorityClass) ProtoMessage() {} -func (*ByPriorityClass) Descriptor() ([]byte, []int) { - return fileDescriptor_2ccee8bdbf348752, []int{5} -} -func (m *ByPriorityClass) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ByPriorityClass) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ByPriorityClass.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ByPriorityClass) XXX_Merge(src proto.Message) { - xxx_messageInfo_ByPriorityClass.Merge(m, src) -} -func (m *ByPriorityClass) XXX_Size() int { - return m.Size() -} -func (m *ByPriorityClass) XXX_DiscardUnknown() { - xxx_messageInfo_ByPriorityClass.DiscardUnknown(m) -} - -var xxx_messageInfo_ByPriorityClass proto.InternalMessageInfo - -func (m *ByPriorityClass) GetPriorityClasses() []string { - if m != nil { - return m.PriorityClasses - } - return nil -} - -type ByPriorityQueue struct { - Queues []string `protobuf:"bytes,1,rep,name=queues,proto3" json:"queues,omitempty"` -} - -func (m *ByPriorityQueue) Reset() { *m = ByPriorityQueue{} } -func (m *ByPriorityQueue) String() string { return proto.CompactTextString(m) } -func (*ByPriorityQueue) ProtoMessage() {} -func (*ByPriorityQueue) Descriptor() ([]byte, []int) { - return fileDescriptor_2ccee8bdbf348752, []int{6} -} -func (m *ByPriorityQueue) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ByPriorityQueue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ByPriorityQueue.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ByPriorityQueue) XXX_Merge(src proto.Message) { - xxx_messageInfo_ByPriorityQueue.Merge(m, src) -} -func (m *ByPriorityQueue) XXX_Size() int { - return m.Size() -} -func (m *ByPriorityQueue) XXX_DiscardUnknown() { - xxx_messageInfo_ByPriorityQueue.DiscardUnknown(m) -} - -var xxx_messageInfo_ByPriorityQueue proto.InternalMessageInfo - -func (m *ByPriorityQueue) GetQueues() []string { - if m != nil { - return m.Queues - } - return nil -} - func init() { proto.RegisterType((*Event)(nil), "controlplaneevents.Event") proto.RegisterType((*ExecutorSettingsUpsert)(nil), "controlplaneevents.ExecutorSettingsUpsert") proto.RegisterType((*ExecutorSettingsDelete)(nil), "controlplaneevents.ExecutorSettingsDelete") proto.RegisterType((*PreemptOnExecutor)(nil), "controlplaneevents.PreemptOnExecutor") proto.RegisterType((*CancelOnExecutor)(nil), "controlplaneevents.CancelOnExecutor") - proto.RegisterType((*ByPriorityClass)(nil), "controlplaneevents.ByPriorityClass") - proto.RegisterType((*ByPriorityQueue)(nil), "controlplaneevents.ByPriorityQueue") } func init() { @@ -478,44 +388,43 @@ func init() { } var fileDescriptor_2ccee8bdbf348752 = []byte{ - // 588 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x95, 0x4d, 0x8f, 0xd2, 0x40, - 0x18, 0xc7, 0xe9, 0xbe, 0x33, 0x1a, 0x17, 0x46, 0xc5, 0x8a, 0xb1, 0x43, 0xd8, 0xd5, 0x6c, 0xcc, - 0xa6, 0x4d, 0xd6, 0xe8, 0xd1, 0x97, 0xc1, 0x8d, 0x1a, 0x0f, 0x22, 0xba, 0x97, 0xbd, 0x95, 0xf2, - 0x88, 0xd5, 0xb6, 0x53, 0x67, 0x06, 0x22, 0x5f, 0xc1, 0x93, 0x9f, 0xc3, 0x9b, 0x7e, 0x0a, 0x8f, - 0x7b, 0xf4, 0xd4, 0x18, 0xb8, 0xd5, 0x2f, 0x61, 0x98, 0xc2, 0x6e, 0x69, 0xab, 0x12, 0x4f, 0x9e, - 0xa0, 0x33, 0xbf, 0xff, 0xcb, 0xf0, 0x4c, 0x28, 0xda, 0x09, 0xdf, 0xf5, 0x2d, 0x87, 0x05, 0x92, - 0x33, 0x2f, 0xf4, 0xec, 0x00, 0x60, 0x08, 0x81, 0x14, 0x56, 0xf2, 0x61, 0x86, 0x9c, 0x49, 0x86, - 0x71, 0x1e, 0xa8, 0x93, 0x3e, 0x63, 0x7d, 0x0f, 0x2c, 0x45, 0x74, 0x07, 0xaf, 0x2d, 0xe9, 0xfa, - 0x20, 0xa4, 0xed, 0x87, 0x89, 0xa8, 0x39, 0x59, 0x43, 0xeb, 0x87, 0x53, 0x16, 0x3f, 0x43, 0x9b, - 0x0e, 0x07, 0x5b, 0x42, 0x4f, 0xd7, 0x1a, 0xda, 0xde, 0xb9, 0x83, 0xba, 0x99, 0x88, 0xcd, 0xb9, - 0xd8, 0x7c, 0x35, 0x17, 0xd3, 0xcb, 0x71, 0x44, 0xaa, 0x33, 0x7c, 0x9f, 0xf9, 0xae, 0x04, 0x3f, - 0x94, 0xa3, 0xce, 0xdc, 0x01, 0x7f, 0xd4, 0x50, 0x0d, 0x3e, 0x80, 0x33, 0x90, 0x8c, 0xbf, 0x04, - 0x29, 0xdd, 0xa0, 0x2f, 0x8e, 0x42, 0x01, 0x5c, 0xea, 0x2b, 0xca, 0xfc, 0x96, 0x99, 0x6f, 0x6b, - 0x1e, 0x16, 0x2a, 0xe8, 0x6e, 0x1c, 0x91, 0x46, 0xb1, 0xdb, 0x59, 0xf6, 0x93, 0x52, 0xe7, 0x37, - 0x89, 0x85, 0x65, 0x1e, 0x81, 0x07, 0x12, 0xf4, 0xd5, 0xe5, 0xcb, 0x24, 0x8a, 0xe2, 0x32, 0xc9, - 0xde, 0x9f, 0xcb, 0x24, 0x0c, 0x1e, 0xa2, 0x6a, 0xc8, 0x61, 0x4a, 0x3d, 0x0f, 0xe6, 0x11, 0xfa, - 0x9a, 0xaa, 0x71, 0xa3, 0xa8, 0x46, 0x3b, 0x0b, 0x53, 0x12, 0x47, 0xe4, 0x5a, 0xce, 0x63, 0x21, - 0x3c, 0x1f, 0x81, 0x39, 0xaa, 0x38, 0x76, 0xe0, 0x80, 0x97, 0x8a, 0x5d, 0x57, 0xb1, 0xbb, 0x45, - 0xb1, 0xad, 0x0c, 0x4b, 0x8d, 0x38, 0x22, 0xf5, 0xac, 0xc3, 0x42, 0x68, 0xce, 0x9f, 0x6e, 0xa2, - 0x75, 0x65, 0xd7, 0xfc, 0xa9, 0xa1, 0x5a, 0xf1, 0x70, 0xf1, 0x4d, 0xb4, 0x16, 0xd8, 0x3e, 0xa8, - 0x3b, 0x57, 0xa6, 0x38, 0x8e, 0xc8, 0x85, 0xe9, 0x73, 0xea, 0x52, 0xa9, 0x7d, 0x7c, 0x80, 0xb6, - 0x1c, 0xc6, 0x7b, 0x2c, 0x80, 0x9e, 0xba, 0x42, 0x5b, 0xb4, 0x16, 0x47, 0x04, 0xcf, 0xd7, 0x52, - 0xfc, 0x29, 0x87, 0xef, 0xa1, 0xf3, 0xc9, 0xf7, 0x0e, 0xd8, 0x82, 0x05, 0x6a, 0xda, 0x65, 0x5a, - 0x8f, 0x23, 0x52, 0x4b, 0xaf, 0xa7, 0xb4, 0x0b, 0x3c, 0xbe, 0x83, 0xca, 0x02, 0x24, 0x1d, 0x1d, - 0x09, 0x48, 0x66, 0x54, 0xa6, 0x57, 0xe2, 0x88, 0x5c, 0x3c, 0x5d, 0x4c, 0x29, 0xcf, 0xc8, 0xe6, - 0x83, 0xfc, 0x61, 0x67, 0xc3, 0x5f, 0xf2, 0xb0, 0xcd, 0xaf, 0x1a, 0xaa, 0xe6, 0x06, 0xbf, 0xf4, - 0x4f, 0xb5, 0x8f, 0x36, 0xde, 0x0f, 0x60, 0x00, 0x42, 0x5f, 0x69, 0xac, 0xee, 0x95, 0xe9, 0xa5, - 0x38, 0x22, 0x95, 0x64, 0x25, 0xc5, 0xce, 0x18, 0xfc, 0x18, 0x6d, 0x87, 0xdc, 0x65, 0xdc, 0x95, - 0xa3, 0x96, 0x67, 0x0b, 0x01, 0x42, 0x5f, 0x55, 0xb2, 0xeb, 0x71, 0x44, 0xae, 0x66, 0xb6, 0x52, - 0xfa, 0xac, 0xaa, 0xf9, 0x45, 0x43, 0x95, 0xec, 0xb5, 0xf9, 0xdf, 0x3b, 0x1f, 0xa3, 0x6d, 0x3a, - 0x6a, 0xa7, 0x17, 0x8b, 0xbc, 0xb5, 0x7f, 0xf2, 0xbe, 0x9f, 0xf6, 0x7e, 0x31, 0x2d, 0x9e, 0x3a, - 0xa5, 0xf6, 0xf7, 0x53, 0xd2, 0xe1, 0xb7, 0xb1, 0xa1, 0x9d, 0x8c, 0x0d, 0xed, 0xc7, 0xd8, 0xd0, - 0x3e, 0x4d, 0x8c, 0xd2, 0xc9, 0xc4, 0x28, 0x7d, 0x9f, 0x18, 0xa5, 0xe3, 0xbb, 0x7d, 0x57, 0xbe, - 0x19, 0x74, 0x4d, 0x87, 0xf9, 0x96, 0xcd, 0x7d, 0xbb, 0x67, 0x87, 0x9c, 0xbd, 0x05, 0x47, 0xce, - 0x9e, 0xac, 0xe2, 0xf7, 0xc5, 0xe7, 0x95, 0x9d, 0x87, 0x6a, 0xbf, 0x9d, 0xd0, 0xe6, 0x53, 0x66, - 0xb6, 0x12, 0xaa, 0x3d, 0xa5, 0xd4, 0x8b, 0x40, 0x74, 0x37, 0xd4, 0x1f, 0xfe, 0xed, 0x5f, 0x01, - 0x00, 0x00, 0xff, 0xff, 0x10, 0x60, 0x9c, 0x55, 0x76, 0x06, 0x00, 0x00, + // 564 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x94, 0x41, 0x8f, 0xd2, 0x40, + 0x14, 0xc7, 0xe9, 0x02, 0xbb, 0xcb, 0x68, 0x14, 0x46, 0xc5, 0x8a, 0xb1, 0x43, 0xd8, 0xd5, 0x6c, + 0xcc, 0xa6, 0x4d, 0xd6, 0xe8, 0xd1, 0xe8, 0xe0, 0x46, 0x8d, 0x07, 0x09, 0xba, 0x17, 0x6f, 0xa5, + 0x3c, 0xb1, 0xda, 0x76, 0xea, 0xcc, 0x40, 0xe4, 0x2b, 0x78, 0xf2, 0x73, 0x78, 0xd3, 0x4f, 0xe1, + 0x71, 0x8f, 0x9e, 0x1a, 0x03, 0xb7, 0xfa, 0x25, 0x0c, 0x53, 0xd8, 0x2d, 0x6d, 0x35, 0x1c, 0x3d, + 0x41, 0xe7, 0xfd, 0xfe, 0xef, 0xff, 0x6f, 0xdf, 0xcb, 0xa0, 0xbd, 0xf0, 0xc3, 0xc8, 0x72, 0x58, + 0x20, 0x39, 0xf3, 0x42, 0xcf, 0x0e, 0x00, 0x26, 0x10, 0x48, 0x61, 0x25, 0x3f, 0x66, 0xc8, 0x99, + 0x64, 0x18, 0xe7, 0x81, 0x16, 0x19, 0x31, 0x36, 0xf2, 0xc0, 0x52, 0xc4, 0x60, 0xfc, 0xd6, 0x92, + 0xae, 0x0f, 0x42, 0xda, 0x7e, 0x98, 0x88, 0x3a, 0xf3, 0x0a, 0xaa, 0x1e, 0x2f, 0x58, 0xfc, 0x02, + 0xed, 0x38, 0x1c, 0x6c, 0x09, 0x43, 0x5d, 0x6b, 0x6b, 0x07, 0x17, 0x8e, 0x5a, 0x66, 0x22, 0x36, + 0x57, 0x62, 0xf3, 0xf5, 0x4a, 0x4c, 0xaf, 0xc5, 0x11, 0x69, 0x2c, 0xf1, 0x43, 0xe6, 0xbb, 0x12, + 0xfc, 0x50, 0x4e, 0xfb, 0xab, 0x0e, 0xf8, 0xb3, 0x86, 0x9a, 0xf0, 0x09, 0x9c, 0xb1, 0x64, 0xfc, + 0x15, 0x48, 0xe9, 0x06, 0x23, 0x71, 0x12, 0x0a, 0xe0, 0x52, 0xdf, 0x52, 0xcd, 0xef, 0x9a, 0xf9, + 0xb4, 0xe6, 0x71, 0xa1, 0x82, 0xee, 0xc7, 0x11, 0x69, 0x17, 0x77, 0x3b, 0xf7, 0x7e, 0x56, 0xea, + 0xff, 0xc5, 0xb1, 0x30, 0xcc, 0x13, 0xf0, 0x40, 0x82, 0x5e, 0xde, 0x3c, 0x4c, 0xa2, 0x28, 0x0e, + 0x93, 0xd4, 0xfe, 0x1d, 0x26, 0x61, 0xf0, 0x04, 0x35, 0x42, 0x0e, 0x0b, 0xea, 0x65, 0xb0, 0xb2, + 0xd0, 0x2b, 0x2a, 0xc6, 0xed, 0xa2, 0x18, 0xbd, 0x2c, 0x4c, 0x49, 0x1c, 0x91, 0x9b, 0xb9, 0x1e, + 0x6b, 0xe6, 0x79, 0x0b, 0xcc, 0x51, 0xdd, 0xb1, 0x03, 0x07, 0xbc, 0x94, 0x6d, 0x55, 0xd9, 0xee, + 0x17, 0xd9, 0x76, 0x33, 0x2c, 0x35, 0xe2, 0x88, 0xb4, 0xb2, 0x1d, 0xd6, 0x4c, 0x73, 0xfd, 0xe9, + 0x0e, 0xaa, 0xaa, 0x76, 0x9d, 0xdf, 0x1a, 0x6a, 0x16, 0x0f, 0x17, 0xdf, 0x41, 0x95, 0xc0, 0xf6, + 0x41, 0xed, 0x5c, 0x8d, 0xe2, 0x38, 0x22, 0x97, 0x16, 0xcf, 0xa9, 0xa5, 0x52, 0x75, 0x7c, 0x84, + 0x76, 0x1d, 0xc6, 0x87, 0x2c, 0x80, 0xa1, 0x5a, 0xa1, 0x5d, 0xda, 0x8c, 0x23, 0x82, 0x57, 0x67, + 0x29, 0xfe, 0x8c, 0xc3, 0x0f, 0xd1, 0xc5, 0xe4, 0x7f, 0x1f, 0x6c, 0xc1, 0x02, 0x35, 0xed, 0x1a, + 0x6d, 0xc5, 0x11, 0x69, 0xa6, 0xcf, 0x53, 0xda, 0x35, 0x1e, 0xdf, 0x47, 0x35, 0x01, 0x92, 0x4e, + 0x4f, 0x04, 0x24, 0x33, 0xaa, 0xd1, 0xeb, 0x71, 0x44, 0xae, 0x9c, 0x1d, 0xa6, 0x94, 0xe7, 0x64, + 0xe7, 0x51, 0xfe, 0x65, 0x97, 0xc3, 0xdf, 0xf0, 0x65, 0x3b, 0xdf, 0x35, 0xd4, 0xc8, 0x0d, 0x7e, + 0xe3, 0x4f, 0x75, 0x88, 0xb6, 0x3f, 0x8e, 0x61, 0x0c, 0x42, 0xdf, 0x6a, 0x97, 0x0f, 0x6a, 0xf4, + 0x6a, 0x1c, 0x91, 0x7a, 0x72, 0x92, 0x62, 0x97, 0x0c, 0x7e, 0x8a, 0x2e, 0x87, 0xdc, 0x65, 0xdc, + 0x95, 0xd3, 0xae, 0x67, 0x0b, 0x01, 0x42, 0x2f, 0x2b, 0xd9, 0xad, 0x38, 0x22, 0x37, 0x32, 0xa5, + 0x94, 0x3e, 0xab, 0xea, 0x7c, 0xd3, 0x50, 0x3d, 0xbb, 0x36, 0xff, 0x79, 0x66, 0x3a, 0xf9, 0x31, + 0x33, 0xb4, 0xd3, 0x99, 0xa1, 0xfd, 0x9a, 0x19, 0xda, 0x97, 0xb9, 0x51, 0x3a, 0x9d, 0x1b, 0xa5, + 0x9f, 0x73, 0xa3, 0xf4, 0xe6, 0xc1, 0xc8, 0x95, 0xef, 0xc6, 0x03, 0xd3, 0x61, 0xbe, 0x65, 0x73, + 0xdf, 0x1e, 0xda, 0x21, 0x67, 0xef, 0xc1, 0x91, 0xcb, 0x27, 0xab, 0xf8, 0x4a, 0xfe, 0xba, 0xb5, + 0xf7, 0x58, 0xd5, 0x7b, 0x09, 0x6d, 0x3e, 0x67, 0x66, 0x37, 0xa1, 0x7a, 0x0b, 0x4a, 0xdd, 0xb5, + 0x62, 0xb0, 0xad, 0xee, 0xd4, 0x7b, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x09, 0xe8, 0xfb, 0x3a, + 0xd9, 0x05, 0x00, 0x00, } func (m *Event) Marshal() (dAtA []byte, err error) { @@ -826,70 +735,6 @@ func (m *CancelOnExecutor) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *ByPriorityClass) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ByPriorityClass) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ByPriorityClass) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.PriorityClasses) > 0 { - for iNdEx := len(m.PriorityClasses) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.PriorityClasses[iNdEx]) - copy(dAtA[i:], m.PriorityClasses[iNdEx]) - i = encodeVarintEvents(dAtA, i, uint64(len(m.PriorityClasses[iNdEx]))) - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - -func (m *ByPriorityQueue) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ByPriorityQueue) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ByPriorityQueue) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Queues) > 0 { - for iNdEx := len(m.Queues) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.Queues[iNdEx]) - copy(dAtA[i:], m.Queues[iNdEx]) - i = encodeVarintEvents(dAtA, i, uint64(len(m.Queues[iNdEx]))) - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - func encodeVarintEvents(dAtA []byte, offset int, v uint64) int { offset -= sovEvents(v) base := offset @@ -1052,36 +897,6 @@ func (m *CancelOnExecutor) Size() (n int) { return n } -func (m *ByPriorityClass) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.PriorityClasses) > 0 { - for _, s := range m.PriorityClasses { - l = len(s) - n += 1 + l + sovEvents(uint64(l)) - } - } - return n -} - -func (m *ByPriorityQueue) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Queues) > 0 { - for _, s := range m.Queues { - l = len(s) - n += 1 + l + sovEvents(uint64(l)) - } - } - return n -} - func sovEvents(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -1854,170 +1669,6 @@ func (m *CancelOnExecutor) Unmarshal(dAtA []byte) error { } return nil } -func (m *ByPriorityClass) 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 ErrIntOverflowEvents - } - 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: ByPriorityClass: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ByPriorityClass: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PriorityClasses", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - 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 ErrInvalidLengthEvents - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.PriorityClasses = append(m.PriorityClasses, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEvents(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvents - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ByPriorityQueue) 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 ErrIntOverflowEvents - } - 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: ByPriorityQueue: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ByPriorityQueue: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Queues", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - 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 ErrInvalidLengthEvents - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Queues = append(m.Queues, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEvents(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvents - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func skipEvents(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/pkg/controlplaneevents/events.proto b/pkg/controlplaneevents/events.proto index 34830962011..5c5c3e6d0b3 100644 --- a/pkg/controlplaneevents/events.proto +++ b/pkg/controlplaneevents/events.proto @@ -38,11 +38,3 @@ message CancelOnExecutor { repeated string queues = 2; repeated string priorityClasses = 3; } - -message ByPriorityClass { - repeated string priorityClasses = 1; -} - -message ByPriorityQueue { - repeated string queues = 1; -}