<feat>(K8s): Add DeleteJob

Tlantic · Dec 11, 2018 · 7cd5bf7 · 7cd5bf7
1 parent 684ad5b
commit 7cd5bf7
Show file tree

Hide file tree

Showing 4 changed files with 147 additions and 27 deletions.
diff --git a/internal/pb/k8s_service.pb.go b/internal/pb/k8s_service.pb.go
diff --git a/internal/pb/k8s_service.proto b/internal/pb/k8s_service.proto
@@ -50,6 +50,13 @@ message CreateJobRequest {
 message CreateJobResponse {
 }
 
+message DeleteJobRequest {
+    string Name = 1;
+}
+
+message DeleteJobResponse {
+}
+
 service K8sService {
     rpc GetConfigMap (GetConfigMapRequest) returns (GetConfigMapResponse) {
     }
@@ -63,4 +70,6 @@ service K8sService {
     }
     rpc CreateJob (CreateJobRequest) returns (CreateJobResponse) {
     }
+    rpc DeleteJob (DeleteJobRequest) returns (DeleteJobResponse) {
+    }
 }
diff --git a/pkg/server/controller.go b/pkg/server/controller.go
@@ -84,3 +84,8 @@ func (s *K8sService) CreateJob(ctx context.Context, in *pb.CreateJobRequest) (*p
 	err = s.manager.CreateJob(&jobTemplateData, false)
 	return &pb.CreateJobResponse{}, err
 }
+
+func (s *K8sService) DeleteJob(ctx context.Context, in *pb.DeleteJobRequest) (*pb.DeleteJobResponse, error) {
+	err := s.manager.DeleteJob(in.Name)
+	return &pb.DeleteJobResponse{}, err
+}
diff --git a/pkg/server/controller_test.go b/pkg/server/controller_test.go
@@ -23,8 +23,7 @@ func TestNewK8sService(t *testing.T) {
 
 	t.Run("GetConfigMap", func(t *testing.T) {
 		res, err := service.GetConfigMap(context.Background(), &pb.GetConfigMapRequest{
-			Namespace: os.Getenv("K8S_NAMESPACE"),
-			Key:       "mrs-service-scheduler",
+			Key: "mrs-service-scheduler",
 		})
 		if err != nil {
 			t.Error(err)