Move Protobuf contracts to top-level (#39)

* Move Proto contracts to top-level * Rename operator-scheduler APIs dir for consistency * Use symlink for scheduler APIs in operator * Fix import path in operator to use same generated Go as scheduler * Add Make target for scheduler Protos * Add Make targets for other Protos + simplify config * Use Proto import paths relative to import base (API root dir) * Simplify Proto generation further for API contracts * Fix Proto import paths in operator * Regenerate Go files from Protos * Remove Proto-generation Make targets from app-specific Makefiles The Proto-to-Golang generation is now handled within the API contracts dir, thus the application-specific generation is redundant and duplicative. * Fix Proto import path in proxy notebook * Fix Proto import path in local agent notebook * Fix Proto import path in local scheduler notebook * Fix Proto import path in k8s scheduler notebook * Add symlink for scheduler to API contracts * Remove leftover API experiment file
SeldonIO · Dec 22, 2021 · 59a20b3 · 59a20b3
1 parent a0be779
commit 59a20b3
Show file tree

Hide file tree

Showing 28 changed files with 421 additions and 2,216 deletions.
diff --git a/apis/Makefile b/apis/Makefile
@@ -0,0 +1,16 @@
+PROTOC_IMPORT_PATH := -I.
+
+PROTOC_GO_PATH := --go_opt=paths=source_relative
+PROTOC_GO_OUT := --go_out=.
+PROTOC_GO_GRPC_PATH := --go-grpc_opt=paths=source_relative
+PROTOC_GO_GRPC_OUT := --go-grpc_out=.
+PROTOC_GO_OPTIONS = $(PROTOC_GO_PATH) $(PROTOC_GO_OUT) $(PROTOC_GO_GRPC_PATH) $(PROTOC_GO_GRPC_OUT)
+
+.PHONY: build
+build:
+	protoc \
+		$(PROTOC_IMPORT_PATH) \
+		$(PROTOC_GO_OPTIONS) \
+		./mlops/agent/agent.proto \
+		./mlops/proxy/proxy.proto \
+		./mlops/scheduler/scheduler.proto
diff --git a/scheduler/apis/mlops/agent/README.md → apis/mlops/agent/README.md b/scheduler/apis/mlops/agent/README.md → apis/mlops/agent/README.md
diff --git a/scheduler/apis/mlops/agent/agent.pb.go → apis/mlops/agent/agent.pb.go b/scheduler/apis/mlops/agent/agent.pb.go → apis/mlops/agent/agent.pb.go
diff --git a/scheduler/apis/mlops/agent/agent.proto → apis/mlops/agent/agent.proto b/scheduler/apis/mlops/agent/agent.proto → apis/mlops/agent/agent.proto
@@ -4,7 +4,7 @@ package seldon.mlops.agent;
 
 option go_package = "github.com/seldonio/seldon-core/scheduler/apis/mlops/agent";
 
-import "scheduler.proto";
+import "mlops/scheduler/scheduler.proto";
 
 // [START Messages]
 

diff --git a/scheduler/apis/mlops/agent/agent_grpc.pb.go → apis/mlops/agent/agent_grpc.pb.go b/scheduler/apis/mlops/agent/agent_grpc.pb.go → apis/mlops/agent/agent_grpc.pb.go
diff --git a/scheduler/apis/mlops/agent/architecture.png → apis/mlops/agent/architecture.png b/scheduler/apis/mlops/agent/architecture.png → apis/mlops/agent/architecture.png
diff --git a/scheduler/apis/mlops/proxy/proxy.pb.go → apis/mlops/proxy/proxy.pb.go b/scheduler/apis/mlops/proxy/proxy.pb.go → apis/mlops/proxy/proxy.pb.go
diff --git a/scheduler/apis/mlops/proxy/proxy.proto → apis/mlops/proxy/proxy.proto b/scheduler/apis/mlops/proxy/proxy.proto → apis/mlops/proxy/proxy.proto
@@ -4,7 +4,7 @@ package seldon.mlops.proxy;
 
 option go_package = "github.com/seldonio/seldon-core/scheduler/apis/mlops/proxy";
 
-import "scheduler.proto";
+import "mlops/scheduler/scheduler.proto";
 
 // [START Messages]
 

diff --git a/scheduler/apis/mlops/proxy/proxy_grpc.pb.go → apis/mlops/proxy/proxy_grpc.pb.go b/scheduler/apis/mlops/proxy/proxy_grpc.pb.go → apis/mlops/proxy/proxy_grpc.pb.go
diff --git a/scheduler/apis/mlops/scheduler/README.md → apis/mlops/scheduler/README.md b/scheduler/apis/mlops/scheduler/README.md → apis/mlops/scheduler/README.md
diff --git a/...ler/apis/mlops/scheduler/architecture.png → apis/mlops/scheduler/architecture.png b/...ler/apis/mlops/scheduler/architecture.png → apis/mlops/scheduler/architecture.png