fix(manifests/*): bring manifests up to date with those in the deis-dev chart

Author: Aaron Schlesinger

manifests/deis-builder-rc.yaml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ReplicationController
 metadata:
   name: deis-builder
+  namespace: deis
   labels:
     heritage: deis
 spec:
@@ -15,21 +16,22 @@ spec:
     spec:
       containers:
         - name: deis-builder
-          imagePullPolicy: Always
           image: quay.io/deisci/builder:v2-beta
+          imagePullPolicy: Always
           ports:
             - containerPort: 2223
+              name: ssh
             - containerPort: 3000
+              name: fetcher
           env:
-            - name: BUILDER_FETCHER_PORT
-              value: "3000"
-            - name: BUILDER_SSH_HOST_IP
-              value: "0.0.0.0"
-            - name: BUILDER_SSH_HOST_PORT
-              value: "2223"
             - name: "EXTERNAL_PORT"
               value: "2223"
-            - name: POD_NAMESPACE
+            # This var needs to be passed so that the minio client (https://github.com/minio/mc) will work in Alpine linux
+            - name: "DOCKERIMAGE"
+              value: "1"
+            - name: "DEBUG"
+              value: "true"
+            - name: "POD_NAMESPACE"
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
@@ -40,18 +42,10 @@ spec:
             - name: builder-key-auth
               mountPath: /var/run/secrets/api/auth
               readOnly: true
-            # not currently running minio with SSL support. see https://github.com/deis/minio/pull/22 for more detail
-            # - name: minio-ssl
-            #   mountPath: /var/run/secrets/object/ssl
-            #   readOnly: true
       volumes:
         - name: minio-user
           secret:
             secretName: minio-user
         - name: builder-key-auth
           secret:
             secretName: builder-key-auth
-        # not currently running minio with SSL support. see https://github.com/deis/minio/pull/22 for more detail
-        # - name: minio-ssl
-        #   secret:
-        #     secretName: minio-ssl

manifests/deis-builder-service.yaml

@@ -2,17 +2,13 @@ apiVersion: v1
 kind: Service
 metadata:
   name: deis-builder
+  namespace: deis
   labels:
     heritage: deis
-    release: 2.0.0
 spec:
   ports:
-    - port: 2222
+    - name: ssh
+      port: 2222
       targetPort: 2223
-      name: ssh
-      protocol: TCP
-    - port: 3000
-      name: fetcher
-      protocol: TCP
   selector:
     app: deis-builder