Skip to content

Commit aa0c0f8

Browse files
committed
ref(router): update confd to 0.90
1 parent fa5d130 commit aa0c0f8

4 files changed

Lines changed: 4 additions & 10 deletions

File tree

router/boot.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func waitForInitialConfd(etcd string, timeout time.Duration) {
115115
var buffer bytes.Buffer
116116
output := bufio.NewWriter(&buffer)
117117
log.Debugf("Connecting to etcd server %s", etcd)
118-
cmd := exec.Command("confd", "-onetime", "-node", etcd, "-config-file", "/app/confd.toml", "-debug", "-verbose")
118+
cmd := exec.Command("confd", "-onetime", "-node", etcd, "--confdir", "/app", "--quiet")
119119
cmd.Stdout = output
120120
cmd.Stderr = output
121121

@@ -132,7 +132,7 @@ func waitForInitialConfd(etcd string, timeout time.Duration) {
132132
}
133133

134134
func launchConfd(etcd string) {
135-
cmd := exec.Command("confd", "-node", etcd, "-config-file", "/app/confd.toml")
135+
cmd := exec.Command("confd", "-node", etcd, "--confdir", "/app", "--interval", "5", "--quiet")
136136
cmd.Stdout = os.Stdout
137137
cmd.Stderr = os.Stderr
138138

router/image/confd.toml

Lines changed: 0 additions & 6 deletions
This file was deleted.

router/image/templates/deis.cert

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{{ .deis_router_sslCert }}
1+
{{ if exists "/deis/router/sslCert" }}{{ getv "/deis/router/sslCert" }}{{ end }}

router/image/templates/deis.key

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{{ .deis_router_sslKey }}
1+
{{ if exists "/deis/router/sslKey" }}{{ getv "/deis/router/sslKey" }}{{ end }}

0 commit comments

Comments
 (0)