chore(*): bump confd to v0.9.0

Matthew Fisher · Matthew Fisher · commit a20a9912f98f · 2015-04-10T14:21:01.000-07:00
I've also managed to clean up some of the flags like `--interval` which
is only used when `--watch` is not present.
diff --git a/builder/image/Dockerfile b/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://github.com/kelseyhightower/confd/releases/download/v0.8.0/confd-0.8.0-linux-amd64 \
+RUN curl -sSL -o /usr/local/bin/confd https://github.com/kelseyhightower/confd/releases/download/v0.9.0/confd-0.9.0-linux-amd64 \
     && chmod +x /usr/local/bin/confd
 
 # install docker-in-docker
diff --git a/builder/image/bin/boot b/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 --confdir /app --interval 5 --quiet; do
+until confd -onetime -node $ETCD --confdir /app --log-level error; 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 --confdir /app --interval 5 --quiet --watch &
+confd -node $ETCD --confdir /app --log-level error --watch &
 CONFD_PID=$!
 
 # remove any pre-existing docker.sock
diff --git a/builder/image/bin/check b/builder/image/bin/check
diff --git a/builder/image/conf.d/authorized_keys.toml b/builder/image/conf.d/authorized_keys.toml
@@ -7,4 +7,3 @@ mode  = "0600"
 keys = [
   "/deis/builder/users",
 ]
-check_cmd = "/app/bin/check {{ .src }}"
diff --git a/builder/image/conf.d/builder.toml b/builder/image/conf.d/builder.toml
@@ -9,4 +9,3 @@ keys = [
   "/deis/builder",
   "/deis/registry",
 ]
-check_cmd = "/app/bin/check {{ .src }}"
diff --git a/builder/image/conf.d/check-repos.toml b/builder/image/conf.d/check-repos.toml
@@ -9,4 +9,3 @@ keys = [
   "/deis/registry",
 ]
 reload_cmd = "/home/git/check-repos"
-check_cmd = "/app/bin/check {{ .src }}"
diff --git a/builder/image/conf.d/gitreceive.toml b/builder/image/conf.d/gitreceive.toml
@@ -4,4 +4,3 @@ dest  = "/usr/local/bin/gitreceive"
 uid = 0
 gid = 0
 mode  = "0755"
-check_cmd = "/app/bin/check {{ .src }}"
diff --git a/builder/image/conf.d/push-images.toml b/builder/image/conf.d/push-images.toml
@@ -7,4 +7,3 @@ mode  = "0755"
 keys = [
   "/deis/registry",
 ]
-check_cmd = "/app/bin/check {{ .src }}"
diff --git a/builder/image/conf.d/receiver.toml b/builder/image/conf.d/receiver.toml
@@ -7,4 +7,3 @@ mode  = "0755"
 keys = [
   "/deis/controller",
 ]
-check_cmd = "/app/bin/check {{ .src }}"
diff --git a/controller/Dockerfile b/controller/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://github.com/kelseyhightower/confd/releases/download/v0.8.0/confd-0.8.0-linux-amd64 \
+RUN curl -sSL -o /usr/local/bin/confd https://github.com/kelseyhightower/confd/releases/download/v0.9.0/confd-0.9.0-linux-amd64 \
     && chmod +x /usr/local/bin/confd
 
 # define execution environment
diff --git a/controller/bin/boot b/controller/bin/boot
@@ -65,7 +65,7 @@ done
 echo "controller: done running etcd data migrations."
 
 # wait for confd to run once and install initial templates
-until confd -onetime -node $ETCD --confdir /app --interval 5 --quiet 2>/dev/null; do
+until confd -onetime -node $ETCD --confdir /app --log-level error; do
 	echo "controller: waiting for confd to write initial templates..."
 	sleep $(($ETCD_TTL/2))  # sleep for half the TTL
 done
