Merge pull request #3415 from aledbf/router_update_confd

ref(router): update confd to 0.90

Author: aledbf

router/boot.go

@@ -115,7 +115,7 @@ func waitForInitialConfd(etcd string, timeout time.Duration) {
 		var buffer bytes.Buffer
 		output := bufio.NewWriter(&buffer)
 		log.Debugf("Connecting to etcd server %s", etcd)
-		cmd := exec.Command("confd", "-onetime", "-node", etcd, "-config-file", "/app/confd.toml", "-debug", "-verbose")
+		cmd := exec.Command("confd", "-node", etcd, "--confdir", "/app", "-onetime", "--log-level", "error")
 		cmd.Stdout = output
 		cmd.Stderr = output
 
@@ -132,7 +132,7 @@ func waitForInitialConfd(etcd string, timeout time.Duration) {
 }
 
 func launchConfd(etcd string) {
-	cmd := exec.Command("confd", "-node", etcd, "-config-file", "/app/confd.toml")
+	cmd := exec.Command("confd", "-node", etcd, "--confdir", "/app", "--log-level", "error", "--interval", "5")
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 

router/image/Dockerfile

@@ -5,9 +5,9 @@ ENV DEBIAN_FRONTEND noninteractive
 # install common packages
 RUN apt-get update && apt-get install -y curl net-tools sudo
 
-# install confd from https://github.com/deis/confd/tree/deis
-RUN curl -sSL -o /usr/local/bin/confd https://s3-us-west-2.amazonaws.com/opdemand/confd-git-4c50136 \
-    && chmod +x /usr/local/bin/confd
+# install confd
+RUN curl -sSL -o /usr/local/bin/confd https://s3-us-west-2.amazonaws.com/opdemand/confd-git-73f7489 \
+  && chmod +x /usr/local/bin/confd
 
 # install common packages
 RUN apt-get update && apt-get install -y libgeoip1 cron

router/image/confd.toml

@@ -1 +1 @@
-{{ .deis_router_sslCert }}
+{{ getv "/deis/router/sslCert" }}

router/image/templates/deis.cert

@@ -1,9 +1,9 @@
 server_name_in_redirect off;
 port_in_redirect off;
-listen 80{{ if .deis_router_proxyProtocol }} proxy_protocol{{ end }};
+listen 80{{ if exists "/deis/router/proxyProtocol" }} proxy_protocol{{ end }};
 
-{{ if .deis_router_sslCert }}
-listen 443 ssl spdy{{ if .deis_router_proxyProtocol }} proxy_protocol{{ end }};
+{{ if exists "/deis/router/sslCert" }}
+listen 443 ssl spdy{{ if exists "/deis/router/proxyProtocol" }} proxy_protocol{{ end }};
 ssl_certificate /etc/ssl/deis.cert;
 ssl_certificate_key /etc/ssl/deis.key;
 ssl_protocols TLSv1 TLSv1.1 TLSv1.2;

router/image/templates/deis.conf

@@ -1 +1 @@
-{{ .deis_router_sslKey }}
+{{ getv "/deis/router/sslKey" }}

router/image/templates/deis.key

@@ -3,8 +3,8 @@
 # create or truncate the file
 > /etc/ssl/deis_certs
 
-{{ range $cert := .deis_certs }}
-echo {{ $cert.Key }} >> /etc/ssl/deis_certs
+{{ range $cert := ls "/deis/certs" }}
+echo {{ $cert }} >> /etc/ssl/deis_certs
 {{ end }}
 
 CERT_PATH=/etc/ssl/deis/certs
@@ -19,26 +19,14 @@ mkdir -p $CERT_PATH
 mkdir -p $KEY_PATH
 
 while read etcd_path; do
-    ETCD_SLUG=".$(echo $etcd_path | sed s/\\/// | sed s/\\//_/g)"
-    ETCD_CERT_SLUG="${ETCD_SLUG}_cert"
-    ETCD_KEY_SLUG="${ETCD_SLUG}_key"
-
-    # cert template
-    {{ range $cert := .deis_certs }}{{ if $cert.Nodes }}
-    {{ range $certFields := $cert.Nodes }}
-    {{ if eq (Base $certFields.Key) "cert" }}
-    if [[ "$(basename $etcd_path)" == "{{ Base $cert.Key }}" ]]; then
-    cat << EOF > "$CERT_PATH/$(basename $etcd_path).cert"
-{{ $certFields.Value }}
+  {{ range $cert := ls "/deis/certs" }}
+  if [[ "$etcd_path" == "{{ $cert }}" ]]; then
+    cat << EOF > "$CERT_PATH/$etcd_path.cert"
+{{ getv (printf "/deis/certs/%s/cert" $cert) }}
 EOF
-    fi
-    {{ else if eq (Base $certFields.Key) "key" }}
-    if [[ "$(basename $etcd_path)" == "{{ Base $cert.Key }}" ]]; then
-    cat << EOF > "$KEY_PATH/$(basename $etcd_path).key"
-{{ $certFields.Value }}
+    cat << EOF > "$KEY_PATH/$etcd_path.key"
+{{ getv (printf "/deis/certs/%s/key" $cert) }}
 EOF
-    fi
-    {{ end }}
-    {{ end }}
-    {{ end }}{{ end }}
+  fi{{ end }}
 done < /etc/ssl/deis_certs
+