diff --git a/api/pb/cluster.pb.go b/api/pb/cluster.pb.go index 6f042979..8bc0c81f 100644 --- a/api/pb/cluster.pb.go +++ b/api/pb/cluster.pb.go @@ -124,6 +124,7 @@ func (x DNSRecord_RecordType) Number() protoreflect.EnumNumber { // Deprecated: Use DNSRecord_RecordType.Descriptor instead. func (DNSRecord_RecordType) EnumDescriptor() ([]byte, []int) { +<<<<<<< HEAD:api/pb/cluster.pb.go <<<<<<< HEAD:api/pb/cluster.pb.go return file_api_pb_cluster_proto_rawDescGZIP(), []int{9, 0} ||||||| parent of bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go @@ -131,6 +132,11 @@ func (DNSRecord_RecordType) EnumDescriptor() ([]byte, []int) { ======= return file_internal_machine_api_pb_cluster_proto_rawDescGZIP(), []int{12, 0} >>>>>>> bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go +||||||| parent of 062f862 (from main):internal/machine/api/pb/cluster.pb.go + return file_internal_machine_api_pb_cluster_proto_rawDescGZIP(), []int{12, 0} +======= + return file_internal_machine_api_pb_cluster_proto_rawDescGZIP(), []int{9, 0} +>>>>>>> 062f862 (from main):internal/machine/api/pb/cluster.pb.go } type AddMachineRequest struct { @@ -345,126 +351,6 @@ func (x *ListMachinesResponse) GetMachines() []*MachineMember { return nil } -type UpdateMachineRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Machine to update - MachineId string `protobuf:"bytes,1,opt,name=machine_id,json=machineId,proto3" json:"machine_id,omitempty"` - // Updated machine information - Name *string `protobuf:"bytes,2,opt,name=name,proto3,oneof" json:"name,omitempty"` - PublicIp *IP `protobuf:"bytes,3,opt,name=public_ip,json=publicIp,proto3,oneof" json:"public_ip,omitempty"` - Endpoints []*IPPort `protobuf:"bytes,4,rep,name=endpoints,proto3" json:"endpoints,omitempty"` -} - -func (x *UpdateMachineRequest) Reset() { - *x = UpdateMachineRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *UpdateMachineRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*UpdateMachineRequest) ProtoMessage() {} - -func (x *UpdateMachineRequest) ProtoReflect() protoreflect.Message { - mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use UpdateMachineRequest.ProtoReflect.Descriptor instead. -func (*UpdateMachineRequest) Descriptor() ([]byte, []int) { - return file_internal_machine_api_pb_cluster_proto_rawDescGZIP(), []int{4} -} - -func (x *UpdateMachineRequest) GetMachineId() string { - if x != nil { - return x.MachineId - } - return "" -} - -func (x *UpdateMachineRequest) GetName() string { - if x != nil && x.Name != nil { - return *x.Name - } - return "" -} - -func (x *UpdateMachineRequest) GetPublicIp() *IP { - if x != nil { - return x.PublicIp - } - return nil -} - -func (x *UpdateMachineRequest) GetEndpoints() []*IPPort { - if x != nil { - return x.Endpoints - } - return nil -} - -type UpdateMachineResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Machine *MachineInfo `protobuf:"bytes,1,opt,name=machine,proto3" json:"machine,omitempty"` -} - -func (x *UpdateMachineResponse) Reset() { - *x = UpdateMachineResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *UpdateMachineResponse) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*UpdateMachineResponse) ProtoMessage() {} - -func (x *UpdateMachineResponse) ProtoReflect() protoreflect.Message { - mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use UpdateMachineResponse.ProtoReflect.Descriptor instead. -func (*UpdateMachineResponse) Descriptor() ([]byte, []int) { - return file_internal_machine_api_pb_cluster_proto_rawDescGZIP(), []int{5} -} - -func (x *UpdateMachineResponse) GetMachine() *MachineInfo { - if x != nil { - return x.Machine - } - return nil -} - type RemoveMachineRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -476,6 +362,7 @@ type RemoveMachineRequest struct { func (x *RemoveMachineRequest) Reset() { *x = RemoveMachineRequest{} if protoimpl.UnsafeEnabled { +<<<<<<< HEAD:api/pb/cluster.pb.go <<<<<<< HEAD:api/pb/cluster.pb.go mi := &file_api_pb_cluster_proto_msgTypes[4] ||||||| parent of bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go @@ -483,6 +370,11 @@ func (x *RemoveMachineRequest) Reset() { ======= mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[6] >>>>>>> bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go +||||||| parent of 062f862 (from main):internal/machine/api/pb/cluster.pb.go + mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[6] +======= + mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[4] +>>>>>>> 062f862 (from main):internal/machine/api/pb/cluster.pb.go ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -495,6 +387,7 @@ func (x *RemoveMachineRequest) String() string { func (*RemoveMachineRequest) ProtoMessage() {} func (x *RemoveMachineRequest) ProtoReflect() protoreflect.Message { +<<<<<<< HEAD:api/pb/cluster.pb.go <<<<<<< HEAD:api/pb/cluster.pb.go mi := &file_api_pb_cluster_proto_msgTypes[4] ||||||| parent of bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go @@ -502,6 +395,11 @@ func (x *RemoveMachineRequest) ProtoReflect() protoreflect.Message { ======= mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[6] >>>>>>> bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go +||||||| parent of 062f862 (from main):internal/machine/api/pb/cluster.pb.go + mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[6] +======= + mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[4] +>>>>>>> 062f862 (from main):internal/machine/api/pb/cluster.pb.go if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -514,6 +412,7 @@ func (x *RemoveMachineRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use RemoveMachineRequest.ProtoReflect.Descriptor instead. func (*RemoveMachineRequest) Descriptor() ([]byte, []int) { +<<<<<<< HEAD:api/pb/cluster.pb.go <<<<<<< HEAD:api/pb/cluster.pb.go return file_api_pb_cluster_proto_rawDescGZIP(), []int{4} ||||||| parent of bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go @@ -521,6 +420,11 @@ func (*RemoveMachineRequest) Descriptor() ([]byte, []int) { ======= return file_internal_machine_api_pb_cluster_proto_rawDescGZIP(), []int{6} >>>>>>> bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go +||||||| parent of 062f862 (from main):internal/machine/api/pb/cluster.pb.go + return file_internal_machine_api_pb_cluster_proto_rawDescGZIP(), []int{6} +======= + return file_internal_machine_api_pb_cluster_proto_rawDescGZIP(), []int{4} +>>>>>>> 062f862 (from main):internal/machine/api/pb/cluster.pb.go } func (x *RemoveMachineRequest) GetId() string { @@ -541,6 +445,7 @@ type Domain struct { func (x *Domain) Reset() { *x = Domain{} if protoimpl.UnsafeEnabled { +<<<<<<< HEAD:api/pb/cluster.pb.go <<<<<<< HEAD:api/pb/cluster.pb.go mi := &file_api_pb_cluster_proto_msgTypes[5] ||||||| parent of bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go @@ -548,6 +453,11 @@ func (x *Domain) Reset() { ======= mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[7] >>>>>>> bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go +||||||| parent of 062f862 (from main):internal/machine/api/pb/cluster.pb.go + mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[7] +======= + mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[5] +>>>>>>> 062f862 (from main):internal/machine/api/pb/cluster.pb.go ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -560,6 +470,7 @@ func (x *Domain) String() string { func (*Domain) ProtoMessage() {} func (x *Domain) ProtoReflect() protoreflect.Message { +<<<<<<< HEAD:api/pb/cluster.pb.go <<<<<<< HEAD:api/pb/cluster.pb.go mi := &file_api_pb_cluster_proto_msgTypes[5] ||||||| parent of bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go @@ -567,6 +478,11 @@ func (x *Domain) ProtoReflect() protoreflect.Message { ======= mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[7] >>>>>>> bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go +||||||| parent of 062f862 (from main):internal/machine/api/pb/cluster.pb.go + mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[7] +======= + mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[5] +>>>>>>> 062f862 (from main):internal/machine/api/pb/cluster.pb.go if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -579,6 +495,7 @@ func (x *Domain) ProtoReflect() protoreflect.Message { // Deprecated: Use Domain.ProtoReflect.Descriptor instead. func (*Domain) Descriptor() ([]byte, []int) { +<<<<<<< HEAD:api/pb/cluster.pb.go <<<<<<< HEAD:api/pb/cluster.pb.go return file_api_pb_cluster_proto_rawDescGZIP(), []int{5} ||||||| parent of bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go @@ -586,6 +503,11 @@ func (*Domain) Descriptor() ([]byte, []int) { ======= return file_internal_machine_api_pb_cluster_proto_rawDescGZIP(), []int{7} >>>>>>> bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go +||||||| parent of 062f862 (from main):internal/machine/api/pb/cluster.pb.go + return file_internal_machine_api_pb_cluster_proto_rawDescGZIP(), []int{7} +======= + return file_internal_machine_api_pb_cluster_proto_rawDescGZIP(), []int{5} +>>>>>>> 062f862 (from main):internal/machine/api/pb/cluster.pb.go } func (x *Domain) GetName() string { @@ -606,6 +528,7 @@ type ReserveDomainRequest struct { func (x *ReserveDomainRequest) Reset() { *x = ReserveDomainRequest{} if protoimpl.UnsafeEnabled { +<<<<<<< HEAD:api/pb/cluster.pb.go <<<<<<< HEAD:api/pb/cluster.pb.go mi := &file_api_pb_cluster_proto_msgTypes[6] ||||||| parent of bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go @@ -613,6 +536,11 @@ func (x *ReserveDomainRequest) Reset() { ======= mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[8] >>>>>>> bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go +||||||| parent of 062f862 (from main):internal/machine/api/pb/cluster.pb.go + mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[8] +======= + mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[6] +>>>>>>> 062f862 (from main):internal/machine/api/pb/cluster.pb.go ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -625,6 +553,7 @@ func (x *ReserveDomainRequest) String() string { func (*ReserveDomainRequest) ProtoMessage() {} func (x *ReserveDomainRequest) ProtoReflect() protoreflect.Message { +<<<<<<< HEAD:api/pb/cluster.pb.go <<<<<<< HEAD:api/pb/cluster.pb.go mi := &file_api_pb_cluster_proto_msgTypes[6] ||||||| parent of bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go @@ -632,6 +561,11 @@ func (x *ReserveDomainRequest) ProtoReflect() protoreflect.Message { ======= mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[8] >>>>>>> bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go +||||||| parent of 062f862 (from main):internal/machine/api/pb/cluster.pb.go + mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[8] +======= + mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[6] +>>>>>>> 062f862 (from main):internal/machine/api/pb/cluster.pb.go if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -644,6 +578,7 @@ func (x *ReserveDomainRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ReserveDomainRequest.ProtoReflect.Descriptor instead. func (*ReserveDomainRequest) Descriptor() ([]byte, []int) { +<<<<<<< HEAD:api/pb/cluster.pb.go <<<<<<< HEAD:api/pb/cluster.pb.go return file_api_pb_cluster_proto_rawDescGZIP(), []int{6} ||||||| parent of bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go @@ -651,6 +586,11 @@ func (*ReserveDomainRequest) Descriptor() ([]byte, []int) { ======= return file_internal_machine_api_pb_cluster_proto_rawDescGZIP(), []int{8} >>>>>>> bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go +||||||| parent of 062f862 (from main):internal/machine/api/pb/cluster.pb.go + return file_internal_machine_api_pb_cluster_proto_rawDescGZIP(), []int{8} +======= + return file_internal_machine_api_pb_cluster_proto_rawDescGZIP(), []int{6} +>>>>>>> 062f862 (from main):internal/machine/api/pb/cluster.pb.go } func (x *ReserveDomainRequest) GetEndpoint() string { @@ -660,53 +600,6 @@ func (x *ReserveDomainRequest) GetEndpoint() string { return "" } -type SetDomainRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` -} - -func (x *SetDomainRequest) Reset() { - *x = SetDomainRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *SetDomainRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*SetDomainRequest) ProtoMessage() {} - -func (x *SetDomainRequest) ProtoReflect() protoreflect.Message { - mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use SetDomainRequest.ProtoReflect.Descriptor instead. -func (*SetDomainRequest) Descriptor() ([]byte, []int) { - return file_internal_machine_api_pb_cluster_proto_rawDescGZIP(), []int{9} -} - -func (x *SetDomainRequest) GetName() string { - if x != nil { - return x.Name - } - return "" -} - type CreateDomainRecordsRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -718,6 +611,7 @@ type CreateDomainRecordsRequest struct { func (x *CreateDomainRecordsRequest) Reset() { *x = CreateDomainRecordsRequest{} if protoimpl.UnsafeEnabled { +<<<<<<< HEAD:api/pb/cluster.pb.go <<<<<<< HEAD:api/pb/cluster.pb.go mi := &file_api_pb_cluster_proto_msgTypes[7] ||||||| parent of bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go @@ -725,6 +619,11 @@ func (x *CreateDomainRecordsRequest) Reset() { ======= mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[10] >>>>>>> bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go +||||||| parent of 062f862 (from main):internal/machine/api/pb/cluster.pb.go + mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[10] +======= + mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[7] +>>>>>>> 062f862 (from main):internal/machine/api/pb/cluster.pb.go ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -737,6 +636,7 @@ func (x *CreateDomainRecordsRequest) String() string { func (*CreateDomainRecordsRequest) ProtoMessage() {} func (x *CreateDomainRecordsRequest) ProtoReflect() protoreflect.Message { +<<<<<<< HEAD:api/pb/cluster.pb.go <<<<<<< HEAD:api/pb/cluster.pb.go mi := &file_api_pb_cluster_proto_msgTypes[7] ||||||| parent of bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go @@ -744,6 +644,11 @@ func (x *CreateDomainRecordsRequest) ProtoReflect() protoreflect.Message { ======= mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[10] >>>>>>> bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go +||||||| parent of 062f862 (from main):internal/machine/api/pb/cluster.pb.go + mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[10] +======= + mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[7] +>>>>>>> 062f862 (from main):internal/machine/api/pb/cluster.pb.go if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -756,6 +661,7 @@ func (x *CreateDomainRecordsRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use CreateDomainRecordsRequest.ProtoReflect.Descriptor instead. func (*CreateDomainRecordsRequest) Descriptor() ([]byte, []int) { +<<<<<<< HEAD:api/pb/cluster.pb.go <<<<<<< HEAD:api/pb/cluster.pb.go return file_api_pb_cluster_proto_rawDescGZIP(), []int{7} ||||||| parent of bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go @@ -763,6 +669,11 @@ func (*CreateDomainRecordsRequest) Descriptor() ([]byte, []int) { ======= return file_internal_machine_api_pb_cluster_proto_rawDescGZIP(), []int{10} >>>>>>> bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go +||||||| parent of 062f862 (from main):internal/machine/api/pb/cluster.pb.go + return file_internal_machine_api_pb_cluster_proto_rawDescGZIP(), []int{10} +======= + return file_internal_machine_api_pb_cluster_proto_rawDescGZIP(), []int{7} +>>>>>>> 062f862 (from main):internal/machine/api/pb/cluster.pb.go } func (x *CreateDomainRecordsRequest) GetRecords() []*DNSRecord { @@ -783,6 +694,7 @@ type CreateDomainRecordsResponse struct { func (x *CreateDomainRecordsResponse) Reset() { *x = CreateDomainRecordsResponse{} if protoimpl.UnsafeEnabled { +<<<<<<< HEAD:api/pb/cluster.pb.go <<<<<<< HEAD:api/pb/cluster.pb.go mi := &file_api_pb_cluster_proto_msgTypes[8] ||||||| parent of bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go @@ -790,6 +702,11 @@ func (x *CreateDomainRecordsResponse) Reset() { ======= mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[11] >>>>>>> bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go +||||||| parent of 062f862 (from main):internal/machine/api/pb/cluster.pb.go + mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[11] +======= + mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[8] +>>>>>>> 062f862 (from main):internal/machine/api/pb/cluster.pb.go ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -802,6 +719,7 @@ func (x *CreateDomainRecordsResponse) String() string { func (*CreateDomainRecordsResponse) ProtoMessage() {} func (x *CreateDomainRecordsResponse) ProtoReflect() protoreflect.Message { +<<<<<<< HEAD:api/pb/cluster.pb.go <<<<<<< HEAD:api/pb/cluster.pb.go mi := &file_api_pb_cluster_proto_msgTypes[8] ||||||| parent of bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go @@ -809,6 +727,11 @@ func (x *CreateDomainRecordsResponse) ProtoReflect() protoreflect.Message { ======= mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[11] >>>>>>> bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go +||||||| parent of 062f862 (from main):internal/machine/api/pb/cluster.pb.go + mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[11] +======= + mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[8] +>>>>>>> 062f862 (from main):internal/machine/api/pb/cluster.pb.go if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -821,6 +744,7 @@ func (x *CreateDomainRecordsResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use CreateDomainRecordsResponse.ProtoReflect.Descriptor instead. func (*CreateDomainRecordsResponse) Descriptor() ([]byte, []int) { +<<<<<<< HEAD:api/pb/cluster.pb.go <<<<<<< HEAD:api/pb/cluster.pb.go return file_api_pb_cluster_proto_rawDescGZIP(), []int{8} ||||||| parent of bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go @@ -828,6 +752,11 @@ func (*CreateDomainRecordsResponse) Descriptor() ([]byte, []int) { ======= return file_internal_machine_api_pb_cluster_proto_rawDescGZIP(), []int{11} >>>>>>> bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go +||||||| parent of 062f862 (from main):internal/machine/api/pb/cluster.pb.go + return file_internal_machine_api_pb_cluster_proto_rawDescGZIP(), []int{11} +======= + return file_internal_machine_api_pb_cluster_proto_rawDescGZIP(), []int{8} +>>>>>>> 062f862 (from main):internal/machine/api/pb/cluster.pb.go } func (x *CreateDomainRecordsResponse) GetRecords() []*DNSRecord { @@ -850,6 +779,7 @@ type DNSRecord struct { func (x *DNSRecord) Reset() { *x = DNSRecord{} if protoimpl.UnsafeEnabled { +<<<<<<< HEAD:api/pb/cluster.pb.go <<<<<<< HEAD:api/pb/cluster.pb.go mi := &file_api_pb_cluster_proto_msgTypes[9] ||||||| parent of bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go @@ -857,6 +787,11 @@ func (x *DNSRecord) Reset() { ======= mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[12] >>>>>>> bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go +||||||| parent of 062f862 (from main):internal/machine/api/pb/cluster.pb.go + mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[12] +======= + mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[9] +>>>>>>> 062f862 (from main):internal/machine/api/pb/cluster.pb.go ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -869,6 +804,7 @@ func (x *DNSRecord) String() string { func (*DNSRecord) ProtoMessage() {} func (x *DNSRecord) ProtoReflect() protoreflect.Message { +<<<<<<< HEAD:api/pb/cluster.pb.go <<<<<<< HEAD:api/pb/cluster.pb.go mi := &file_api_pb_cluster_proto_msgTypes[9] ||||||| parent of bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go @@ -876,6 +812,11 @@ func (x *DNSRecord) ProtoReflect() protoreflect.Message { ======= mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[12] >>>>>>> bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go +||||||| parent of 062f862 (from main):internal/machine/api/pb/cluster.pb.go + mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[12] +======= + mi := &file_internal_machine_api_pb_cluster_proto_msgTypes[9] +>>>>>>> 062f862 (from main):internal/machine/api/pb/cluster.pb.go if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -888,6 +829,7 @@ func (x *DNSRecord) ProtoReflect() protoreflect.Message { // Deprecated: Use DNSRecord.ProtoReflect.Descriptor instead. func (*DNSRecord) Descriptor() ([]byte, []int) { +<<<<<<< HEAD:api/pb/cluster.pb.go <<<<<<< HEAD:api/pb/cluster.pb.go return file_api_pb_cluster_proto_rawDescGZIP(), []int{9} ||||||| parent of bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go @@ -895,6 +837,11 @@ func (*DNSRecord) Descriptor() ([]byte, []int) { ======= return file_internal_machine_api_pb_cluster_proto_rawDescGZIP(), []int{12} >>>>>>> bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go +||||||| parent of 062f862 (from main):internal/machine/api/pb/cluster.pb.go + return file_internal_machine_api_pb_cluster_proto_rawDescGZIP(), []int{12} +======= + return file_internal_machine_api_pb_cluster_proto_rawDescGZIP(), []int{9} +>>>>>>> 062f862 (from main):internal/machine/api/pb/cluster.pb.go } func (x *DNSRecord) GetName() string { @@ -1153,6 +1100,7 @@ var file_internal_machine_api_pb_cluster_proto_rawDesc = []byte{ 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2e, 0x0a, 0x08, 0x6d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x08, 0x6d, 0x61, 0x63, 0x68, +<<<<<<< HEAD:api/pb/cluster.pb.go 0x69, 0x6e, 0x65, 0x73, 0x22, 0xbb, 0x01, 0x0a, 0x14, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x6d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, @@ -1240,6 +1188,155 @@ var file_internal_machine_api_pb_cluster_proto_rawDesc = []byte{ 0x6e, 0x61, 0x6c, 0x2f, 0x6d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, >>>>>>> bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go +||||||| parent of 062f862 (from main):internal/machine/api/pb/cluster.pb.go + 0x69, 0x6e, 0x65, 0x73, 0x22, 0xbb, 0x01, 0x0a, 0x14, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, + 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, + 0x0a, 0x6d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x09, 0x6d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x49, 0x64, 0x12, 0x17, 0x0a, 0x04, + 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x6e, 0x61, + 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x29, 0x0a, 0x09, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, + 0x69, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x49, + 0x50, 0x48, 0x01, 0x52, 0x08, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x49, 0x70, 0x88, 0x01, 0x01, + 0x12, 0x29, 0x0a, 0x09, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x18, 0x04, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x49, 0x50, 0x50, 0x6f, 0x72, 0x74, + 0x52, 0x09, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x42, 0x07, 0x0a, 0x05, 0x5f, + 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, + 0x69, 0x70, 0x22, 0x43, 0x0a, 0x15, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x61, 0x63, 0x68, + 0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2a, 0x0a, 0x07, 0x6d, + 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x61, + 0x70, 0x69, 0x2e, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x07, + 0x6d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x22, 0x26, 0x0a, 0x14, 0x52, 0x65, 0x6d, 0x6f, 0x76, + 0x65, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, + 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, + 0x1c, 0x0a, 0x06, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x32, 0x0a, + 0x14, 0x52, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, + 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, + 0x74, 0x22, 0x26, 0x0a, 0x10, 0x53, 0x65, 0x74, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x46, 0x0a, 0x1a, 0x43, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x28, 0x0a, 0x07, 0x72, 0x65, 0x63, 0x6f, 0x72, + 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x44, + 0x4e, 0x53, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x07, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, + 0x73, 0x22, 0x47, 0x0a, 0x1b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x6f, 0x6d, 0x61, 0x69, + 0x6e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x12, 0x28, 0x0a, 0x07, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x0e, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x44, 0x4e, 0x53, 0x52, 0x65, 0x63, 0x6f, 0x72, + 0x64, 0x52, 0x07, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x22, 0x96, 0x01, 0x0a, 0x09, 0x44, + 0x4e, 0x53, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2d, 0x0a, 0x04, + 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x19, 0x2e, 0x61, 0x70, 0x69, + 0x2e, 0x44, 0x4e, 0x53, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x52, 0x65, 0x63, 0x6f, 0x72, + 0x64, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x73, 0x22, 0x2e, 0x0a, 0x0a, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x54, 0x79, 0x70, + 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, + 0x10, 0x00, 0x12, 0x05, 0x0a, 0x01, 0x41, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x41, 0x41, 0x41, + 0x41, 0x10, 0x02, 0x32, 0xc3, 0x04, 0x0a, 0x07, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, + 0x3d, 0x0a, 0x0a, 0x41, 0x64, 0x64, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x12, 0x16, 0x2e, + 0x61, 0x70, 0x69, 0x2e, 0x41, 0x64, 0x64, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x41, 0x64, 0x64, 0x4d, + 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x41, + 0x0a, 0x0c, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x73, 0x12, 0x16, + 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, + 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x19, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x4c, 0x69, 0x73, + 0x74, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x12, 0x46, 0x0a, 0x0d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x61, 0x63, 0x68, 0x69, + 0x6e, 0x65, 0x12, 0x19, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, + 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, + 0x61, 0x70, 0x69, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x6e, + 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x42, 0x0a, 0x0d, 0x52, 0x65, 0x6d, + 0x6f, 0x76, 0x65, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x12, 0x19, 0x2e, 0x61, 0x70, 0x69, + 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x12, 0x37, 0x0a, + 0x0d, 0x52, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x19, + 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x52, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x44, 0x6f, 0x6d, 0x61, + 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0b, 0x2e, 0x61, 0x70, 0x69, 0x2e, + 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x2f, 0x0a, 0x09, 0x53, 0x65, 0x74, 0x44, 0x6f, 0x6d, + 0x61, 0x69, 0x6e, 0x12, 0x15, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x53, 0x65, 0x74, 0x44, 0x6f, 0x6d, + 0x61, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0b, 0x2e, 0x61, 0x70, 0x69, + 0x2e, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x30, 0x0a, 0x09, 0x47, 0x65, 0x74, 0x44, 0x6f, + 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x0b, 0x2e, 0x61, + 0x70, 0x69, 0x2e, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x34, 0x0a, 0x0d, 0x52, 0x65, 0x6c, + 0x65, 0x61, 0x73, 0x65, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, + 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, + 0x74, 0x79, 0x1a, 0x0b, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, + 0x58, 0x0a, 0x13, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52, + 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x12, 0x1f, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x43, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x43, 0x72, + 0x65, 0x61, 0x74, 0x65, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, + 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x37, 0x5a, 0x35, 0x67, 0x69, 0x74, + 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x73, 0x76, 0x69, 0x64, 0x65, 0x72, 0x73, + 0x6b, 0x69, 0x2f, 0x75, 0x6e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, + 0x6e, 0x61, 0x6c, 0x2f, 0x6d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +======= + 0x69, 0x6e, 0x65, 0x73, 0x22, 0x26, 0x0a, 0x14, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x4d, 0x61, + 0x63, 0x68, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, + 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x1c, 0x0a, 0x06, + 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x32, 0x0a, 0x14, 0x52, 0x65, + 0x73, 0x65, 0x72, 0x76, 0x65, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x22, 0x46, + 0x0a, 0x1a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52, 0x65, + 0x63, 0x6f, 0x72, 0x64, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x28, 0x0a, 0x07, + 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, + 0x61, 0x70, 0x69, 0x2e, 0x44, 0x4e, 0x53, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x07, 0x72, + 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x22, 0x47, 0x0a, 0x1b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, + 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x07, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, + 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x44, 0x4e, 0x53, + 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x07, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x22, + 0x96, 0x01, 0x0a, 0x09, 0x44, 0x4e, 0x53, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x12, 0x0a, + 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x12, 0x2d, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, + 0x19, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x44, 0x4e, 0x53, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, + 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, + 0x12, 0x16, 0x0a, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, + 0x52, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x22, 0x2e, 0x0a, 0x0a, 0x52, 0x65, 0x63, 0x6f, + 0x72, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, + 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x05, 0x0a, 0x01, 0x41, 0x10, 0x01, 0x12, 0x08, + 0x0a, 0x04, 0x41, 0x41, 0x41, 0x41, 0x10, 0x02, 0x32, 0xca, 0x03, 0x0a, 0x07, 0x43, 0x6c, 0x75, + 0x73, 0x74, 0x65, 0x72, 0x12, 0x3d, 0x0a, 0x0a, 0x41, 0x64, 0x64, 0x4d, 0x61, 0x63, 0x68, 0x69, + 0x6e, 0x65, 0x12, 0x16, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x41, 0x64, 0x64, 0x4d, 0x61, 0x63, 0x68, + 0x69, 0x6e, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x61, 0x70, 0x69, + 0x2e, 0x41, 0x64, 0x64, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x12, 0x41, 0x0a, 0x0c, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x61, 0x63, 0x68, 0x69, + 0x6e, 0x65, 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x19, 0x2e, 0x61, 0x70, + 0x69, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x73, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x42, 0x0a, 0x0d, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, + 0x4d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x12, 0x19, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x52, 0x65, + 0x6d, 0x6f, 0x76, 0x65, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x12, 0x37, 0x0a, 0x0d, 0x52, 0x65, + 0x73, 0x65, 0x72, 0x76, 0x65, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x19, 0x2e, 0x61, 0x70, + 0x69, 0x2e, 0x52, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0b, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x44, 0x6f, 0x6d, + 0x61, 0x69, 0x6e, 0x12, 0x30, 0x0a, 0x09, 0x47, 0x65, 0x74, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, + 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, + 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x0b, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x44, + 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x34, 0x0a, 0x0d, 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, + 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x0b, + 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x58, 0x0a, 0x13, 0x43, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x63, 0x6f, 0x72, + 0x64, 0x73, 0x12, 0x1f, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, + 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, + 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x37, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x73, 0x76, 0x69, 0x64, 0x65, 0x72, 0x73, 0x6b, 0x69, 0x2f, 0x75, + 0x6e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, + 0x6d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x62, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +>>>>>>> 062f862 (from main):internal/machine/api/pb/cluster.pb.go } var ( @@ -1264,7 +1361,7 @@ var file_internal_machine_api_pb_cluster_proto_msgTypes = make([]protoimpl.Messa var file_internal_machine_api_pb_cluster_proto_goTypes = []any{ ======= var file_internal_machine_api_pb_cluster_proto_enumTypes = make([]protoimpl.EnumInfo, 2) -var file_internal_machine_api_pb_cluster_proto_msgTypes = make([]protoimpl.MessageInfo, 13) +var file_internal_machine_api_pb_cluster_proto_msgTypes = make([]protoimpl.MessageInfo, 10) var file_internal_machine_api_pb_cluster_proto_goTypes = []any{ >>>>>>> bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go (MachineMember_MembershipState)(0), // 0: api.MachineMember.MembershipState @@ -1273,20 +1370,16 @@ var file_internal_machine_api_pb_cluster_proto_goTypes = []any{ (*AddMachineResponse)(nil), // 3: api.AddMachineResponse (*MachineMember)(nil), // 4: api.MachineMember (*ListMachinesResponse)(nil), // 5: api.ListMachinesResponse - (*UpdateMachineRequest)(nil), // 6: api.UpdateMachineRequest - (*UpdateMachineResponse)(nil), // 7: api.UpdateMachineResponse - (*RemoveMachineRequest)(nil), // 8: api.RemoveMachineRequest - (*Domain)(nil), // 9: api.Domain - (*ReserveDomainRequest)(nil), // 10: api.ReserveDomainRequest - (*SetDomainRequest)(nil), // 11: api.SetDomainRequest - (*CreateDomainRecordsRequest)(nil), // 12: api.CreateDomainRecordsRequest - (*CreateDomainRecordsResponse)(nil), // 13: api.CreateDomainRecordsResponse - (*DNSRecord)(nil), // 14: api.DNSRecord - (*NetworkConfig)(nil), // 15: api.NetworkConfig - (*IP)(nil), // 16: api.IP - (*MachineInfo)(nil), // 17: api.MachineInfo - (*IPPort)(nil), // 18: api.IPPort - (*emptypb.Empty)(nil), // 19: google.protobuf.Empty + (*RemoveMachineRequest)(nil), // 6: api.RemoveMachineRequest + (*Domain)(nil), // 7: api.Domain + (*ReserveDomainRequest)(nil), // 8: api.ReserveDomainRequest + (*CreateDomainRecordsRequest)(nil), // 9: api.CreateDomainRecordsRequest + (*CreateDomainRecordsResponse)(nil), // 10: api.CreateDomainRecordsResponse + (*DNSRecord)(nil), // 11: api.DNSRecord + (*NetworkConfig)(nil), // 12: api.NetworkConfig + (*IP)(nil), // 13: api.IP + (*MachineInfo)(nil), // 14: api.MachineInfo + (*emptypb.Empty)(nil), // 15: google.protobuf.Empty } <<<<<<< HEAD:api/pb/cluster.pb.go var file_api_pb_cluster_proto_depIdxs = []int32{ @@ -1302,42 +1395,47 @@ var file_internal_machine_api_pb_cluster_proto_depIdxs = []int32{ 14, // 3: api.MachineMember.machine:type_name -> api.MachineInfo ======= var file_internal_machine_api_pb_cluster_proto_depIdxs = []int32{ +<<<<<<< HEAD:api/pb/cluster.pb.go 15, // 0: api.AddMachineRequest.network:type_name -> api.NetworkConfig 16, // 1: api.AddMachineRequest.public_ip:type_name -> api.IP 17, // 2: api.AddMachineResponse.machine:type_name -> api.MachineInfo 17, // 3: api.MachineMember.machine:type_name -> api.MachineInfo >>>>>>> bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go +||||||| parent of 062f862 (from main):internal/machine/api/pb/cluster.pb.go + 15, // 0: api.AddMachineRequest.network:type_name -> api.NetworkConfig + 16, // 1: api.AddMachineRequest.public_ip:type_name -> api.IP + 17, // 2: api.AddMachineResponse.machine:type_name -> api.MachineInfo + 17, // 3: api.MachineMember.machine:type_name -> api.MachineInfo +======= + 12, // 0: api.AddMachineRequest.network:type_name -> api.NetworkConfig + 13, // 1: api.AddMachineRequest.public_ip:type_name -> api.IP + 14, // 2: api.AddMachineResponse.machine:type_name -> api.MachineInfo + 14, // 3: api.MachineMember.machine:type_name -> api.MachineInfo +>>>>>>> 062f862 (from main):internal/machine/api/pb/cluster.pb.go 0, // 4: api.MachineMember.state:type_name -> api.MachineMember.MembershipState 4, // 5: api.ListMachinesResponse.machines:type_name -> api.MachineMember - 16, // 6: api.UpdateMachineRequest.public_ip:type_name -> api.IP - 18, // 7: api.UpdateMachineRequest.endpoints:type_name -> api.IPPort - 17, // 8: api.UpdateMachineResponse.machine:type_name -> api.MachineInfo - 14, // 9: api.CreateDomainRecordsRequest.records:type_name -> api.DNSRecord - 14, // 10: api.CreateDomainRecordsResponse.records:type_name -> api.DNSRecord - 1, // 11: api.DNSRecord.type:type_name -> api.DNSRecord.RecordType - 2, // 12: api.Cluster.AddMachine:input_type -> api.AddMachineRequest - 19, // 13: api.Cluster.ListMachines:input_type -> google.protobuf.Empty - 6, // 14: api.Cluster.UpdateMachine:input_type -> api.UpdateMachineRequest - 8, // 15: api.Cluster.RemoveMachine:input_type -> api.RemoveMachineRequest - 10, // 16: api.Cluster.ReserveDomain:input_type -> api.ReserveDomainRequest - 11, // 17: api.Cluster.SetDomain:input_type -> api.SetDomainRequest - 19, // 18: api.Cluster.GetDomain:input_type -> google.protobuf.Empty - 19, // 19: api.Cluster.ReleaseDomain:input_type -> google.protobuf.Empty - 12, // 20: api.Cluster.CreateDomainRecords:input_type -> api.CreateDomainRecordsRequest - 3, // 21: api.Cluster.AddMachine:output_type -> api.AddMachineResponse - 5, // 22: api.Cluster.ListMachines:output_type -> api.ListMachinesResponse - 7, // 23: api.Cluster.UpdateMachine:output_type -> api.UpdateMachineResponse - 19, // 24: api.Cluster.RemoveMachine:output_type -> google.protobuf.Empty - 9, // 25: api.Cluster.ReserveDomain:output_type -> api.Domain - 9, // 26: api.Cluster.SetDomain:output_type -> api.Domain - 9, // 27: api.Cluster.GetDomain:output_type -> api.Domain - 9, // 28: api.Cluster.ReleaseDomain:output_type -> api.Domain - 13, // 29: api.Cluster.CreateDomainRecords:output_type -> api.CreateDomainRecordsResponse - 21, // [21:30] is the sub-list for method output_type - 12, // [12:21] is the sub-list for method input_type - 12, // [12:12] is the sub-list for extension type_name - 12, // [12:12] is the sub-list for extension extendee - 0, // [0:12] is the sub-list for field type_name + 11, // 6: api.CreateDomainRecordsRequest.records:type_name -> api.DNSRecord + 11, // 7: api.CreateDomainRecordsResponse.records:type_name -> api.DNSRecord + 1, // 8: api.DNSRecord.type:type_name -> api.DNSRecord.RecordType + 2, // 9: api.Cluster.AddMachine:input_type -> api.AddMachineRequest + 15, // 10: api.Cluster.ListMachines:input_type -> google.protobuf.Empty + 6, // 11: api.Cluster.RemoveMachine:input_type -> api.RemoveMachineRequest + 8, // 12: api.Cluster.ReserveDomain:input_type -> api.ReserveDomainRequest + 15, // 13: api.Cluster.GetDomain:input_type -> google.protobuf.Empty + 15, // 14: api.Cluster.ReleaseDomain:input_type -> google.protobuf.Empty + 9, // 15: api.Cluster.CreateDomainRecords:input_type -> api.CreateDomainRecordsRequest + 3, // 16: api.Cluster.AddMachine:output_type -> api.AddMachineResponse + 5, // 17: api.Cluster.ListMachines:output_type -> api.ListMachinesResponse + 15, // 18: api.Cluster.RemoveMachine:output_type -> google.protobuf.Empty + 7, // 19: api.Cluster.ReserveDomain:output_type -> api.Domain + 7, // 20: api.Cluster.GetDomain:output_type -> api.Domain + 7, // 21: api.Cluster.ReleaseDomain:output_type -> api.Domain + 10, // 22: api.Cluster.CreateDomainRecords:output_type -> api.CreateDomainRecordsResponse + 16, // [16:23] is the sub-list for method output_type + 9, // [9:16] is the sub-list for method input_type + 9, // [9:9] is the sub-list for extension type_name + 9, // [9:9] is the sub-list for extension extendee + 0, // [0:9] is the sub-list for field type_name } func init() { file_api_pb_cluster_proto_init() } @@ -1404,6 +1502,7 @@ func file_api_pb_cluster_proto_init() { switch v := v.(*RemoveMachineRequest); i { ======= file_internal_machine_api_pb_cluster_proto_msgTypes[4].Exporter = func(v any, i int) any { +<<<<<<< HEAD:api/pb/cluster.pb.go switch v := v.(*UpdateMachineRequest); i { >>>>>>> bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go case 0: @@ -1444,6 +1543,33 @@ func file_api_pb_cluster_proto_init() { switch v := v.(*ReserveDomainRequest); i { ======= file_internal_machine_api_pb_cluster_proto_msgTypes[6].Exporter = func(v any, i int) any { +||||||| parent of 062f862 (from main):internal/machine/api/pb/cluster.pb.go + switch v := v.(*UpdateMachineRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_internal_machine_api_pb_cluster_proto_msgTypes[5].Exporter = func(v any, i int) any { + switch v := v.(*UpdateMachineResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_internal_machine_api_pb_cluster_proto_msgTypes[6].Exporter = func(v any, i int) any { +======= +>>>>>>> 062f862 (from main):internal/machine/api/pb/cluster.pb.go switch v := v.(*RemoveMachineRequest); i { >>>>>>> bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go case 0: @@ -1456,6 +1582,7 @@ func file_api_pb_cluster_proto_init() { return nil } } +<<<<<<< HEAD:api/pb/cluster.pb.go <<<<<<< HEAD:api/pb/cluster.pb.go file_api_pb_cluster_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*CreateDomainRecordsRequest); i { @@ -1464,6 +1591,11 @@ func file_api_pb_cluster_proto_init() { switch v := v.(*CreateDomainRecordsRequest); i { ======= file_internal_machine_api_pb_cluster_proto_msgTypes[7].Exporter = func(v any, i int) any { +||||||| parent of 062f862 (from main):internal/machine/api/pb/cluster.pb.go + file_internal_machine_api_pb_cluster_proto_msgTypes[7].Exporter = func(v any, i int) any { +======= + file_internal_machine_api_pb_cluster_proto_msgTypes[5].Exporter = func(v any, i int) any { +>>>>>>> 062f862 (from main):internal/machine/api/pb/cluster.pb.go switch v := v.(*Domain); i { >>>>>>> bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go case 0: @@ -1476,6 +1608,7 @@ func file_api_pb_cluster_proto_init() { return nil } } +<<<<<<< HEAD:api/pb/cluster.pb.go <<<<<<< HEAD:api/pb/cluster.pb.go file_api_pb_cluster_proto_msgTypes[8].Exporter = func(v any, i int) any { switch v := v.(*CreateDomainRecordsResponse); i { @@ -1484,6 +1617,11 @@ func file_api_pb_cluster_proto_init() { switch v := v.(*CreateDomainRecordsResponse); i { ======= file_internal_machine_api_pb_cluster_proto_msgTypes[8].Exporter = func(v any, i int) any { +||||||| parent of 062f862 (from main):internal/machine/api/pb/cluster.pb.go + file_internal_machine_api_pb_cluster_proto_msgTypes[8].Exporter = func(v any, i int) any { +======= + file_internal_machine_api_pb_cluster_proto_msgTypes[6].Exporter = func(v any, i int) any { +>>>>>>> 062f862 (from main):internal/machine/api/pb/cluster.pb.go switch v := v.(*ReserveDomainRequest); i { >>>>>>> bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go case 0: @@ -1496,6 +1634,7 @@ func file_api_pb_cluster_proto_init() { return nil } } +<<<<<<< HEAD:api/pb/cluster.pb.go <<<<<<< HEAD:api/pb/cluster.pb.go file_api_pb_cluster_proto_msgTypes[9].Exporter = func(v any, i int) any { ||||||| parent of bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go @@ -1514,6 +1653,23 @@ func file_api_pb_cluster_proto_init() { } } file_internal_machine_api_pb_cluster_proto_msgTypes[10].Exporter = func(v any, i int) any { +||||||| parent of 062f862 (from main):internal/machine/api/pb/cluster.pb.go + file_internal_machine_api_pb_cluster_proto_msgTypes[9].Exporter = func(v any, i int) any { + switch v := v.(*SetDomainRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_internal_machine_api_pb_cluster_proto_msgTypes[10].Exporter = func(v any, i int) any { +======= + file_internal_machine_api_pb_cluster_proto_msgTypes[7].Exporter = func(v any, i int) any { +>>>>>>> 062f862 (from main):internal/machine/api/pb/cluster.pb.go switch v := v.(*CreateDomainRecordsRequest); i { case 0: return &v.state @@ -1525,7 +1681,7 @@ func file_api_pb_cluster_proto_init() { return nil } } - file_internal_machine_api_pb_cluster_proto_msgTypes[11].Exporter = func(v any, i int) any { + file_internal_machine_api_pb_cluster_proto_msgTypes[8].Exporter = func(v any, i int) any { switch v := v.(*CreateDomainRecordsResponse); i { case 0: return &v.state @@ -1537,8 +1693,14 @@ func file_api_pb_cluster_proto_init() { return nil } } +<<<<<<< HEAD:api/pb/cluster.pb.go file_internal_machine_api_pb_cluster_proto_msgTypes[12].Exporter = func(v any, i int) any { >>>>>>> bbbdfd4 (feat: add uc dns set):internal/machine/api/pb/cluster.pb.go +||||||| parent of 062f862 (from main):internal/machine/api/pb/cluster.pb.go + file_internal_machine_api_pb_cluster_proto_msgTypes[12].Exporter = func(v any, i int) any { +======= + file_internal_machine_api_pb_cluster_proto_msgTypes[9].Exporter = func(v any, i int) any { +>>>>>>> 062f862 (from main):internal/machine/api/pb/cluster.pb.go switch v := v.(*DNSRecord); i { case 0: return &v.state @@ -1551,14 +1713,13 @@ func file_api_pb_cluster_proto_init() { } } } - file_internal_machine_api_pb_cluster_proto_msgTypes[4].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_api_pb_cluster_proto_rawDesc, NumEnums: 2, - NumMessages: 13, + NumMessages: 10, NumExtensions: 0, NumServices: 1, },