Merge pull request #93 from helgi/manifests

feat(manifests): sync with deis-dev charts. Assumes secrets already exist from a helm install

Author: helgi

_tests/builder_test.go

@@ -27,7 +27,6 @@ func TestBuilder(t *testing.T) {
 		"/deis/controller/protocol",
 		"/deis/controller/host",
 		"/deis/controller/port",
-		"/deis/controller/builderKey",
 	}
 	setdir := []string{
 		"/deis/controller",

manifests/deis-builder-rc.yaml

@@ -31,6 +31,9 @@ spec:
             - name: minio-user
               mountPath: /var/run/secrets/object/store
               readOnly: true
+            - 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
@@ -39,6 +42,9 @@ spec:
         - 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:

rootfs/etc/confd/templates/builder

@@ -45,6 +45,7 @@ REPO=$2
 GIT_SHA=$3
 SHORT_SHA=${GIT_SHA:0:8}
 APP_NAME="${REPO%.*}"
+BUILDER_KEY=$(cat /var/run/secrets/api/auth/builder-key)
 
 cd $(dirname $0) # ensure we are in the root dir
 
@@ -75,7 +76,7 @@ else
 fi
 
 URL="http://$DEIS_WORKFLOW_SERVICE_HOST:$DEIS_WORKFLOW_SERVICE_PORT/v2/hooks/config"
-RESPONSE=$(get-app-config -url="$URL" -key="{{ getv "/deis/controller/builderKey" }}" -user=$USER -app=$APP_NAME -value="BUILDPACK_URL")
+RESPONSE=$(get-app-config -url="$URL" -key="$BUILDER_KEY" -user=$USER -app=$APP_NAME -value="BUILDPACK_URL")
 CODE=$?
 if [ $CODE -ne 0 ]; then
     puts-warn $RESPONSE
@@ -186,7 +187,7 @@ puts-step "Launching app."
 puts-step "Launching... "
 URL="http://$DEIS_WORKFLOW_SERVICE_HOST:$DEIS_WORKFLOW_SERVICE_PORT/v2/hooks/build"
 DATA="$(generate-buildhook "$SHORT_SHA" "$USER" "$APP_NAME" "$APP_NAME" "$PROCFILE" "$USING_DOCKERFILE")"
-PUBLISH_RELEASE=$(echo "$DATA" | publish-release-controller -url=$URL -key={{ getv "/deis/controller/builderKey" }})
+PUBLISH_RELEASE=$(echo "$DATA" | publish-release-controller -url=$URL -key="$BUILDER_KEY")
 CODE=$?
 if [ $CODE -ne 0 ]; then
     puts-warn "ERROR: Failed to launch container"

rootfs/etc/confd/templates/receiver

@@ -7,9 +7,10 @@ sha=$2
 username=$3
 fingerprint=$4
 
+BUILDER_KEY=$(cat /var/run/secrets/api/auth/builder-key)
 curl \
   -X 'POST' --fail \
   -H 'Content-Type: application/json' \
-  -H "X-Deis-Builder-Auth: {{ getv "/deis/controller/builderKey" }}" \
+  -H "X-Deis-Builder-Auth: $BUILDER_KEY" \
   -d "{\"receive_user\": \"$username\", \"receive_repo\": \"$app\", \"sha\": \"$sha\", \"fingerprint\": \"$fingerprint\", \"ssh_connection\": \"$SSH_CONNECTION\", \"ssh_original_command\": \"$SSH_ORIGINAL_COMMAND\"}" \
   --silent "http://$DEIS_WORKFLOW_SERVICE_HOST:$DEIS_WORKFLOW_SERVICE_PORT/v2/hooks/push" >/dev/null