Merge pull request #16 from arschles/manifest

fix(manifests): mount and use auth secrets correctly and use proper image names

Author: arschles

manifests/deis-builder-rc.yaml

@@ -1,20 +1,16 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  # Change the name
   name: deis-builder
   labels:
     heritage: deis
 spec:
   replicas: 1
-
-  # Change the selector name
   selector:
     app: deis-builder
   template:
     metadata:
       labels:
-        # Important: these labels need to match the selector above
         app: deis-builder
     spec:
       containers:
@@ -26,11 +22,11 @@ spec:
           env:
             - name: "EXTERNAL_PORT"
               value: "2223"
-  #     volumeMounts:
-  #       - name: object-store
-  #         mountPath: /var/run/secrets/object/store
-  #         readOnly: true
-  # volumes:
-  #   - name: object-store
-  #     secret:
-  #       secretName: object-store
+      volumeMounts:
+        - name: minio-user
+          mountPath: /var/run/secrets/object/store
+          readOnly: true
+  volumes:
+    - name: minio-user
+      secret:
+        secretName: minio-user

manifests/deis-builder-service.yaml

@@ -1,7 +1,6 @@
 apiVersion: v1
 kind: Service
 metadata:
-  # Give this a useful name.
   name: deis-builder
   labels:
     heritage: deis
@@ -16,5 +15,4 @@ spec:
       name: fetcher
       protocol: TCP
   selector:
-    # Match the selector in the RC
     app: deis-builder

rootfs/etc/deis-dockerbuilder.yaml

@@ -1,36 +1,37 @@
-# A debugging utility for testing Minio from within k8s.
 apiVersion: v1
 kind: Pod
 metadata:
-  name: repo_name
+  name: deis-dockerbuilder
   labels:
     heritage: deis
-    version: 2015-sept
+    version: v2-alpha
 spec:
   restartPolicy: Never
   containers:
-    - name: repo_name
+    - name: deis-dockerbuilder
       imagePullPolicy: Always
-      image: smothiki/dockerbuilder:5.5
+      image: quay.io/deisci/dockerbuilder:v2-alpha
       env:
         - name: DEBUG
           value: "1"
         - name: TAR_URL
           value: tar-url
-        - name: IMAGE
+        - name: IMG_NAME
           value: imagename
-        # - name : REG_URL
-        #   value: puturl
+        - name: ACCESS_KEY_FILE
+          value: /var/run/secrets/object/store/access_key
+        - name: ACCESS_SECRET_FILE
+          value: /var/run/secrets/object/store/access_secret
       volumeMounts:
         - mountPath: /var/run/docker.sock
           name: docker-socket
-        - name: object-store
+        - name: minio-user
           mountPath: /var/run/secrets/object/store
           readOnly: true
   volumes:
-    - name: object-store
+    - name: minio-user
       secret:
-        secretName: object-store
+        secretName: minio-user
     - name: docker-socket
       hostPath:
         path: /var/run/docker.sock

rootfs/etc/deis-slugbuilder.yaml

@@ -1,17 +1,16 @@
-# A debugging utility for testing Minio from within k8s.
 apiVersion: v1
 kind: Pod
 metadata:
-  name: repo_name
+  name: deis-slugbuilder
   labels:
     heritage: deis
-    version: 2015-sept
+    version: v2-alpha
 spec:
   restartPolicy: Never
   containers:
-    - name: repo_name
+    - name: deis-slugbuilder
       imagePullPolicy: Always
-      image: smothiki/slugbuilder:5.5
+      image: quay.io/deisci/slugbuilder:v2-alpha
       env:
         - name: DEBUG
           value: "1"
@@ -20,10 +19,10 @@ spec:
         - name : put_url
           value: puturl
       volumeMounts:
-        - name: object-store
+        - name: minio-user
           mountPath: /var/run/secrets/object/store
           readOnly: true
   volumes:
-    - name: object-store
+    - name: minio-user
       secret:
-        secretName: object-store
+        secretName: minio-user