From f319010215c0e1d2fdbe8533596c34bccd1eaa39 Mon Sep 17 00:00:00 2001 From: Nick Groszewski Date: Fri, 10 Apr 2020 09:45:21 -0400 Subject: [PATCH] fix(executor): Update proto compilation and package versions Updates the `compile_seldon_proto` rule to place the updated protobuf in the correct location, along with correcting the package name and updating the grpc package version to work with newer versions of the proto compiler. Addresses SeldonIO/seldon-core#1663 Signed off by Nick Groszewski () --- executor/Makefile | 7 +- .../api/grpc/seldon/proto/prediction.pb.go | 170 +++++++++--------- executor/go.mod | 2 +- executor/go.sum | 6 + 4 files changed, 97 insertions(+), 88 deletions(-) diff --git a/executor/Makefile b/executor/Makefile index 73f7768a01..5bed840dba 100644 --- a/executor/Makefile +++ b/executor/Makefile @@ -30,9 +30,10 @@ copy_protos: .PHONY: compile_seldon_proto compile_seldon_proto: - cp ../proto/prediction.proto api/grpc - cd api/grpc && protoc -I. -I${GOPATH}/src/github.com/tensorflow/tensorflow --go_out=paths=source_relative,plugins=grpc:. prediction.proto - rm api/grpc/prediction.proto + cp ../proto/prediction.proto api/grpc/seldon/proto + cd api/grpc/seldon/proto && protoc -I. -I${GOPATH}/src/github.com/tensorflow/tensorflow --go_out=paths=source_relative,plugins=grpc:. prediction.proto + sed -i "s/package api/package proto/" api/grpc/seldon/proto/prediction.pb.go + rm api/grpc/seldon/proto/prediction.proto # https://github.com/tensorflow/serving/issues/1365#issuecomment-525351995 .PHONY: compile_tensorflow_proto diff --git a/executor/api/grpc/seldon/proto/prediction.pb.go b/executor/api/grpc/seldon/proto/prediction.pb.go index 91beababe2..c397589f4a 100644 --- a/executor/api/grpc/seldon/proto/prediction.pb.go +++ b/executor/api/grpc/seldon/proto/prediction.pb.go @@ -719,85 +719,87 @@ func init() { proto.RegisterType((*RequestResponse)(nil), "seldon.protos.RequestResponse") } -func init() { proto.RegisterFile("prediction.proto", fileDescriptor_430b55197713f541) } +func init() { + proto.RegisterFile("prediction.proto", fileDescriptor_430b55197713f541) +} var fileDescriptor_430b55197713f541 = []byte{ - // 1046 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0xdb, 0x6e, 0x23, 0x45, - 0x13, 0xf6, 0xd8, 0x1e, 0x3b, 0x2e, 0x67, 0xb3, 0xb3, 0xfd, 0xef, 0xc1, 0xb2, 0xf6, 0x17, 0x96, - 0x85, 0x96, 0x5c, 0xb0, 0x1e, 0xf0, 0x2e, 0x10, 0x45, 0x68, 0xa5, 0x1c, 0x9c, 0x83, 0xb4, 0xd9, - 0x44, 0x6d, 0x07, 0x69, 0x91, 0x10, 0x6a, 0x7b, 0xda, 0x93, 0x21, 0xf6, 0xf4, 0xd0, 0xdd, 0x43, - 0xc8, 0x35, 0xe2, 0x82, 0x07, 0x40, 0x02, 0x1e, 0x81, 0x27, 0xe1, 0x0e, 0xf1, 0x46, 0xa8, 0x0f, - 0x63, 0x3b, 0xc6, 0xeb, 0x5c, 0xc4, 0x42, 0x5c, 0xb9, 0xbb, 0xea, 0xfb, 0xbe, 0xea, 0xaa, 0xae, - 0x6a, 0xdb, 0xe0, 0x25, 0x9c, 0x06, 0xd1, 0x40, 0x46, 0x2c, 0x6e, 0x25, 0x9c, 0x49, 0x86, 0xee, - 0x09, 0x3a, 0x0a, 0xb2, 0x9d, 0xa8, 0x3f, 0x0d, 0x19, 0x0b, 0x47, 0xd4, 0xd7, 0xdb, 0x7e, 0x3a, - 0xf4, 0x85, 0xe4, 0xe9, 0x40, 0x1a, 0x77, 0xfd, 0x99, 0xa4, 0xb1, 0x60, 0x7c, 0x38, 0x62, 0x57, - 0xfe, 0x80, 0x71, 0xea, 0x0f, 0x39, 0x19, 0xd3, 0x2b, 0xc6, 0x2f, 0x7d, 0xe3, 0x31, 0xb8, 0xe6, - 0xcf, 0x79, 0xb8, 0xd7, 0xd5, 0xba, 0x27, 0x54, 0x08, 0x12, 0x52, 0xf4, 0x1c, 0x4a, 0x42, 0x12, - 0x99, 0x8a, 0x9a, 0xd3, 0x70, 0x36, 0xab, 0xed, 0x47, 0xad, 0x1b, 0x71, 0x5b, 0x5d, 0xed, 0xc4, - 0x16, 0x84, 0x3e, 0x80, 0xe2, 0x98, 0x4a, 0x52, 0xcb, 0x6b, 0xf0, 0xff, 0xe6, 0xc0, 0x27, 0x54, - 0x12, 0xac, 0x01, 0xe8, 0x23, 0x28, 0x06, 0x44, 0x92, 0x5a, 0x41, 0x03, 0xeb, 0x73, 0xc0, 0x7d, - 0x3a, 0x24, 0xe9, 0x48, 0xee, 0x13, 0x49, 0x8e, 0x72, 0x58, 0x23, 0x51, 0x1d, 0xca, 0xfd, 0x28, - 0x56, 0xa6, 0x5a, 0xb1, 0xe1, 0x6c, 0xae, 0x1f, 0xe5, 0x70, 0x66, 0x50, 0x3e, 0x21, 0xb9, 0xf6, - 0xb9, 0x0d, 0x67, 0xb3, 0xa2, 0x7c, 0xd6, 0x80, 0x5e, 0xc2, 0xda, 0x37, 0x82, 0x19, 0x62, 0x49, - 0x47, 0x7b, 0xdc, 0x32, 0xc5, 0x6a, 0x65, 0xc5, 0x6a, 0x7d, 0x41, 0x46, 0x29, 0x3d, 0xca, 0xe1, - 0x09, 0x72, 0x77, 0x1d, 0x40, 0x45, 0xfd, 0x9a, 0xc5, 0x94, 0x0d, 0x9b, 0x7f, 0x39, 0x50, 0x9d, - 0x39, 0x13, 0x7a, 0x08, 0x6e, 0x4c, 0xc6, 0x54, 0x15, 0xa5, 0xb0, 0x59, 0xc1, 0x66, 0x83, 0x7c, - 0x28, 0x99, 0x6a, 0xda, 0xf4, 0xe7, 0x6b, 0xd5, 0xd3, 0xce, 0xa3, 0x1c, 0xb6, 0x30, 0xf4, 0x29, - 0x94, 0xe3, 0x80, 0x70, 0x4e, 0xae, 0x27, 0x75, 0x98, 0x3f, 0xd9, 0xeb, 0x48, 0xc8, 0xec, 0x74, - 0x19, 0x18, 0x7d, 0x02, 0x6b, 0x72, 0x68, 0x43, 0x15, 0x35, 0xf1, 0x49, 0x6b, 0x7a, 0xc3, 0x36, - 0xce, 0x99, 0x92, 0x50, 0x39, 0x65, 0xd0, 0xb9, 0x9c, 0x5e, 0x41, 0xc9, 0x00, 0x51, 0x0d, 0x5c, - 0x71, 0x41, 0x12, 0xaa, 0xb3, 0x71, 0x77, 0xf3, 0x9e, 0x83, 0x8d, 0x01, 0xd5, 0xa1, 0xf4, 0x9d, - 0x0a, 0x2e, 0x6a, 0xf9, 0x46, 0x61, 0xd3, 0xd1, 0x2e, 0x6b, 0x69, 0xfe, 0x59, 0x80, 0xa2, 0xba, - 0x50, 0x84, 0xa0, 0x98, 0xa4, 0x51, 0xa0, 0x1b, 0xa4, 0x82, 0xf5, 0x1a, 0x7d, 0x0c, 0x45, 0x49, - 0x42, 0x43, 0xab, 0xb6, 0xff, 0xbf, 0xa0, 0x0f, 0x5a, 0x3d, 0x12, 0x8a, 0x4e, 0x2c, 0xf9, 0x35, - 0xd6, 0x50, 0xb4, 0x0d, 0x65, 0xce, 0x52, 0x19, 0xc5, 0x61, 0xad, 0xa0, 0x59, 0x8d, 0x45, 0x2c, - 0x6c, 0x20, 0x86, 0x98, 0x11, 0xd0, 0x01, 0x54, 0x39, 0xfd, 0x36, 0xa5, 0x42, 0x9e, 0x11, 0x79, - 0x51, 0x2b, 0x6a, 0xfe, 0xfb, 0x0b, 0xf9, 0x53, 0x98, 0xd1, 0x98, 0x25, 0x22, 0x1f, 0xca, 0x63, - 0x2a, 0x79, 0x34, 0x10, 0x35, 0x57, 0x6b, 0x3c, 0xfa, 0xa7, 0x06, 0x8f, 0x06, 0x38, 0x43, 0xd5, - 0x4f, 0xa1, 0x32, 0xc9, 0x03, 0x79, 0x50, 0xb8, 0xa4, 0xd7, 0xb6, 0x0e, 0x6a, 0x89, 0x3e, 0x04, - 0x57, 0x57, 0xcb, 0x36, 0xc4, 0x3b, 0x1a, 0x0f, 0x1b, 0xd0, 0x76, 0x7e, 0xcb, 0xa9, 0x6f, 0xc3, - 0xfa, 0x6c, 0x8a, 0x0b, 0x34, 0x1f, 0xce, 0x6a, 0xba, 0xb3, 0xdc, 0x57, 0xe0, 0xcd, 0xa7, 0x77, - 0x1b, 0xbf, 0x32, 0xc3, 0x6f, 0xfe, 0x98, 0x87, 0x92, 0x49, 0x70, 0x01, 0xed, 0x25, 0x14, 0xe5, - 0x75, 0x62, 0x58, 0x1b, 0x8b, 0xee, 0x86, 0x47, 0x03, 0xfb, 0xd1, 0xbb, 0x4e, 0x28, 0xd6, 0xe8, - 0x69, 0x30, 0xd5, 0xdf, 0x79, 0x1b, 0x0c, 0xbd, 0xb0, 0xdd, 0x61, 0xee, 0xe9, 0xbd, 0xc5, 0x5a, - 0x73, 0xfd, 0x51, 0xff, 0x6c, 0x79, 0xa9, 0xdf, 0x9d, 0x96, 0x0f, 0x30, 0x3d, 0x17, 0xaa, 0x42, - 0x79, 0xef, 0xf4, 0xfc, 0x4d, 0xaf, 0x83, 0xbd, 0x1c, 0xaa, 0x80, 0x7b, 0xb8, 0x73, 0x7e, 0xd8, - 0xf1, 0x1c, 0xb5, 0xec, 0x1d, 0x9f, 0x74, 0xb0, 0x97, 0x6f, 0xbe, 0x85, 0x07, 0x37, 0x1e, 0x41, - 0x35, 0x83, 0x68, 0x1f, 0x36, 0xc4, 0xac, 0xd1, 0xcc, 0x7e, 0xb5, 0xfd, 0x74, 0xfe, 0x41, 0x9c, - 0x05, 0xe1, 0x39, 0x4e, 0xf3, 0x77, 0x07, 0x4a, 0xe6, 0xc9, 0x54, 0x63, 0x33, 0x60, 0x01, 0xd5, - 0x39, 0xb8, 0x58, 0xaf, 0x95, 0x2d, 0x8a, 0x87, 0xcc, 0xe6, 0xa0, 0xd7, 0xe8, 0x31, 0x94, 0x38, - 0x25, 0x82, 0xc5, 0xba, 0x86, 0x15, 0x6c, 0x77, 0x68, 0x6b, 0xf2, 0x32, 0x17, 0x17, 0x5e, 0x89, - 0x09, 0x63, 0x3f, 0x0e, 0x46, 0x24, 0xcc, 0x1e, 0xe9, 0xe6, 0x33, 0x80, 0xa9, 0x55, 0x15, 0xa4, - 0x7b, 0xbe, 0xb7, 0xd7, 0xe9, 0x76, 0xbd, 0x9c, 0xda, 0x1c, 0xec, 0x1c, 0xbf, 0x3e, 0xc7, 0x1d, - 0xcf, 0x69, 0xfe, 0xe1, 0xc0, 0xda, 0x01, 0xa5, 0x41, 0x9f, 0x0c, 0x2e, 0xd5, 0x5b, 0x65, 0x27, - 0xc5, 0x7e, 0x13, 0x2c, 0x4f, 0x3c, 0x03, 0xa3, 0x2d, 0x58, 0xe3, 0x54, 0x24, 0x2c, 0x16, 0xd9, - 0x14, 0x2c, 0x27, 0x4e, 0xd0, 0x26, 0xf1, 0x2b, 0xc2, 0x03, 0xdb, 0x3c, 0x76, 0x87, 0xda, 0xe0, - 0x4a, 0x9e, 0xea, 0x31, 0xbf, 0x5d, 0xce, 0x40, 0x9b, 0x3f, 0x38, 0x70, 0xdf, 0xce, 0x06, 0xce, - 0xf4, 0xff, 0xf5, 0x8c, 0xda, 0x3f, 0x15, 0xa0, 0x7c, 0x48, 0x63, 0xaa, 0x26, 0xec, 0x0d, 0x6c, - 0xf4, 0x38, 0x89, 0xc5, 0x90, 0xf1, 0xf1, 0x71, 0x9c, 0xa4, 0x12, 0x2d, 0x55, 0xa9, 0x2f, 0xf5, - 0x36, 0x73, 0xe8, 0x14, 0xee, 0x4f, 0xf4, 0x4e, 0x53, 0x79, 0x77, 0xc1, 0x0e, 0xb8, 0xea, 0x25, - 0xa2, 0x77, 0x94, 0x39, 0x81, 0xca, 0x4e, 0x18, 0x72, 0x1a, 0x12, 0x49, 0x51, 0x63, 0x19, 0x58, - 0x8d, 0xd9, 0xad, 0x72, 0x87, 0xb0, 0xde, 0xa5, 0x71, 0x30, 0x69, 0xcb, 0x27, 0x73, 0xf8, 0xcc, - 0x71, 0x9b, 0x50, 0xfb, 0x57, 0x07, 0xdc, 0x13, 0x16, 0xd0, 0x11, 0x3a, 0x84, 0xf2, 0x99, 0xf9, - 0x75, 0x75, 0xc7, 0x54, 0x57, 0x76, 0xb6, 0x5f, 0x1c, 0x28, 0xe9, 0xda, 0xf3, 0x55, 0xdd, 0xc2, - 0xca, 0x8e, 0xf6, 0x15, 0x54, 0x27, 0x6d, 0x46, 0xf9, 0xaa, 0xbb, 0xb8, 0x1d, 0xc0, 0x03, 0xd3, - 0xbc, 0xb3, 0x41, 0x56, 0xdd, 0xda, 0xed, 0xb7, 0xb0, 0xb6, 0xc7, 0xc6, 0xfd, 0x28, 0xa6, 0x7c, - 0xc5, 0xfd, 0xd9, 0xfe, 0x4d, 0x3d, 0xf0, 0xda, 0xf6, 0xdf, 0xeb, 0xab, 0xdd, 0x3e, 0x78, 0x11, - 0xbb, 0x89, 0xd9, 0xf5, 0xce, 0x26, 0xff, 0x2c, 0xf4, 0x2f, 0x46, 0xf1, 0xe5, 0xe7, 0x61, 0x24, - 0x2f, 0xd2, 0x7e, 0x6b, 0xc0, 0xc6, 0xbe, 0xc1, 0x46, 0xcc, 0x2e, 0x9e, 0xeb, 0x3f, 0x0f, 0xf4, - 0x7b, 0x32, 0x4e, 0x46, 0x54, 0xf8, 0x57, 0x9c, 0x24, 0x09, 0xe5, 0xc2, 0x0f, 0x99, 0x9f, 0x5c, - 0x86, 0x3e, 0x49, 0xa2, 0x7e, 0x49, 0xeb, 0xbe, 0xf8, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x47, 0x57, - 0x0b, 0x26, 0xb2, 0x0c, 0x00, 0x00, + // 1049 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0xdd, 0x6e, 0x1b, 0x45, + 0x14, 0xf6, 0xda, 0x5e, 0x3b, 0x3e, 0x4e, 0xd3, 0xed, 0xd0, 0x1f, 0xcb, 0x2a, 0xc2, 0xb2, 0x50, + 0xc9, 0x05, 0xf5, 0x82, 0x5b, 0x20, 0xca, 0x45, 0xa5, 0xfc, 0x38, 0x3f, 0x52, 0xd3, 0x44, 0x63, + 0x07, 0xa9, 0x48, 0x08, 0x8d, 0xbd, 0xe3, 0xcd, 0x12, 0x7b, 0x67, 0x99, 0x99, 0x25, 0xca, 0x35, + 0xe2, 0x82, 0x07, 0x40, 0x02, 0x1e, 0x81, 0x27, 0xe1, 0x0e, 0xf1, 0x46, 0x68, 0x7e, 0xd6, 0x76, + 0x8c, 0xeb, 0x5c, 0xc4, 0x42, 0xbd, 0xca, 0xcc, 0x39, 0xdf, 0xf7, 0x9d, 0x39, 0x67, 0xce, 0x99, + 0xac, 0xc1, 0x4b, 0x38, 0x0d, 0xa2, 0x81, 0x8c, 0x58, 0xdc, 0x4a, 0x38, 0x93, 0x0c, 0xdd, 0x13, + 0x74, 0x14, 0x64, 0x3b, 0x51, 0x7f, 0x1a, 0x32, 0x16, 0x8e, 0xa8, 0xaf, 0xb7, 0xfd, 0x74, 0xe8, + 0x0b, 0xc9, 0xd3, 0x81, 0x34, 0xee, 0xfa, 0x33, 0x49, 0x63, 0xc1, 0xf8, 0x70, 0xc4, 0xae, 0xfc, + 0x01, 0xe3, 0xd4, 0x1f, 0x72, 0x32, 0xa6, 0x57, 0x8c, 0x5f, 0xfa, 0xc6, 0x63, 0x70, 0xcd, 0x5f, + 0xf3, 0x70, 0xaf, 0xab, 0x75, 0x4f, 0xa8, 0x10, 0x24, 0xa4, 0xe8, 0x39, 0x94, 0x84, 0x24, 0x32, + 0x15, 0x35, 0xa7, 0xe1, 0x6c, 0x56, 0xdb, 0x8f, 0x5a, 0x37, 0xe2, 0xb6, 0xba, 0xda, 0x89, 0x2d, + 0x08, 0x7d, 0x02, 0xc5, 0x31, 0x95, 0xa4, 0x96, 0xd7, 0xe0, 0x0f, 0xe6, 0xc0, 0x27, 0x54, 0x12, + 0xac, 0x01, 0xe8, 0x33, 0x28, 0x06, 0x44, 0x92, 0x5a, 0x41, 0x03, 0xeb, 0x73, 0xc0, 0x7d, 0x3a, + 0x24, 0xe9, 0x48, 0xee, 0x13, 0x49, 0x8e, 0x72, 0x58, 0x23, 0x51, 0x1d, 0xca, 0xfd, 0x28, 0x56, + 0xa6, 0x5a, 0xb1, 0xe1, 0x6c, 0xae, 0x1f, 0xe5, 0x70, 0x66, 0x50, 0x3e, 0x21, 0xb9, 0xf6, 0xb9, + 0x0d, 0x67, 0xb3, 0xa2, 0x7c, 0xd6, 0x80, 0x5e, 0xc2, 0xda, 0xf7, 0x82, 0x19, 0x62, 0x49, 0x47, + 0x7b, 0xdc, 0x32, 0xc5, 0x6a, 0x65, 0xc5, 0x6a, 0x7d, 0x4d, 0x46, 0x29, 0x3d, 0xca, 0xe1, 0x09, + 0x72, 0x77, 0x1d, 0x40, 0x45, 0xfd, 0x8e, 0xc5, 0x94, 0x0d, 0x9b, 0xff, 0x38, 0x50, 0x9d, 0x39, + 0x13, 0x7a, 0x08, 0x6e, 0x4c, 0xc6, 0x54, 0x15, 0xa5, 0xb0, 0x59, 0xc1, 0x66, 0x83, 0x7c, 0x28, + 0x99, 0x6a, 0xda, 0xf4, 0xe7, 0x6b, 0xd5, 0xd3, 0xce, 0xa3, 0x1c, 0xb6, 0x30, 0xf4, 0x25, 0x94, + 0xe3, 0x80, 0x70, 0x4e, 0xae, 0x27, 0x75, 0x98, 0x3f, 0xd9, 0xeb, 0x48, 0xc8, 0xec, 0x74, 0x19, + 0x18, 0x7d, 0x01, 0x6b, 0x72, 0x68, 0x43, 0x15, 0x35, 0xf1, 0x49, 0x6b, 0x7a, 0xc3, 0x36, 0xce, + 0x99, 0x92, 0x50, 0x39, 0x65, 0xd0, 0xb9, 0x9c, 0x5e, 0x41, 0xc9, 0x00, 0x51, 0x0d, 0x5c, 0x71, + 0x41, 0x12, 0xaa, 0xb3, 0x71, 0x77, 0xf3, 0x9e, 0x83, 0x8d, 0x01, 0xd5, 0xa1, 0xf4, 0xa3, 0x0a, + 0x2e, 0x6a, 0xf9, 0x46, 0x61, 0xd3, 0xd1, 0x2e, 0x6b, 0x69, 0xfe, 0x5d, 0x80, 0xa2, 0xba, 0x50, + 0x84, 0xa0, 0x98, 0xa4, 0x51, 0xa0, 0x1b, 0xa4, 0x82, 0xf5, 0x1a, 0x7d, 0x0e, 0x45, 0x49, 0x42, + 0x43, 0xab, 0xb6, 0x3f, 0x5c, 0xd0, 0x07, 0xad, 0x1e, 0x09, 0x45, 0x27, 0x96, 0xfc, 0x1a, 0x6b, + 0x28, 0xda, 0x86, 0x32, 0x67, 0xa9, 0x8c, 0xe2, 0xb0, 0x56, 0xd0, 0xac, 0xc6, 0x22, 0x16, 0x36, + 0x10, 0x43, 0xcc, 0x08, 0xe8, 0x00, 0xaa, 0x9c, 0xfe, 0x90, 0x52, 0x21, 0xcf, 0x88, 0xbc, 0xa8, + 0x15, 0x35, 0xff, 0xe3, 0x85, 0xfc, 0x29, 0xcc, 0x68, 0xcc, 0x12, 0x91, 0x0f, 0xe5, 0x31, 0x95, + 0x3c, 0x1a, 0x88, 0x9a, 0xab, 0x35, 0x1e, 0xfd, 0x57, 0x83, 0x47, 0x03, 0x9c, 0xa1, 0xea, 0xa7, + 0x50, 0x99, 0xe4, 0x81, 0x3c, 0x28, 0x5c, 0xd2, 0x6b, 0x5b, 0x07, 0xb5, 0x44, 0x9f, 0x82, 0xab, + 0xab, 0x65, 0x1b, 0xe2, 0x1d, 0x8d, 0x87, 0x0d, 0x68, 0x3b, 0xbf, 0xe5, 0xd4, 0xb7, 0x61, 0x7d, + 0x36, 0xc5, 0x05, 0x9a, 0x0f, 0x67, 0x35, 0xdd, 0x59, 0xee, 0x2b, 0xf0, 0xe6, 0xd3, 0xbb, 0x8d, + 0x5f, 0x99, 0xe1, 0x37, 0x7f, 0xce, 0x43, 0xc9, 0x24, 0xb8, 0x80, 0xf6, 0x12, 0x8a, 0xf2, 0x3a, + 0x31, 0xac, 0x8d, 0x45, 0x77, 0xc3, 0xa3, 0x81, 0xfd, 0xd3, 0xbb, 0x4e, 0x28, 0xd6, 0xe8, 0x69, + 0x30, 0xd5, 0xdf, 0x79, 0x1b, 0x0c, 0xbd, 0xb0, 0xdd, 0x61, 0xee, 0xe9, 0xa3, 0xc5, 0x5a, 0x73, + 0xfd, 0x51, 0xff, 0x6a, 0x79, 0xa9, 0xdf, 0x9d, 0x96, 0x0f, 0x30, 0x3d, 0x17, 0xaa, 0x42, 0x79, + 0xef, 0xf4, 0xfc, 0x4d, 0xaf, 0x83, 0xbd, 0x1c, 0xaa, 0x80, 0x7b, 0xb8, 0x73, 0x7e, 0xd8, 0xf1, + 0x1c, 0xb5, 0xec, 0x1d, 0x9f, 0x74, 0xb0, 0x97, 0x6f, 0xbe, 0x85, 0x07, 0x37, 0x1e, 0x41, 0x35, + 0x83, 0x68, 0x1f, 0x36, 0xc4, 0xac, 0xd1, 0xcc, 0x7e, 0xb5, 0xfd, 0x74, 0xfe, 0x41, 0x9c, 0x05, + 0xe1, 0x39, 0x4e, 0xf3, 0x4f, 0x07, 0x4a, 0xe6, 0xc9, 0x54, 0x63, 0x33, 0x60, 0x01, 0xd5, 0x39, + 0xb8, 0x58, 0xaf, 0x95, 0x2d, 0x8a, 0x87, 0xcc, 0xe6, 0xa0, 0xd7, 0xe8, 0x31, 0x94, 0x38, 0x25, + 0x82, 0xc5, 0xba, 0x86, 0x15, 0x6c, 0x77, 0x68, 0x6b, 0xf2, 0x32, 0x17, 0x17, 0x5e, 0x89, 0x09, + 0x63, 0xff, 0x1c, 0x8c, 0x48, 0x98, 0x3d, 0xd2, 0xcd, 0x67, 0x00, 0x53, 0xab, 0x2a, 0x48, 0xf7, + 0x7c, 0x6f, 0xaf, 0xd3, 0xed, 0x7a, 0x39, 0xb5, 0x39, 0xd8, 0x39, 0x7e, 0x7d, 0x8e, 0x3b, 0x9e, + 0xd3, 0xfc, 0xcb, 0x81, 0xb5, 0x03, 0x4a, 0x83, 0x3e, 0x19, 0x5c, 0xaa, 0xb7, 0xca, 0x4e, 0x8a, + 0xfd, 0x4f, 0xb0, 0x3c, 0xf1, 0x0c, 0x8c, 0xb6, 0x60, 0x8d, 0x53, 0x91, 0xb0, 0x58, 0x64, 0x53, + 0xb0, 0x9c, 0x38, 0x41, 0x9b, 0xc4, 0xaf, 0x08, 0x0f, 0x6c, 0xf3, 0xd8, 0x1d, 0x6a, 0x83, 0x2b, + 0x79, 0xaa, 0xc7, 0xfc, 0x76, 0x39, 0x03, 0x6d, 0xfe, 0xe4, 0xc0, 0x7d, 0x3b, 0x1b, 0x38, 0xd3, + 0xff, 0xdf, 0x33, 0x6a, 0xff, 0x52, 0x80, 0xf2, 0x21, 0x8d, 0xa9, 0x9a, 0xb0, 0x37, 0xb0, 0xd1, + 0xe3, 0x24, 0x16, 0x43, 0xc6, 0xc7, 0xc7, 0x71, 0x92, 0x4a, 0xb4, 0x54, 0xa5, 0xbe, 0xd4, 0xdb, + 0xcc, 0xa1, 0x53, 0xb8, 0x3f, 0xd1, 0x3b, 0x4d, 0xe5, 0xdd, 0x05, 0x3b, 0xe0, 0xaa, 0x97, 0x88, + 0xde, 0x51, 0xe6, 0x04, 0x2a, 0x3b, 0x61, 0xc8, 0x69, 0x48, 0x24, 0x45, 0x8d, 0x65, 0x60, 0x35, + 0x66, 0xb7, 0xca, 0x1d, 0xc2, 0x7a, 0x97, 0xc6, 0xc1, 0xa4, 0x2d, 0x9f, 0xcc, 0xe1, 0x33, 0xc7, + 0x6d, 0x42, 0xed, 0xdf, 0x1d, 0x70, 0x4f, 0x58, 0x40, 0x47, 0xe8, 0x10, 0xca, 0x67, 0xe6, 0xeb, + 0xea, 0x8e, 0xa9, 0xae, 0xec, 0x6c, 0xbf, 0x39, 0x50, 0xd2, 0xb5, 0xe7, 0xab, 0xba, 0x85, 0x95, + 0x1d, 0xed, 0x5b, 0xa8, 0x4e, 0xda, 0x8c, 0xf2, 0x55, 0x77, 0x71, 0x3b, 0x80, 0x07, 0xa6, 0x79, + 0x67, 0x83, 0xac, 0xba, 0xb5, 0xdb, 0x6f, 0x61, 0x6d, 0x8f, 0x8d, 0xfb, 0x51, 0x4c, 0xf9, 0x8a, + 0xfb, 0xb3, 0xfd, 0x87, 0x7a, 0xe0, 0xb5, 0xed, 0xfd, 0xeb, 0xab, 0xdd, 0x0b, 0xf0, 0x22, 0x76, + 0x13, 0xb3, 0xeb, 0x9d, 0x4d, 0x7e, 0x59, 0xe8, 0x2f, 0x46, 0xf1, 0xcd, 0x6e, 0x18, 0xc9, 0x8b, + 0xb4, 0xdf, 0x1a, 0xb0, 0xb1, 0x6f, 0xb0, 0x11, 0xb3, 0x8b, 0xe7, 0xfa, 0xc7, 0x43, 0x14, 0x0f, + 0xd2, 0x3e, 0x51, 0xdf, 0x28, 0xfe, 0x15, 0x27, 0x49, 0x42, 0xb9, 0xf0, 0x45, 0x3b, 0xf2, 0x43, + 0xe6, 0x27, 0x97, 0xa1, 0x4f, 0x92, 0xa8, 0x5f, 0xd2, 0xea, 0x2f, 0xfe, 0x0d, 0x00, 0x00, 0xff, + 0xff, 0x8b, 0x68, 0xbe, 0x88, 0xb8, 0x0c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. var _ context.Context -var _ grpc.ClientConn +var _ grpc.ClientConnInterface // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion4 +const _ = grpc.SupportPackageIsVersion6 // GenericClient is the client API for Generic service. // @@ -811,10 +813,10 @@ type GenericClient interface { } type genericClient struct { - cc *grpc.ClientConn + cc grpc.ClientConnInterface } -func NewGenericClient(cc *grpc.ClientConn) GenericClient { +func NewGenericClient(cc grpc.ClientConnInterface) GenericClient { return &genericClient{cc} } @@ -1024,10 +1026,10 @@ type ModelClient interface { } type modelClient struct { - cc *grpc.ClientConn + cc grpc.ClientConnInterface } -func NewModelClient(cc *grpc.ClientConn) ModelClient { +func NewModelClient(cc grpc.ClientConnInterface) ModelClient { return &modelClient{cc} } @@ -1132,10 +1134,10 @@ type RouterClient interface { } type routerClient struct { - cc *grpc.ClientConn + cc grpc.ClientConnInterface } -func NewRouterClient(cc *grpc.ClientConn) RouterClient { +func NewRouterClient(cc grpc.ClientConnInterface) RouterClient { return &routerClient{cc} } @@ -1239,10 +1241,10 @@ type TransformerClient interface { } type transformerClient struct { - cc *grpc.ClientConn + cc grpc.ClientConnInterface } -func NewTransformerClient(cc *grpc.ClientConn) TransformerClient { +func NewTransformerClient(cc grpc.ClientConnInterface) TransformerClient { return &transformerClient{cc} } @@ -1311,10 +1313,10 @@ type OutputTransformerClient interface { } type outputTransformerClient struct { - cc *grpc.ClientConn + cc grpc.ClientConnInterface } -func NewOutputTransformerClient(cc *grpc.ClientConn) OutputTransformerClient { +func NewOutputTransformerClient(cc grpc.ClientConnInterface) OutputTransformerClient { return &outputTransformerClient{cc} } @@ -1383,10 +1385,10 @@ type CombinerClient interface { } type combinerClient struct { - cc *grpc.ClientConn + cc grpc.ClientConnInterface } -func NewCombinerClient(cc *grpc.ClientConn) CombinerClient { +func NewCombinerClient(cc grpc.ClientConnInterface) CombinerClient { return &combinerClient{cc} } @@ -1456,10 +1458,10 @@ type SeldonClient interface { } type seldonClient struct { - cc *grpc.ClientConn + cc grpc.ClientConnInterface } -func NewSeldonClient(cc *grpc.ClientConn) SeldonClient { +func NewSeldonClient(cc grpc.ClientConnInterface) SeldonClient { return &seldonClient{cc} } diff --git a/executor/go.mod b/executor/go.mod index f8c34fd261..5a240fd081 100644 --- a/executor/go.mod +++ b/executor/go.mod @@ -22,7 +22,7 @@ require ( github.com/uber/jaeger-client-go v2.21.1+incompatible github.com/uber/jaeger-lib v2.2.0+incompatible // indirect golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 - google.golang.org/grpc v1.24.0 + google.golang.org/grpc v1.27.0 gotest.tools v2.2.0+incompatible k8s.io/api v0.17.2 k8s.io/apimachinery v0.17.2 diff --git a/executor/go.sum b/executor/go.sum index 509c9fab04..fcba37e7c1 100644 --- a/executor/go.sum +++ b/executor/go.sum @@ -56,6 +56,7 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= @@ -91,6 +92,8 @@ github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFP github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.5.0+incompatible h1:ouOWdg56aJriqS0huScTkVXPC5IcNrDCXZ6OoTAWu7M= github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= @@ -344,6 +347,7 @@ github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1: github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f h1:BVwpUVJDADN2ufcGik7W992pyps0wZ888b/y9GXcLTU= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.1.0 h1:ElTg5tNp4DqfV7UQjDqv2+RJlNzsDtvNAWccbItceIE= github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e h1:n/3MEhJQjQxrOUCzh1Y3Re6aJUUWRp2M9+Oc3eVn/54= @@ -599,6 +603,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.24.0 h1:vb/1TCsVn3DcJlQ0Gs1yB1pKI6Do2/QNwxdKqmc/b0s= google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA= +google.golang.org/grpc v1.27.0 h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=