From 144ed633818483aa34f966c803fac4b76d7dcc3b Mon Sep 17 00:00:00 2001
From: Luke Van Seters <lukevanseters@gmail.com>
Date: Thu, 9 Sep 2021 07:49:29 -0600
Subject: [PATCH] Get local postgres working on kube

---
 Tiltfile                       |  2 +-
 k8s/app.yaml                   | 13 ++++++++++++-
 k8s/postgresql/values_dev.yaml |  5 -----
 mev_inspect/db.py              |  7 ++++++-
 pyproject.toml                 |  1 +
 scripts/__init__.py            |  0
 6 files changed, 20 insertions(+), 8 deletions(-)
 delete mode 100644 k8s/postgresql/values_dev.yaml
 delete mode 100644 scripts/__init__.py

diff --git a/Tiltfile b/Tiltfile
index 078fdfb..a3b2f2c 100644
--- a/Tiltfile
+++ b/Tiltfile
@@ -2,7 +2,7 @@ load('ext://helm_remote', 'helm_remote')
 helm_remote("postgresql",
             repo_name='bitnami',
             repo_url='https://charts.bitnami.com/bitnami',
-            values=["k8s/postgresql/values_dev.yaml"]
+            set=["postgresqlPassword=password", "postgresqlDatabase=mev_inspect"],
 )
 
 docker_build('mev-inspect', '.',
diff --git a/k8s/app.yaml b/k8s/app.yaml
index 3097ee2..4916c7f 100644
--- a/k8s/app.yaml
+++ b/k8s/app.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: mev-inspect
+  name: mev-inspect-deployment
   labels:
     app: mev-inspect
 spec:
@@ -19,6 +19,17 @@ spec:
         image: mev-inspect:latest
         command: [ "/bin/bash", "-c", "--" ]
         args: [ "while true; do sleep 30; done;" ]
+        env:
+        - name: POSTGRES_USER
+          valueFrom:
+            secretKeyRef:
+              name: mev-inspect-db-password
+              key: username
+        - name: POSTGRES_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: mev-inspect-db-password
+              key: password
     livenessProbe:
       exec:
         command:
diff --git a/k8s/postgresql/values_dev.yaml b/k8s/postgresql/values_dev.yaml
deleted file mode 100644
index 46f8c77..0000000
--- a/k8s/postgresql/values_dev.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-global:
-  postgresql:
-    postgresqlDatabase: "mev_inspect"
-    postgresqlUsername: "postgres"
-    postgresqlPassword: "password"
diff --git a/mev_inspect/db.py b/mev_inspect/db.py
index 862fe96..556f068 100644
--- a/mev_inspect/db.py
+++ b/mev_inspect/db.py
@@ -5,7 +5,12 @@ from sqlalchemy.orm import sessionmaker
 
 
 def get_engine():
-    return create_engine(os.getenv("SQLALCHEMY_DATABASE_URI"))
+    username = os.getenv("POSTGRES_USER")
+    password = os.getenv("POSTGRES_PASSWORD")
+    server = "postgresql"
+    db_name = "mev_inspect"
+    uri = f"postgresql://{username}:{password}@{server}/{db_name}"
+    return create_engine(uri)
 
 
 def get_session():
diff --git a/pyproject.toml b/pyproject.toml
index 758c10f..409cdb1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -41,6 +41,7 @@ build = 'scripts.poetry.docker:build'
 attach = 'scripts.poetry.docker:attach'
 exec = 'scripts.poetry.docker:exec'
 inspect = 'scripts.poetry.inspect:inspect'
+inspect-block = 'scripts.inspect_block:inspect_block'
 inspect-many = 'scripts.poetry.inspect:inspect_many'
 
 [tool.black]
diff --git a/scripts/__init__.py b/scripts/__init__.py
deleted file mode 100644
index e69de29..0000000