From 73a6fa1e4716efc2fd4e0806b321b6ad658a2c2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=C3=A1n=20C=20McCord?= Date: Wed, 18 Jul 2018 02:19:14 -0400 Subject: [PATCH] use client keys in k8s --- db/db.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/db/db.go b/db/db.go index 3cceffe..4cefad9 100644 --- a/db/db.go +++ b/db/db.go @@ -20,7 +20,6 @@ func Connect() error { } var username = "nobody" - var password string u, err := user.Current() if err == nil { @@ -28,12 +27,11 @@ func Connect() error { } if os.Getenv("COCKROACH_USER") != "" { username = os.Getenv("COCKROACH_USER") - password = os.Getenv("COCKROACH_PASS") } - dsn := fmt.Sprintf("postgresql://%s:%s@localhost:26257/cycore?sslmode=disabled", username, password) + dsn := fmt.Sprintf("postgresql://%s@localhost:26257/cycore?sslmode=disabled", username) if os.Getenv("KUBERNETES_SERVICE_HOST") != "" { - dsn = fmt.Sprintf("postgresql://%s:%s@cockroachdb-public.db:26257/cycore?sslmode=require&sslrootcert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt", username, password) + dsn = fmt.Sprintf("postgresql://%s@cockroachdb-public.db:26257/cycore?sslmode=require&sslrootcert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt&sslcert=/cockroach-certs/cert&sslkey=/cockroach-certs/key", username) } if os.Getenv("DSN") != "" { dsn = os.Getenv("DSN")