@@ -91,7 +91,7 @@ function on_exit() {
 trap on_exit TERM
 
 # spawn confd in the background to update services based on etcd changes
-confd -node $ETCD --confdir /app --interval 5 --quiet --watch &
+confd -node $ETCD --confdir /app --log-level error --watch &
 CONFD_PID=$!
 
 echo deis-controller running...
diff --git a/database/Dockerfile b/database/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://github.com/kelseyhightower/confd/releases/download/v0.8.0/confd-0.8.0-linux-amd64 \
+RUN curl -sSL -o /usr/local/bin/confd https://github.com/kelseyhightower/confd/releases/download/v0.9.0/confd-0.9.0-linux-amd64 \
     && chmod +x /usr/local/bin/confd
 
 ADD build.sh /tmp/build.sh
diff --git a/database/bin/boot b/database/bin/boot
@@ -53,7 +53,7 @@ echo '#!/bin/sh' > /usr/local/bin/reload
 chmod 0755 /usr/local/bin/reload
 
 # wait for confd to run once and install initial templates
-until confd -onetime -node $ETCD -confdir /app --interval 5 --quiet; do
+until confd -onetime -node $ETCD -confdir /app --log-level error; do
 	echo "database: waiting for confd to write initial templates..."
 	sleep $(($ETCD_TTL/2))  # sleep for half the TTL
 done
@@ -110,7 +110,7 @@ function on_exit() {
 trap on_exit INT TERM
 
 # spawn confd in the background to update services based on etcd changes
-confd -node $ETCD -confdir /app --interval 5 --quiet --watch &
+confd -node $ETCD -confdir /app --log-level error --watch &
 CONFD_PID=$!
 
 # wait for the service to become available
diff --git a/registry/Dockerfile b/registry/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://github.com/kelseyhightower/confd/releases/download/v0.8.0/confd-0.8.0-linux-amd64 \
+RUN curl -sSL -o /usr/local/bin/confd https://github.com/kelseyhightower/confd/releases/download/v0.9.0/confd-0.9.0-linux-amd64 \
     && chmod +x /usr/local/bin/confd
 
 ENV DOCKER_REGISTRY_CONFIG /docker-registry/config/config.yml
diff --git a/registry/bin/boot b/registry/bin/boot
@@ -45,7 +45,7 @@ etcd_set_default protocol http
 etcd_set_default bucketName ${BUCKET_NAME}
 
 # wait for confd to run once and install initial templates
-until confd -onetime -node $ETCD --confdir /app --interval 5 --quiet >/dev/null 2>&1 ; do
+until confd -onetime -node $ETCD --confdir /app --log-level error; do
 	echo "registry: waiting for confd to write initial templates..."
 	sleep $(($ETCD_TTL/2))  # sleep for half the TTL
 done
@@ -67,7 +67,7 @@ function on_exit() {
 trap on_exit INT TERM
 
 # spawn confd in the background to update services based on etcd changes
-confd -node $ETCD --confdir /app --interval 5 --quiet --watch &
+confd -node $ETCD --confdir /app --log-level error --watch &
 CONFD_PID=$!
 
 echo deis-registry running...
diff --git a/store/admin/bin/boot b/store/admin/bin/boot
@@ -6,7 +6,7 @@
 ETCD_PORT=${ETCD_PORT:-4001}
 ETCD="$HOST:$ETCD_PORT"
 
-confd -node $ETCD --confdir /app --interval 5 --quiet --watch &
+confd -node $ETCD --confdir /app --log-level error --watch &
 
 # loop forever until the container is stopped
 while true; do
diff --git a/store/base/build.sh b/store/base/build.sh
@@ -19,8 +19,9 @@ apt-get update && apt-get install -y curl net-tools sudo
 curl -sSL -o /usr/local/bin/etcdctl https://s3-us-west-2.amazonaws.com/opdemand/etcdctl-v0.4.6 \
     && chmod +x /usr/local/bin/etcdctl
 
-# Use modified confd with a fix for /etc/hosts - see https://github.com/kelseyhightower/confd/pull/123
-curl -sSL -o /usr/local/bin/confd https://github.com/kelseyhightower/confd/releases/download/v0.8.0/confd-0.8.0-linux-amd64 \
+# install confd
+CONFD_VERSION=0.9.0
+curl -sSL -o /usr/local/bin/confd https://github.com/kelseyhightower/confd/releases/download/v$CONFD_VERSION/confd-$CONFD_VERSION-linux-amd64 \
 	&& chmod +x /usr/local/bin/confd
 
 curl -sSL 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc' | apt-key add -
diff --git a/store/daemon/bin/boot b/store/daemon/bin/boot
@@ -12,7 +12,7 @@ until etcdctl --no-sync -C $ETCD get /deis/store/monSetupComplete >/dev/null 2>&
   sleep 5
 done
 
-until confd -onetime -node $ETCD --confdir /app --interval 5 --quiet >/dev/null 2>&1 ; do
+until confd -onetime -node $ETCD --confdir /app --log-level error; do
   echo "store-daemon: waiting for confd to write initial templates..."
   sleep 5
 done
diff --git a/store/gateway/bin/boot b/store/gateway/bin/boot
@@ -26,7 +26,7 @@ done
 sleep $(($ETCD_TTL+1))
 
 # wait for confd to run once and install initial templates
-until confd -onetime -node $ETCD --confdir /app --interval 5 --quiet >/dev/null 2>/dev/null; do
+until confd -onetime -node $ETCD --confdir /app --log-level error; do
     echo "store-gateway: waiting for confd to write initial templates..."
     sleep $(($ETCD_TTL/2))  # sleep for half the TTL
 done
@@ -106,7 +106,7 @@ function on_exit() {
 trap on_exit INT TERM
 
 # spawn confd in the background to update services based on etcd changes
-confd -node $ETCD --confdir /app --interval 5 --quiet --watch &
+confd -node $ETCD --confdir /app --log-level error --watch &
 CONFD_PID=$!
 
 echo deis-store-gateway running...
diff --git a/store/metadata/bin/boot b/store/metadata/bin/boot
@@ -8,7 +8,7 @@ ETCD_PATH=${ETCD_PATH:-/deis/store}
 HOSTNAME=`hostname`
 MDS_NAME=$HOSTNAME
 
-until confd -onetime -node $ETCD --confdir /app --interval 5 --quiet >/dev/null 2>&1 ; do
+until confd -onetime -node $ETCD --confdir /app --log-level error; do
   echo "store-metadata: waiting for confd to write initial templates..."
   sleep 5
 done
diff --git a/store/monitor/bin/boot b/store/monitor/bin/boot
@@ -60,7 +60,7 @@ if ! etcdctl --no-sync -C $ETCD get ${ETCD_PATH}/monSetupComplete >/dev/null 2>&
   fi
 fi
 
-until confd -onetime -node $ETCD --confdir /app --interval 5 --quiet >/dev/null 2>&1; do
+until confd -onetime -node $ETCD --confdir /app --log-level error; do
   echo "store-monitor: waiting for confd to write initial templates..."
   sleep 5
 done

Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,3 @@ mode = "0600"`
`7`	`7`	`keys = [`
`8`	`8`	`"/deis/builder/users",`
`9`	`9`	`]`
`10`		`-check_cmd = "/app/bin/check {{ .src }}"`
Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,3 @@ keys = [`
`9`	`9`	`"/deis/builder",`
`10`	`10`	`"/deis/registry",`
`11`	`11`	`]`
`12`		`-check_cmd = "/app/bin/check {{ .src }}"`
Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,3 @@ mode = "0755"`
`7`	`7`	`keys = [`
`8`	`8`	`"/deis/registry",`
`9`	`9`	`]`
`10`		`-check_cmd = "/app/bin/check {{ .src }}"`
Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,3 @@ mode = "0755"`
`7`	`7`	`keys = [`
`8`	`8`	`"/deis/controller",`
`9`	`9`	`]`
`10`		`-check_cmd = "/app/bin/check {{ .src }}"`