From 426e7415d718631d4af8558c9f5f843e55649c11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=C3=A1n=20C=20McCord?= Date: Wed, 18 Jul 2018 02:40:27 -0400 Subject: [PATCH] make db host pluggable --- db/db.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/db/db.go b/db/db.go index c3295c0..e487ff8 100644 --- a/db/db.go +++ b/db/db.go @@ -19,6 +19,7 @@ func Connect() error { return nil } + var host = "localhost" var username = "nobody" var password string @@ -30,10 +31,17 @@ func Connect() error { username = os.Getenv("COCKROACH_USER") password = os.Getenv("COCKROACH_PASS") } + if os.Getenv("COCKROACH_HOST") != "" { + host = os.Getenv("COCKROACH_HOST") + } - dsn := fmt.Sprintf("postgresql://%s@localhost:26257/cycore?sslmode=disabled", username) + dsn := fmt.Sprintf("postgresql://%s@%s:26257/cycore?sslmode=disabled", username, host) if os.Getenv("KUBERNETES_SERVICE_HOST") != "" { - dsn = fmt.Sprintf("postgresql://%s:%s@cockroachdb-public.db.svc.cluster.local:26257/cycore?sslmode=verify-full&sslrootcert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt&sslcert=/cockroach-certs/cert&sslkey=/cockroach-certs/key", username, password) + if host == "localhost" { + host = "cockroachdb-public.db.svc.cluster.local" + } + + dsn = fmt.Sprintf("postgresql://%s:%s@%s:26257/cycore?sslmode=verify-full&sslrootcert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt&sslcert=/cockroach-certs/cert&sslkey=/cockroach-certs/key", username, password, host) } if os.Getenv("DSN") != "" { dsn = os.Getenv("DSN")