From 2e961afe55e4ed44da712b32ff805bf413e97c66 Mon Sep 17 00:00:00 2001 From: Craig Condit Date: Tue, 27 Aug 2024 11:54:31 +1000 Subject: [PATCH] [YUNIKORN-2838] SI: Update protobuf dependencies (#142) Update grpc to v1.65.0 and protobuf to v1.34.2 to match upstream Kubernetes usage. Closes: #142 Signed-off-by: Wilfred Spiegelenburg --- go.mod | 13 +++++----- go.sum | 23 ++++++----------- lib/go/si/si.pb.go | 64 +++++++++++++++++++++++----------------------- 3 files changed, 46 insertions(+), 54 deletions(-) diff --git a/go.mod b/go.mod index d3b1878..fb47a4e 100644 --- a/go.mod +++ b/go.mod @@ -22,16 +22,15 @@ module github.com/apache/yunikorn-scheduler-interface go 1.21 require ( - google.golang.org/grpc v1.58.3 - google.golang.org/protobuf v1.33.0 + google.golang.org/grpc v1.65.0 + google.golang.org/protobuf v1.34.2 ) require ( - github.com/golang/protobuf v1.5.3 // indirect - golang.org/x/net v0.20.0 // indirect - golang.org/x/sys v0.18.0 // indirect - golang.org/x/text v0.14.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect + golang.org/x/net v0.25.0 // indirect + golang.org/x/sys v0.20.0 // indirect + golang.org/x/text v0.15.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect ) replace ( diff --git a/go.sum b/go.sum index d36f03f..21696de 100644 --- a/go.sum +++ b/go.sum @@ -1,21 +1,14 @@ -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= -google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ= -google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= -google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= diff --git a/lib/go/si/si.pb.go b/lib/go/si/si.pb.go index d8b941f..f708540 100644 --- a/lib/go/si/si.pb.go +++ b/lib/go/si/si.pb.go @@ -16,7 +16,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.34.2 // protoc v4.23.2 // source: yunikorn-scheduler-interface/si.proto @@ -3082,7 +3082,7 @@ func file_yunikorn_scheduler_interface_si_proto_rawDescGZIP() []byte { var file_yunikorn_scheduler_interface_si_proto_enumTypes = make([]protoimpl.EnumInfo, 6) var file_yunikorn_scheduler_interface_si_proto_msgTypes = make([]protoimpl.MessageInfo, 37) -var file_yunikorn_scheduler_interface_si_proto_goTypes = []interface{}{ +var file_yunikorn_scheduler_interface_si_proto_goTypes = []any{ (TerminationType)(0), // 0: si.v1.TerminationType (NodeInfo_ActionFromRM)(0), // 1: si.v1.NodeInfo.ActionFromRM (UpdateContainerSchedulingStateRequest_SchedulingState)(0), // 2: si.v1.UpdateContainerSchedulingStateRequest.SchedulingState @@ -3186,7 +3186,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_yunikorn_scheduler_interface_si_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*RegisterResourceManagerRequest); i { case 0: return &v.state @@ -3198,7 +3198,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return nil } } - file_yunikorn_scheduler_interface_si_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*RegisterResourceManagerResponse); i { case 0: return &v.state @@ -3210,7 +3210,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return nil } } - file_yunikorn_scheduler_interface_si_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*AllocationRequest); i { case 0: return &v.state @@ -3222,7 +3222,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return nil } } - file_yunikorn_scheduler_interface_si_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*ApplicationRequest); i { case 0: return &v.state @@ -3234,7 +3234,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return nil } } - file_yunikorn_scheduler_interface_si_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*NodeRequest); i { case 0: return &v.state @@ -3246,7 +3246,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return nil } } - file_yunikorn_scheduler_interface_si_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*AllocationResponse); i { case 0: return &v.state @@ -3258,7 +3258,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return nil } } - file_yunikorn_scheduler_interface_si_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*ApplicationResponse); i { case 0: return &v.state @@ -3270,7 +3270,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return nil } } - file_yunikorn_scheduler_interface_si_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*NodeResponse); i { case 0: return &v.state @@ -3282,7 +3282,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return nil } } - file_yunikorn_scheduler_interface_si_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[8].Exporter = func(v any, i int) any { switch v := v.(*UpdatedApplication); i { case 0: return &v.state @@ -3294,7 +3294,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return nil } } - file_yunikorn_scheduler_interface_si_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[9].Exporter = func(v any, i int) any { switch v := v.(*RejectedApplication); i { case 0: return &v.state @@ -3306,7 +3306,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return nil } } - file_yunikorn_scheduler_interface_si_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[10].Exporter = func(v any, i int) any { switch v := v.(*AcceptedApplication); i { case 0: return &v.state @@ -3318,7 +3318,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return nil } } - file_yunikorn_scheduler_interface_si_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[11].Exporter = func(v any, i int) any { switch v := v.(*RejectedNode); i { case 0: return &v.state @@ -3330,7 +3330,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return nil } } - file_yunikorn_scheduler_interface_si_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[12].Exporter = func(v any, i int) any { switch v := v.(*AcceptedNode); i { case 0: return &v.state @@ -3342,7 +3342,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return nil } } - file_yunikorn_scheduler_interface_si_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[13].Exporter = func(v any, i int) any { switch v := v.(*Resource); i { case 0: return &v.state @@ -3354,7 +3354,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return nil } } - file_yunikorn_scheduler_interface_si_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[14].Exporter = func(v any, i int) any { switch v := v.(*Quantity); i { case 0: return &v.state @@ -3366,7 +3366,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return nil } } - file_yunikorn_scheduler_interface_si_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[15].Exporter = func(v any, i int) any { switch v := v.(*PreemptionPolicy); i { case 0: return &v.state @@ -3378,7 +3378,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return nil } } - file_yunikorn_scheduler_interface_si_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[16].Exporter = func(v any, i int) any { switch v := v.(*AddApplicationRequest); i { case 0: return &v.state @@ -3390,7 +3390,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return nil } } - file_yunikorn_scheduler_interface_si_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[17].Exporter = func(v any, i int) any { switch v := v.(*RemoveApplicationRequest); i { case 0: return &v.state @@ -3402,7 +3402,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return nil } } - file_yunikorn_scheduler_interface_si_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[18].Exporter = func(v any, i int) any { switch v := v.(*UserGroupInformation); i { case 0: return &v.state @@ -3414,7 +3414,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return nil } } - file_yunikorn_scheduler_interface_si_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[19].Exporter = func(v any, i int) any { switch v := v.(*Allocation); i { case 0: return &v.state @@ -3426,7 +3426,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return nil } } - file_yunikorn_scheduler_interface_si_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[20].Exporter = func(v any, i int) any { switch v := v.(*AllocationReleasesRequest); i { case 0: return &v.state @@ -3438,7 +3438,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return nil } } - file_yunikorn_scheduler_interface_si_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[21].Exporter = func(v any, i int) any { switch v := v.(*AllocationRelease); i { case 0: return &v.state @@ -3450,7 +3450,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return nil } } - file_yunikorn_scheduler_interface_si_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[22].Exporter = func(v any, i int) any { switch v := v.(*NodeInfo); i { case 0: return &v.state @@ -3462,7 +3462,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return nil } } - file_yunikorn_scheduler_interface_si_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[23].Exporter = func(v any, i int) any { switch v := v.(*RejectedAllocation); i { case 0: return &v.state @@ -3474,7 +3474,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return nil } } - file_yunikorn_scheduler_interface_si_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[24].Exporter = func(v any, i int) any { switch v := v.(*PredicatesArgs); i { case 0: return &v.state @@ -3486,7 +3486,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return nil } } - file_yunikorn_scheduler_interface_si_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[25].Exporter = func(v any, i int) any { switch v := v.(*PreemptionPredicatesArgs); i { case 0: return &v.state @@ -3498,7 +3498,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return nil } } - file_yunikorn_scheduler_interface_si_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[26].Exporter = func(v any, i int) any { switch v := v.(*PreemptionPredicatesResponse); i { case 0: return &v.state @@ -3510,7 +3510,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return nil } } - file_yunikorn_scheduler_interface_si_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[27].Exporter = func(v any, i int) any { switch v := v.(*UpdateContainerSchedulingStateRequest); i { case 0: return &v.state @@ -3522,7 +3522,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return nil } } - file_yunikorn_scheduler_interface_si_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[28].Exporter = func(v any, i int) any { switch v := v.(*UpdateConfigurationRequest); i { case 0: return &v.state @@ -3534,7 +3534,7 @@ func file_yunikorn_scheduler_interface_si_proto_init() { return nil } } - file_yunikorn_scheduler_interface_si_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { + file_yunikorn_scheduler_interface_si_proto_msgTypes[29].Exporter = func(v any, i int) any { switch v := v.(*EventRecord); i { case 0: return &v.state