fix makefile (#1828) fix

Signed-off-by: kpango <kpango@vdaas.org>
vdaas · Nov 18, 2022 · 31763ca · 31763ca
1 parent 2f6efde
commit 31763ca
Show file tree

Hide file tree

Showing 107 changed files with 56,381 additions and 2,763 deletions.
diff --git a/Makefile b/Makefile
@@ -51,16 +51,16 @@ TEMP_DIR := $(eval TEMP_DIR := $(shell mktemp -d))$(TEMP_DIR)
 
 OPERATOR_SDK_VERSION := $(eval OPERATOR_SDK_VERSION := $(shell cat versions/OPERATOR_SDK_VERSION))$(OPERATOR_SDK_VERSION)
 
-KIND_VERSION            ?= v0.16.0
+KIND_VERSION            ?= v0.17.0
 HELM_VERSION            ?= v3.10.1
 HELM_DOCS_VERSION       ?= 1.11.0
-YQ_VERSION              ?= v4.28.2
-VALDCLI_VERSION         ?= v1.5.6
-TELEPRESENCE_VERSION    ?= 2.8.2
+YQ_VERSION              ?= v4.29.2
+VALDCLI_VERSION         ?= v1.6.3
+TELEPRESENCE_VERSION    ?= 2.8.5
 KUBELINTER_VERSION      ?= 0.5.0
 GOLANGCILINT_VERSION    ?= v1.50.1
 REVIEWDOG_VERSION       ?= v0.14.1
-PROTOBUF_VERSION        ?= 21.8
+PROTOBUF_VERSION        ?= 21.9
 JAEGER_OPERATOR_VERSION ?= 2.30.0
 OTEL_OPERATOR_VERSION   ?= 0.16.0
 PROMETHEUS_VERSION      ?= 41.5.1

diff --git a/Makefile.d/functions.mk b/Makefile.d/functions.mk
@@ -33,9 +33,17 @@ define proto-code-gen
 		$(PROTO_PATHS:%=-I %) \
                 --go_out=$(GOPATH)/src --plugin protoc-gen-go="$(GOPATH)/bin/protoc-gen-go" \
                 --go-vtproto_out=$(GOPATH)/src --plugin protoc-gen-go-vtproto="$(GOPATH)/bin/protoc-gen-go-vtproto" \
-                --go-vtproto_opt=features=grpc+marshal+unmarshal+size+pool \
-                --go-vtproto_opt=pool=$(GOPKG)/apis/proto/v1/payload.Search.Request \
-                --go-vtproto_opt=pool=$(GOPKG)/apis/proto/v1/payload.Object.Vector \
+                --go-vtproto_opt=pool=apis/proto/v1/payload.Insert.MultiRequest \
+                --go-vtproto_opt=pool=apis/proto/v1/payload.Insert.Request \
+                --go-vtproto_opt=pool=apis/proto/v1/payload.Object.Vector \
+                --go-vtproto_opt=pool=apis/proto/v1/payload.Object.Vectors \
+                --go-vtproto_opt=pool=apis/proto/v1/payload.Search.ObjectRequest \
+                --go-vtproto_opt=pool=apis/proto/v1/payload.Search.Request \
+                --go-vtproto_opt=pool=apis/proto/v1/payload.Update.MultiRequest \
+                --go-vtproto_opt=pool=apis/proto/v1/payload.Update.Request \
+                --go-vtproto_opt=pool=apis/proto/v1/payload.Upsert.MultiRequest \
+                --go-vtproto_opt=pool=apis/proto/v1/payload.Upsert.Request \
+                --go-vtproto_opt=features=pool+grpc+marshal+unmarshal+size+equal \
 		$1
 endef
 

diff --git a/apis/grpc/v1/agent/core/agent.pb.go b/apis/grpc/v1/agent/core/agent.pb.go
diff --git a/apis/grpc/v1/agent/core/agent_vtproto.pb.go b/apis/grpc/v1/agent/core/agent_vtproto.pb.go
@@ -88,7 +88,7 @@ func (c *agentClient) CreateAndSaveIndex(ctx context.Context, in *payload.Contro
 }
 
 func (c *agentClient) IndexInfo(ctx context.Context, in *payload.Empty, opts ...grpc.CallOption) (*payload.Info_Index_Count, error) {
-	out := new(payload.Info_Index_Count)
+	out := payload.Info_Index_CountFromVTPool()
 	err := c.cc.Invoke(ctx, "/core.v1.Agent/IndexInfo", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -141,7 +141,7 @@ func RegisterAgentServer(s grpc.ServiceRegistrar, srv AgentServer) {
 }
 
 func _Agent_CreateIndex_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(payload.Control_CreateIndexRequest)
+	in := payload.Control_CreateIndexRequestFromVTPool()
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -177,7 +177,7 @@ func _Agent_SaveIndex_Handler(srv interface{}, ctx context.Context, dec func(int
 }
 
 func _Agent_CreateAndSaveIndex_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(payload.Control_CreateIndexRequest)
+	in := payload.Control_CreateIndexRequestFromVTPool()
 	if err := dec(in); err != nil {
 		return nil, err
 	}

diff --git a/apis/grpc/v1/agent/sidecar/sidecar.pb.go b/apis/grpc/v1/agent/sidecar/sidecar.pb.go
diff --git a/apis/grpc/v1/discoverer/discoverer.pb.go b/apis/grpc/v1/discoverer/discoverer.pb.go
diff --git a/apis/grpc/v1/discoverer/discoverer_vtproto.pb.go b/apis/grpc/v1/discoverer/discoverer_vtproto.pb.go
@@ -57,7 +57,7 @@ func NewDiscovererClient(cc grpc.ClientConnInterface) DiscovererClient {
 }
 
 func (c *discovererClient) Pods(ctx context.Context, in *payload.Discoverer_Request, opts ...grpc.CallOption) (*payload.Info_Pods, error) {
-	out := new(payload.Info_Pods)
+	out := payload.Info_PodsFromVTPool()
 	err := c.cc.Invoke(ctx, "/discoverer.v1.Discoverer/Pods", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -66,7 +66,7 @@ func (c *discovererClient) Pods(ctx context.Context, in *payload.Discoverer_Requ
 }
 
 func (c *discovererClient) Nodes(ctx context.Context, in *payload.Discoverer_Request, opts ...grpc.CallOption) (*payload.Info_Nodes, error) {
-	out := new(payload.Info_Nodes)
+	out := payload.Info_NodesFromVTPool()
 	err := c.cc.Invoke(ctx, "/discoverer.v1.Discoverer/Nodes", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -109,7 +109,7 @@ func RegisterDiscovererServer(s grpc.ServiceRegistrar, srv DiscovererServer) {
 }
 
 func _Discoverer_Pods_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(payload.Discoverer_Request)
+	in := payload.Discoverer_RequestFromVTPool()
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -127,7 +127,7 @@ func _Discoverer_Pods_Handler(srv interface{}, ctx context.Context, dec func(int
 }
 
 func _Discoverer_Nodes_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(payload.Discoverer_Request)
+	in := payload.Discoverer_RequestFromVTPool()
 	if err := dec(in); err != nil {
 		return nil, err
 	}

diff --git a/apis/grpc/v1/filter/egress/egress_filter.pb.go b/apis/grpc/v1/filter/egress/egress_filter.pb.go
diff --git a/apis/grpc/v1/filter/egress/egress_filter_vtproto.pb.go b/apis/grpc/v1/filter/egress/egress_filter_vtproto.pb.go
@@ -57,7 +57,7 @@ func NewFilterClient(cc grpc.ClientConnInterface) FilterClient {
 }
 
 func (c *filterClient) FilterDistance(ctx context.Context, in *payload.Object_Distance, opts ...grpc.CallOption) (*payload.Object_Distance, error) {
-	out := new(payload.Object_Distance)
+	out := payload.Object_DistanceFromVTPool()
 	err := c.cc.Invoke(ctx, "/filter.egress.v1.Filter/FilterDistance", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -66,7 +66,7 @@ func (c *filterClient) FilterDistance(ctx context.Context, in *payload.Object_Di
 }
 
 func (c *filterClient) FilterVector(ctx context.Context, in *payload.Object_Vector, opts ...grpc.CallOption) (*payload.Object_Vector, error) {
-	out := new(payload.Object_Vector)
+	out := payload.Object_VectorFromVTPool()
 	err := c.cc.Invoke(ctx, "/filter.egress.v1.Filter/FilterVector", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -109,7 +109,7 @@ func RegisterFilterServer(s grpc.ServiceRegistrar, srv FilterServer) {
 }
 
 func _Filter_FilterDistance_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(payload.Object_Distance)
+	in := payload.Object_DistanceFromVTPool()
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -127,7 +127,7 @@ func _Filter_FilterDistance_Handler(srv interface{}, ctx context.Context, dec fu
 }
 
 func _Filter_FilterVector_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(payload.Object_Vector)
+	in := payload.Object_VectorFromVTPool()
 	if err := dec(in); err != nil {
 		return nil, err
 	}

diff --git a/apis/grpc/v1/filter/ingress/ingress_filter.pb.go b/apis/grpc/v1/filter/ingress/ingress_filter.pb.go
diff --git a/apis/grpc/v1/filter/ingress/ingress_filter_vtproto.pb.go b/apis/grpc/v1/filter/ingress/ingress_filter_vtproto.pb.go
@@ -57,7 +57,7 @@ func NewFilterClient(cc grpc.ClientConnInterface) FilterClient {
 }
 
 func (c *filterClient) GenVector(ctx context.Context, in *payload.Object_Blob, opts ...grpc.CallOption) (*payload.Object_Vector, error) {
-	out := new(payload.Object_Vector)
+	out := payload.Object_VectorFromVTPool()
 	err := c.cc.Invoke(ctx, "/filter.ingress.v1.Filter/GenVector", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -66,7 +66,7 @@ func (c *filterClient) GenVector(ctx context.Context, in *payload.Object_Blob, o
 }
 
 func (c *filterClient) FilterVector(ctx context.Context, in *payload.Object_Vector, opts ...grpc.CallOption) (*payload.Object_Vector, error) {
-	out := new(payload.Object_Vector)
+	out := payload.Object_VectorFromVTPool()
 	err := c.cc.Invoke(ctx, "/filter.ingress.v1.Filter/FilterVector", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -109,7 +109,7 @@ func RegisterFilterServer(s grpc.ServiceRegistrar, srv FilterServer) {
 }
 
 func _Filter_GenVector_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(payload.Object_Blob)
+	in := payload.Object_BlobFromVTPool()
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -127,7 +127,7 @@ func _Filter_GenVector_Handler(srv interface{}, ctx context.Context, dec func(in
 }
 
 func _Filter_FilterVector_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(payload.Object_Vector)
+	in := payload.Object_VectorFromVTPool()
 	if err := dec(in); err != nil {
 		return nil, err
 	}

diff --git a/apis/grpc/v1/manager/index/index_manager.pb.go b/apis/grpc/v1/manager/index/index_manager.pb.go
diff --git a/apis/grpc/v1/manager/index/index_manager_vtproto.pb.go b/apis/grpc/v1/manager/index/index_manager_vtproto.pb.go
@@ -55,7 +55,7 @@ func NewIndexClient(cc grpc.ClientConnInterface) IndexClient {
 }
 
 func (c *indexClient) IndexInfo(ctx context.Context, in *payload.Empty, opts ...grpc.CallOption) (*payload.Info_Index_Count, error) {
-	out := new(payload.Info_Index_Count)
+	out := payload.Info_Index_CountFromVTPool()
 	err := c.cc.Invoke(ctx, "/manager.index.v1.Index/IndexInfo", in, out, opts...)
 	if err != nil {
 		return nil, err