More deployment fixes.

LCOGT · Dec 6, 2024 · 00c03ee · 00c03ee
1 parent 882fd89
commit 00c03ee
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 14 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -14,6 +14,8 @@ WORKDIR /banzai-floyds-ui/banzai_floyds_ui
 
 RUN python manage.py collectstatic
 
+RUN python manage.py createcachetable
+
 RUN python manage.py makemigrations
 
 RUN python manage.py migrate

diff --git a/banzai_floyds_ui/settings.py b/banzai_floyds_ui/settings.py
@@ -25,7 +25,7 @@
 SECRET_KEY = os.getenv('SECRET_KEY', 'django-insecure-0*$4nwm8zd$jcc*xlwm$2nm_=r6bn5rv@#k7jrta^dy&c*3)(y')
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = eval(os.getenv('DEBUG', False))
+DEBUG = eval(os.getenv('DEBUG', 'False'))
 
 ALLOWED_HOSTS = os.getenv('ALLOWED_HOSTS', '*').split(',')
 
@@ -49,7 +49,8 @@
     'bootstrap4',
     'django_plotly_dash.apps.DjangoPlotlyDashConfig',
     'dpd_static_support',
-    'fontawesomefree'
+    'fontawesomefree',
+    'django_redis'
 ]
 
 MIDDLEWARE = [
@@ -66,6 +67,7 @@
 ]
 
 SESSION_ENGINE = "django.contrib.sessions.backends.cache"
+SESSION_CACHE_ALIAS = "default"
 
 ROOT_URLCONF = 'banzai_floyds_ui.gui.urls'
 
@@ -90,16 +92,16 @@
 if os.environ.get('REDIS_HOST') is None:
     CACHES = {
         "default": {
-            "BACKEND": "django.core.cache.backends.locmem.LocMemCache",
-            "LOCATION": "unique-snowflake",
+            "BACKEND": "django.core.cache.backends.db.DatabaseCache",
+            "LOCATION": "django_cache_table",
         }
     }
 else:
     CACHES = {
         'default':
             {
                 'BACKEND': 'django_redis.cache.RedisCache',
-                "LOCATION": f"redis://{os.environ['REDIS_HOST']}/{os.environ['REDIS_PORT']}",
+                "LOCATION": f"redis://{os.environ['REDIS_HOST']}:{os.environ['REDIS_PORT']}",
                 'OPTIONS': {'CLIENT_CLASS': 'django_redis.client.DefaultClient'}
             }
     }
@@ -108,14 +110,24 @@
 # Database
 # https://docs.djangoproject.com/en/4.1/ref/settings/#databases
 
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': BASE_DIR / 'db.sqlite3',
+if os.getenv('FLOYDS_UI_DB_HOST') is None:
+    DATABASES = {
+        'default': {
+            'ENGINE': 'django.db.backends.sqlite3',
+            'NAME': BASE_DIR / 'db.sqlite3',
+        }
+    }
+else:
+    DATABASES = {
+        'default': {
+            'ENGINE': os.getenv('FLOYDS_UI_DB_ENGINE', 'django.db.backends.postgresql'),
+            'NAME': os.environ['FLOYDS_UI_DB_NAME'],
+            'USER': os.environ['FLOYDS_UI_DB_USER'],
+            'PASSWORD': os.environ['FLOYDS_UI_DB_PASSWORD'],
+            'HOST': os.environ['FLOYDS_UI_DB_HOST'],
+            'PORT': os.getenv('FLOYDS_UI_DB_PORT', '5432'),
+        }
     }
-}
-
-
 # Password validation
 # https://docs.djangoproject.com/en/4.1/ref/settings/#auth-password-validators
 

diff --git a/k8s/base/deploy-server.yaml b/k8s/base/deploy-server.yaml
@@ -58,11 +58,11 @@ spec:
             initialDelaySeconds: 15
             timeoutSeconds: 3
             httpGet:
-              path: /status/
+              path: status
               port: http
           readinessProbe:
             initialDelaySeconds: 15
             timeoutSeconds: 3
             httpGet:
-              path: /status/
+              path: status
               port: http
diff --git a/k8s/base/kustomization.yaml b/k8s/base/kustomization.yaml
@@ -17,3 +17,4 @@ configMapGenerator:
       - REDIS_PORT=6379
       - DEBUG=1
       - DB_ADDRESS=sqlite:///test.db
+      - OPENTSDB_PYTHON_METRICS_TEST_MODE=1