From 84d23a2f38e78fd2e486f9cb37aa5e38a59d1fab Mon Sep 17 00:00:00 2001 From: Gaius Date: Mon, 9 Sep 2024 15:16:31 +0800 Subject: [PATCH] feat: add features field for manager (#385) Signed-off-by: Gaius --- Cargo.lock | 2 +- Cargo.toml | 2 +- pkg/apis/manager/v1/mocks/manager_mock.go | 35 ---------------------- pkg/apis/manager/v2/manager.proto | 2 ++ proto/manager.proto | 2 ++ src/descriptor.bin | Bin 95182 -> 95307 bytes src/manager.v2.rs | 3 ++ 7 files changed, 9 insertions(+), 37 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2a46aa6..07f9bae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -190,7 +190,7 @@ dependencies = [ [[package]] name = "dragonfly-api" -version = "2.0.154" +version = "2.0.155" dependencies = [ "prost", "prost-types", diff --git a/Cargo.toml b/Cargo.toml index 7c6714c..ecb1920 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dragonfly-api" -version = "2.0.154" +version = "2.0.155" authors = ["Gaius "] edition = "2021" license = "Apache-2.0" diff --git a/pkg/apis/manager/v1/mocks/manager_mock.go b/pkg/apis/manager/v1/mocks/manager_mock.go index 303daab..f9c0a3b 100644 --- a/pkg/apis/manager/v1/mocks/manager_mock.go +++ b/pkg/apis/manager/v1/mocks/manager_mock.go @@ -43,26 +43,6 @@ func (m *MockManagerClient) EXPECT() *MockManagerClientMockRecorder { return m.recorder } -// CreateModel mocks base method. -func (m *MockManagerClient) CreateModel(ctx context.Context, in *manager.CreateModelRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { - m.ctrl.T.Helper() - varargs := []any{ctx, in} - for _, a := range opts { - varargs = append(varargs, a) - } - ret := m.ctrl.Call(m, "CreateModel", varargs...) - ret0, _ := ret[0].(*emptypb.Empty) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// CreateModel indicates an expected call of CreateModel. -func (mr *MockManagerClientMockRecorder) CreateModel(ctx, in any, opts ...any) *gomock.Call { - mr.mock.ctrl.T.Helper() - varargs := append([]any{ctx, in}, opts...) - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateModel", reflect.TypeOf((*MockManagerClient)(nil).CreateModel), varargs...) -} - // GetObjectStorage mocks base method. func (m *MockManagerClient) GetObjectStorage(ctx context.Context, in *manager.GetObjectStorageRequest, opts ...grpc.CallOption) (*manager.ObjectStorage, error) { m.ctrl.T.Helper() @@ -423,21 +403,6 @@ func (m *MockManagerServer) EXPECT() *MockManagerServerMockRecorder { return m.recorder } -// CreateModel mocks base method. -func (m *MockManagerServer) CreateModel(arg0 context.Context, arg1 *manager.CreateModelRequest) (*emptypb.Empty, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CreateModel", arg0, arg1) - ret0, _ := ret[0].(*emptypb.Empty) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// CreateModel indicates an expected call of CreateModel. -func (mr *MockManagerServerMockRecorder) CreateModel(arg0, arg1 any) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateModel", reflect.TypeOf((*MockManagerServer)(nil).CreateModel), arg0, arg1) -} - // GetObjectStorage mocks base method. func (m *MockManagerServer) GetObjectStorage(arg0 context.Context, arg1 *manager.GetObjectStorageRequest) (*manager.ObjectStorage, error) { m.ctrl.T.Helper() diff --git a/pkg/apis/manager/v2/manager.proto b/pkg/apis/manager/v2/manager.proto index b21301e..3b99e80 100644 --- a/pkg/apis/manager/v2/manager.proto +++ b/pkg/apis/manager/v2/manager.proto @@ -212,6 +212,8 @@ message UpdateSchedulerRequest { string ip = 6 [(validate.rules).string = {ip: true}]; // Scheduler port. int32 port = 7 [(validate.rules).int32 = {gte: 1024, lt: 65535}]; + // Scheduler features. + repeated string features = 8 [(validate.rules).string = {min_len: 1, ignore_empty: true}]; } // ListSchedulersRequest represents request of ListSchedulers. diff --git a/proto/manager.proto b/proto/manager.proto index 2c00f86..fdea978 100644 --- a/proto/manager.proto +++ b/proto/manager.proto @@ -209,6 +209,8 @@ message UpdateSchedulerRequest { string ip = 6; // Scheduler port. int32 port = 7; + // Scheduler features. + repeated string features = 8; } // ListSchedulersRequest represents request of ListSchedulers. diff --git a/src/descriptor.bin b/src/descriptor.bin index 94efea48e9ac0918b666872965abf9b7c328cbe6..28f5ac4f4ea9a3b564ac310e0ec303d3b763ac2d 100644 GIT binary patch delta 2326 zcmYLLeMntp9KOGw=bn4+d%d3P@#{{f-l*;UWmypcb2$n2C$!YK=uh413=9p0o3ZaG&>mpXc}d zp7-PU!=2#wzX!kk>jvNac=YcZH!Wj`MQL_^9)GugbDVNv9m~9N;$&Nzi%oI5Ir{nP*ZgU%Fbu&V$M}i3y1XRu(wpyO z-a2_a)0XhmQbI&UP%Sd_s>d*>V5HESB?V!_U7V+2WtBJ}*oZjhEehNrDo-a4zT1A{ zagp}yM{BM2EwU;_9gIXc;21O6Z`SHlGsO8?3S&^7p=jKLP@bWR^`cQTFgZ)|c!+AZ zMwsAfme_KalAa9bEMgYSSt>3OHJZteF-O_!_tv#4%MoUf=X^4QJV)V(tHmJCQGqQg zG#P0A+yqr_pC`^G65%`u%zKFdLSUYp5?3HkQ7FDnB(wm+T#&^?HR%Ok!GOYouV6r7 z!OJwl1{4-lrW>>Z)-FAz8=m>SbqiQQ3%2Ro?G4+r*=LmypluB|Z z77&z&D&50yRN$D8DDa>BF^>+}kI1SJ)etIBj#gxoK^u}Qo)88hwBiW?LTE(^RcZ<* zSLG)LRi{_Ia0-|Z&MHMpwOv59h{`HF2!&OusupQju^sai2Tse|25q-bF~U(+Y-OcG z)&*gugWVV~2%!#k4=o^sIv9smofuoi&?(!3RGaMdDXMlShoibS)_~H6O5R|j*z8^6aO&_cGL(Yas zwDkErrPk-|0v3YTr*`25I4^X}^BlOqRQ_xtyY@?5Hoi`Ax!tT8> zHRw~6+#rXGv~{cjWspnD^uz2ZbU7F7Yl1}Tvd>ee=&~0q7V4DQ8|hgsmZV>XZQmAvDCPZQ?0SL6u?I8ll$YFq_&W z)(|MeT-@kVRGY)xyicSw1(PH4LWDLaN7&Ra3@EDk5iZ%}QdDCjymh-v0UDE!6lKh( zv^P1$GMnfJ|Lfgw`TQWnDqUbU{3n})OTW%TlS01x)}bC zn3CO5+LD}NQ$KDf76N68%TjK!5GYgJdPFp6iscy7@=lbVNKLb;KR=*Ya6Qd2Pr-u1 TG?z8F3KkTmzuHkiy_x?3hviD} delta 2153 zcmYL~>uVfU7{=#)cXoF6Y<6dJHrd3)T$)YOTHNg|w*8Pay=bx8n~Ksuz@nc8LHuF} zp;Rd`O-N6K653Fq1OtIBk%VmeVQL$y8p{C-Orc*TG*3F-aIQ3GM;sAmv=3H z)<8d%Z$15nQ?CnlQ_{Oj&acBO|GpO7CBI3u3)fAtBi(x=-PBRMM_eV+BCgj6iW=-uGRk}gM2{A zlqDJD1Ih%V(U4G!>Htww*CMg7XJT+zq*NFz28TtGwc)O2sQx+8Y8+hYE~!gIZCy)| zgA0eH$iaof63GVZ;KE^vnwrHHM>EFxE!S&2eM4btVQBLmMK?bgL=|kQ9Vp; zrIiTrfUHn5u!sj_g=9{g#LKCY-a~SJSD!PT2p*E(EP4>TO23^|waRq3do|1+i?Cm% zRE;r$gzqZVwuBPCtJGEy2jQER-Xn7URPV>A`|Km~bD{yhY3;j4oNK6Ref!N5tsk6w z@7zbFN_(+~g0We7wUDr1qh!X|L&AQIs--9xBW$j#e`2(?v`$>fD9w5r)~UAAPe>r^ zx}T?zQAT=C$oX5Hap`36g#1R)0;7!1XhVJF(w5>zXoN)=ZG=XUFxt>YO$Nc{rrLC= zrF%1MPKF81*`!q7qzkDJQC(vw;jl@~EutH#1k!s(&Zp{~ICTZjbaQknflj4YU5g`? zUbbz(B8+<3&M72}dKq)7XC%-=+@~JLF(Z8uqGR`QGHqhx43Iv~R+||K7#~Hy>hY+p z*dHOQM z{N)6R5>_f-OTc>cFL1uu=BP*i0&i&(r_rCR^e(b9tPUjTRQ4kKE#}I|>i!Jy$U$o9 z#53AG!1m^Vgxvt!n*$Pd18i@OtS)YlM=nueFP<@FgJBhrX3t(AkN^kSULaZBt0DEB zpk_qW_s38KYSW?cyb<&JIQFnp!-uCVi^dMinXvRBxzH@;H)j#V0iXV{H}je&&S zSlAdy*o}pak-CPfmB!#1^<53?gEV`#F^~YS>c$+y>y^4O2WXjgHHJ#)bT(REL8?GB6Rnx?q3%OX%^^`S<}5fTGZju2g8nLCe*BPI$y zlWFy16}?=XW=~pM7sxc{IzkC#ns*)$I}L)@G^38DX?JmkJ@Yvsu{e+!&cA38{acvf zeLc2(jKr+EmPYxrQDPpD*(fpnTbSj&$HguaB_Z8870=L~;v9SCQbUvkkU6d^*(eDh xbG-kw*k%x4y7TJY482gAXV3g?fcQvvp0lBY4~KcK+h!enILv>2D?@|l{sSvz9y|a5 diff --git a/src/manager.v2.rs b/src/manager.v2.rs index 4d9bc10..e733c83 100644 --- a/src/manager.v2.rs +++ b/src/manager.v2.rs @@ -265,6 +265,9 @@ pub struct UpdateSchedulerRequest { /// Scheduler port. #[prost(int32, tag = "7")] pub port: i32, + /// Scheduler features. + #[prost(string, repeated, tag = "8")] + pub features: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, } /// ListSchedulersRequest represents request of ListSchedulers. #[derive(serde::Serialize, serde::Deserialize)]