share one grpc-health-probe (#477)

cmd/manager/v1alpha1/main.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	api_pb "github.com/kubeflow/katib/pkg/api/v1alpha1"
-	health_pb "github.com/kubeflow/katib/pkg/api/v1alpha1/health"
+	health_pb "github.com/kubeflow/katib/pkg/api/health"
 	kdb "github.com/kubeflow/katib/pkg/db/v1alpha1"
 	"github.com/kubeflow/katib/pkg/manager/modelstore"
 

cmd/manager/v1alpha2/main.go

@@ -9,7 +9,7 @@ import (
 	"net"
 
 	api_pb "github.com/kubeflow/katib/pkg/api/v1alpha2"
-	health_pb "github.com/kubeflow/katib/pkg/api/v1alpha2/health"
+	health_pb "github.com/kubeflow/katib/pkg/api/health"
 	kdb "github.com/kubeflow/katib/pkg/db/v1alpha2"
 
 	"google.golang.org/grpc"

pkg/api/health/Makefile

@@ -0,0 +1,2 @@
+health.pb.go: health/health.proto
+	protoc -I. health/health.proto --go_out=plugins=grpc:.

pkg/api/health/build.sh

@@ -0,0 +1,7 @@
+set -x
+set -e
+proto="health.proto"
+docker run -it --rm -v $PWD:$(pwd) -w $(pwd) znly/protoc --python_out=plugins=grpc:./python --go_out=plugins=grpc:. -I. $proto
+docker run -it --rm -v $PWD:$(pwd) -w $(pwd) znly/protoc --plugin=protoc-gen-grpc=/usr/bin/grpc_python_plugin --python_out=./python --grpc_out=./python -I. $proto
+docker run -it --rm -v $PWD:$(pwd) -w $(pwd) znly/protoc --grpc-gateway_out=logtostderr=true:. -I. $proto
+docker run -it --rm -v $PWD:$(pwd) -w $(pwd) znly/protoc --swagger_out=logtostderr=true:. -I. $proto

pkg/api/v1alpha1/health/health.swagger.json → pkg/api/health/health.swagger.json

@@ -1,7 +1,7 @@
 {
   "swagger": "2.0",
   "info": {
-    "title": "health/health.proto",
+    "title": "health.proto",
     "version": "version not set"
   },
   "schemes": [

pkg/api/v1alpha1/python/health/health_pb2_grpc.py → pkg/api/health/python/health_pb2_grpc.py

@@ -1,7 +1,7 @@
 # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 import grpc
 
-from health import health_pb2 as health_dot_health__pb2
+import health_pb2 as health__pb2
 
 
 class HealthStub(object):
@@ -16,8 +16,8 @@ def __init__(self, channel):
     """
     self.Check = channel.unary_unary(
         '/grpc.health.v1.Health/Check',
-        request_serializer=health_dot_health__pb2.HealthCheckRequest.SerializeToString,
-        response_deserializer=health_dot_health__pb2.HealthCheckResponse.FromString,
+        request_serializer=health__pb2.HealthCheckRequest.SerializeToString,
+        response_deserializer=health__pb2.HealthCheckResponse.FromString,
         )
 
 
@@ -37,8 +37,8 @@ def add_HealthServicer_to_server(servicer, server):
   rpc_method_handlers = {
       'Check': grpc.unary_unary_rpc_method_handler(
           servicer.Check,
-          request_deserializer=health_dot_health__pb2.HealthCheckRequest.FromString,
-          response_serializer=health_dot_health__pb2.HealthCheckResponse.SerializeToString,
+          request_deserializer=health__pb2.HealthCheckRequest.FromString,
+          response_serializer=health__pb2.HealthCheckResponse.SerializeToString,
       ),
   }
   generic_handler = grpc.method_handlers_generic_handler(

pkg/api/v1alpha1/Makefile

@@ -1,4 +1,2 @@
 api.pb.go: api.proto
 	protoc -I. api.proto --go_out=plugins=grpc:.
-health.pb.go: health/health.proto
-	protoc -I. health/health.proto --go_out=plugins=grpc:.

pkg/api/v1alpha1/build.sh

@@ -1,6 +1,6 @@
 set -x
 set -e
-for proto in api.proto health/health.proto; do
+for proto in api.proto; do
   docker run -it --rm -v $PWD:$(pwd) -w $(pwd) znly/protoc --python_out=plugins=grpc:./python --go_out=plugins=grpc:. -I. $proto
   docker run -it --rm -v $PWD:$(pwd) -w $(pwd) znly/protoc --plugin=protoc-gen-grpc=/usr/bin/grpc_python_plugin --python_out=./python --grpc_out=./python -I. $proto
   docker run -it --rm -v $PWD:$(pwd) -w $(pwd) znly/protoc --grpc-gateway_out=logtostderr=true:. -I. $proto

pkg/api/v1alpha2/Makefile

@@ -1,4 +1,2 @@
 api.pb.go: api.proto
 	protoc -I. api.proto --go_out=plugins=grpc:.
-health.pb.go: health/health.proto
-	protoc -I. health/health.proto --go_out=plugins=grpc:.

pkg/api/v1alpha2/build.sh

@@ -1,6 +1,6 @@
 set -x
 set -e
-for proto in api.proto health/health.proto; do
+for proto in api.proto; do
   docker run -it --rm -v $PWD:$(pwd) -w $(pwd) znly/protoc --python_out=plugins=grpc:./python --go_out=plugins=grpc:. -I. $proto
   docker run -it --rm -v $PWD:$(pwd) -w $(pwd) znly/protoc --plugin=protoc-gen-grpc=/usr/bin/grpc_python_plugin --python_out=./python --grpc_out=./python -I. $proto
   docker run -it --rm -v $PWD:$(pwd) -w $(pwd) znly/protoc --grpc-gateway_out=logtostderr=true:. -I. $proto