Merge pull request #64 from datacol-io/feature/deploy-pods

Support for updating all pod types on deployment
datacol-io · Feb 26, 2018 · 8d96dc4 · 8d96dc4
2 parents 2a92f2e + 84042a4
commit 8d96dc4
Show file tree

Hide file tree

Showing 25 changed files with 373 additions and 331 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/api/controller/services.pb.go b/api/controller/services.pb.go
diff --git a/api/controller/services.proto b/api/controller/services.proto
@@ -110,6 +110,7 @@ message LogStreamReq {
   string name = 1;
   bool follow = 2;
   google.protobuf.Duration since = 3;
+  string proctype = 4;
 }
 
 message ProcessRunReq {

diff --git a/api/controller/services.swagger.json b/api/controller/services.swagger.json
@@ -500,6 +500,12 @@
             "required": false,
             "type": "integer",
             "format": "int32"
+          },
+          {
+            "name": "proctype",
+            "in": "query",
+            "required": false,
+            "type": "string"
           }
         ],
         "tags": [
@@ -1040,6 +1046,9 @@
         "name": {
           "type": "string"
         },
+        "proctype": {
+          "type": "string"
+        },
         "workers": {
           "type": "integer",
           "format": "int32"

diff --git a/api/logs.go b/api/logs.go
@@ -14,8 +14,9 @@ func (s *Server) LogStream(req *pbs.LogStreamReq, stream pbs.ProviderService_Log
 	}
 
 	return s.Provider.LogStream(req.Name, logStreamW{stream}, pb.LogStreamOptions{
-		Follow: req.Follow,
-		Since:  since,
+		Follow:   req.Follow,
+		Since:    since,
+		Proctype: req.Proctype,
 	})
 }
 

diff --git a/api/models/extra.go b/api/models/extra.go
@@ -45,8 +45,9 @@ type ReleaseOptions struct {
 }
 
 type LogStreamOptions struct {
-	Follow bool
-	Since  time.Duration
+	Follow   bool
+	Proctype string
+	Since    time.Duration
 }
 
 type AppCreateOptions struct {

diff --git a/api/models/types.pb.go b/api/models/types.pb.go
diff --git a/api/models/types.proto b/api/models/types.proto
@@ -61,8 +61,9 @@ message EnvConfig {
 
 message Process {
   string name = 1;
-  int32 workers = 2;
-  string status = 3;
+  string proctype = 2;
+  int32 workers = 3;
+  string status = 4;
 }
 
 message Formation {

diff --git a/client/apps.go b/client/apps.go
@@ -40,16 +40,16 @@ func (c *Client) RestartApp(name string) error {
 	return err
 }
 
-func (c *Client) StreamAppLogs(name string, follow bool, since time.Duration, out io.Writer) error {
+func (c *Client) StreamAppLogs(name string, follow bool, since time.Duration, proctype string, out io.Writer) error {
 	stream, err := c.ProviderServiceClient.LogStream(ctx, &pbs.LogStreamReq{
-		Name:   name,
-		Since:  ptypes.DurationProto(since),
-		Follow: follow,
+		Name:     name,
+		Since:    ptypes.DurationProto(since),
+		Follow:   follow,
+		Proctype: proctype,
 	})
 	if err != nil {
 		return err
 	}
-
 	defer stream.CloseSend()
 
 	for {

diff --git a/cloud/aws/apps.go b/cloud/aws/apps.go
@@ -96,23 +96,13 @@ func (a *AwsCloud) AppGet(name string) (*pb.App, error) {
 			return nil, err
 		}
 
-		// FIXME: Have a better way to determine name for the deployed service(s). This will change if we support multiple processes for an app.
-		var proctype string
-		if len(b.Procfile) > 0 {
-			proctype = "web"
-		} else {
-			proctype = "cmd"
-		}
-
-		kc := a.kubeClient()
+		proctype, kc := common.GetDefaultProctype(b), a.kubeClient()
 		serviceName := common.GetJobID(name, proctype)
 
 		if app.Endpoint, err = sched.GetServiceEndpoint(kc, a.DeploymentName, serviceName); err != nil {
 			return app, err
 		}
-
 		return app, a.saveApp(app)
-
 	}
 
 	return app, nil