chore(builder): bump confd to v0.8

Author: Matthew Fisher

builder/image/Dockerfile

@@ -10,7 +10,7 @@ RUN curl -sSL -o /usr/local/bin/etcdctl https://s3-us-west-2.amazonaws.com/opdem
     && chmod +x /usr/local/bin/etcdctl
 
 # install confd
-RUN curl -sSL -o /usr/local/bin/confd https://s3-us-west-2.amazonaws.com/opdemand/confd-v0.5.0-json \
+RUN curl -sSL -o /usr/local/bin/confd https://github.com/kelseyhightower/confd/releases/download/v0.8.0/confd-0.8.0-linux-amd64 \
     && chmod +x /usr/local/bin/confd
 
 # install docker-in-docker

builder/image/bin/boot

@@ -41,13 +41,13 @@ function etcd_safe_mkdir {
 etcd_safe_mkdir $ETCD_PATH/users
 
 # wait for confd to run once and install initial templates
-until confd -onetime -node $ETCD -config-file /app/confd.toml; do
+until confd -onetime -node $ETCD --confdir /app --interval 5 --quiet; do
 	echo "builder: waiting for confd to write initial templates..."
 	sleep $(($ETCD_TTL/2))  # sleep for half the TTL
 done
 
 # spawn confd in the background to update services based on etcd changes
-confd -node $ETCD -config-file /app/confd.toml &
+confd -node $ETCD --confdir /app --interval 5 --quiet &
 CONFD_PID=$!
 
 # remove any pre-existing docker.sock

builder/image/confd.toml

@@ -1,3 +1,3 @@
-{{ range $user := .deis_builder_users }}{{ range $key := $user.Nodes }}
-command="/usr/local/bin/gitreceive run {{ Base $user.Key }} {{ Base $key.Key }}",no-agent-forwarding,no-pty,no-user-rc,no-X11-forwarding,no-port-forwarding {{ $key.Value }}
-{{ end }}{{ end }}
+{{ range $user := lsdir "/deis/builder/users" }}{{ range gets (print "/deis/builder/users/" $user "/*") }}
+command="/usr/local/bin/gitreceive run {{ $user }} {{ base .Key }}",no-agent-forwarding,no-pty,no-user-rc,no-X11-forwarding,no-port-forwarding {{ .Value }}
+{{ end }}{{ end }}

builder/image/templates/authorized_keys

@@ -56,7 +56,7 @@ CACHE_DIR="${REPO_DIR}/cache"
 
 # define image names
 IMAGE_NAME="$APP_NAME:git-$SHORT_SHA"
-TMP_IMAGE="{{ .deis_registry_host }}:{{ .deis_registry_port }}/$IMAGE_NAME"
+TMP_IMAGE="{{ getv "/deis/registry/host" }}:{{ getv "/deis/registry/port" }}/$IMAGE_NAME"
 
 # create app directories
 mkdir -p $BUILD_DIR $CACHE_DIR
@@ -76,8 +76,8 @@ if [ -f Dockerfile ]; then
 fi
 
 # pull config from controller to be used during build
-URL="{{ .deis_controller_protocol }}://{{ .deis_controller_host }}:{{ .deis_controller_port }}/v1/hooks/config"
-RESPONSE=$(/app/bin/get-app-config -url="$URL" -key="{{ .deis_controller_builderKey }}" -user=$USER -app=$APP_NAME)
+URL="{{ getv "/deis/controller/protocol" }}://{{ getv "/deis/controller/host" }}:{{ getv "/deis/controller/port" }}/v1/hooks/config"
+RESPONSE=$(/app/bin/get-app-config -url="$URL" -key="{{ getv "/deis/controller/builderKey" }}" -user=$USER -app=$APP_NAME)
 CODE=$?
 
 if [ $CODE -ne 0 ]; then
@@ -144,9 +144,9 @@ else
 fi
 
 puts-step "Launching... "
-URL="{{ .deis_controller_protocol }}://{{ .deis_controller_host }}:{{ .deis_controller_port }}/v1/hooks/build"
+URL="{{ getv "/deis/controller/protocol" }}://{{ getv "/deis/controller/host" }}:{{ getv "/deis/controller/port" }}/v1/hooks/build"
 DATA=$(/app/bin/generate-buildhook "$SHORT_SHA" "$USER" "$APP_NAME" "$APP_NAME" "$PROCFILE" "$USING_DOCKERFILE")
-PUBLISH_RELEASE=$(echo "$DATA" | /app/bin/publish-release-controller -url=$URL -key={{ .deis_controller_builderKey }})
+PUBLISH_RELEASE=$(echo "$DATA" | /app/bin/publish-release-controller -url=$URL -key={{ getv "/deis/controller/builderKey" }})
 
 CODE=$?
 if [ $CODE -ne 0 ]; then

builder/image/templates/builder

@@ -12,8 +12,8 @@ cd $(dirname $0) # absolute path
 for repo in *.git;
 do
     reponame="${repo%.*}"
-    appname="{{ .deis_registry_host }}:{{ .deis_registry_port }}/$reponame"
-    if ! listcontains "{{ range $services := .deis_services }}{{ Base $services.Key }} {{ end }}" "$reponame";
+    appname="{{ getv "/deis/registry/host" }}:{{ getv "/deis/registry/port" }}/$reponame"
+    if ! listcontains "{{ join (lsdir "/deis/services/*") " " }}" "$reponame";
     then
         rm -rf "$repo"
         docker images | grep $appname | awk '{ print $3 }' | xargs docker rmi -f

builder/image/templates/check-repos

@@ -6,5 +6,5 @@ until docker history deis/slugrunner >/dev/null 2>&1; do
 done
 
 # tag and push
-docker tag deis/slugrunner:latest {{ .deis_registry_host }}:{{ .deis_registry_port }}/deis/slugrunner:latest
-docker push {{ .deis_registry_host }}:{{ .deis_registry_port }}/deis/slugrunner:latest
+docker tag deis/slugrunner:latest {{ getv "/deis/registry/host" }}:{{ getv "/deis/registry/port" }}/deis/slugrunner:latest
+docker push {{ getv "/deis/registry/host" }}:{{ getv "/deis/registry/port" }}/deis/slugrunner:latest

builder/image/templates/push-images

@@ -10,6 +10,6 @@ fingerprint=$4
 curl \
   -X 'POST' --fail \
   -H 'Content-Type: application/json' \
-  -H "X-Deis-Builder-Auth: {{ .deis_controller_builderKey }}" \
+  -H "X-Deis-Builder-Auth: {{ getv "/deis/controller/builderKey" }}" \
   -d "{\"receive_user\": \"$username\", \"receive_repo\": \"$app\", \"sha\": \"$sha\", \"fingerprint\": \"$fingerprint\", \"ssh_connection\": \"$SSH_CONNECTION\", \"ssh_original_command\": \"$SSH_ORIGINAL_COMMAND\"}" \
-  --silent http://{{ .deis_controller_host }}:{{ .deis_controller_port }}/v1/hooks/push >/dev/null
+  --silent {{ getv "/deis/controller/protocol" }}://{{ getv "/deis/controller/host" }}:{{ getv "/deis/controller/port" }}/v1/hooks/push >/dev/null