From 00dba743d9013e5e8b3029e2148fdb38c371f042 Mon Sep 17 00:00:00 2001
From: Gui Heise <gheise@ufl.edu>
Date: Fri, 4 Feb 2022 16:21:58 -0500
Subject: [PATCH] ConfigMap

---
 Tiltfile                                  |  4 ++++
 k8s/mev-inspect/templates/deployment.yaml |  5 +++++
 mev_inspect/s3_export.py                  | 10 +++-------
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Tiltfile b/Tiltfile
index 828ed9f..3b3c8a9 100644
--- a/Tiltfile
+++ b/Tiltfile
@@ -78,3 +78,7 @@ local_resource(
     serve_cmd='kubectl port-forward --namespace default svc/postgresql 5432:5432',
     resource_deps=["postgresql"]
 )
+
+k8s_yaml(configmap_from_dict("mev-inspect-export", inputs = {
+    "export-bucket-name" : "local-export",
+}))
diff --git a/k8s/mev-inspect/templates/deployment.yaml b/k8s/mev-inspect/templates/deployment.yaml
index fa2123f..329bb84 100644
--- a/k8s/mev-inspect/templates/deployment.yaml
+++ b/k8s/mev-inspect/templates/deployment.yaml
@@ -91,6 +91,11 @@ spec:
                 name: mev-inspect-listener-healthcheck
                 key: url
                 optional: true
+          - name: EXPORT_BUCKET_NAME
+            valueFrom:
+              configMapKeyRef:
+                name: mev-inspect-export
+                key: export-bucket-name
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/mev_inspect/s3_export.py b/mev_inspect/s3_export.py
index 8b7aba1..2710af8 100644
--- a/mev_inspect/s3_export.py
+++ b/mev_inspect/s3_export.py
@@ -1,5 +1,6 @@
 import json
 import logging
+import os
 
 import boto3
 
@@ -7,7 +8,7 @@ from mev_inspect.text_io import BytesIteratorIO
 
 MEV_SUMMARY_EXPORT_QUERY = """
     SELECT to_json(mev_summary)
-    FROM mev_summary 
+    FROM mev_summary
     WHERE
         block_number >= :after_block_number AND
         block_number < :before_block_number
@@ -20,7 +21,7 @@ def export_block_range(
     inspect_db_session, after_block_number: int, before_block_number
 ) -> None:
     client = get_s3_client()
-    bucket_name = get_export_bucket_name()
+    bucket_name = os.environ["EXPORT_BUCKET_NAME"]
 
     mev_summary_json_results = inspect_db_session.execute(
         statement=MEV_SUMMARY_EXPORT_QUERY,
@@ -45,11 +46,6 @@ def export_block_range(
     logger.info(f"Exported to {key}")
 
 
-# TODO - replaced by ConfigMap
-def get_export_bucket_name() -> str:
-    return "local-export"
-
-
 # TODO - handle for production
 def get_s3_client():
     return boto3.client(