fix(manifests): Make the manifests look like those in the deis-dev chart

Author: Jonathan Chauncey

Makefile

@@ -45,9 +45,9 @@ kube-delete-database:
 
 kube-delete-all: kube-delete kube-delete-database
 
-kube-create:
-	kubectl create -f manifests/deis-workflow-rc.tmp.yml
+kube-create: update-manifests
 	kubectl create -f manifests/deis-workflow-service.yml
+	kubectl create -f manifests/deis-workflow-rc.tmp.yml
 
 kube-create-database:
 	kubectl create -f manifests/deis-database-rc.yml

manifests/deis-workflow-rc.yml

@@ -8,11 +8,11 @@ metadata:
 spec:
   replicas: 1
   selector:
-    name: deis-workflow
+    app: deis-workflow
   template:
     metadata:
       labels:
-        name: deis-workflow
+        app: deis-workflow
     spec:
       containers:
         - name: deis-workflow

manifests/deis-workflow-service.yml

@@ -2,16 +2,18 @@ apiVersion: v1
 kind: Service
 metadata:
   name: deis-workflow
+  namespace: deis
   labels:
     heritage: deis
     routable: "true"
   annotations:
     router.deis.io/domains: deis
+    router.deis.io/connectTimeout: "10"
+    router.deis.io/tcpTimeout: "1200"
 spec:
   ports:
-  - name: http
-    port: 80
-    targetPort: 8000
-    protocol: TCP
+    - name: http
+      port: 80
+      targetPort: 8000
   selector:
-    name: deis-workflow
+    app: deis-workflow