Merge pull request #8 from jaycode/main

Update psycopg requirement to one compatible with the workspace and update deployment yaml files to follow rubric requirements

analytics/requirements.txt

@@ -2,4 +2,4 @@ APScheduler==3.10.4
 Flask==3.0.2
 flask_sqlalchemy==3.1.1
 SQLAlchemy==2.0.27
-psycopg2==2.9.9
+psycopg2-binary==2.9.9

deployment-local/configmap.yaml

@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: <NAME OF THE ConfigMap>
+data:
+  DB_NAME: <ENTER YOUR DB NAME HERE>
+  DB_USER: <ENTER YOUR USER NAME HERE>
+  DB_HOST: <ENTER YOUR DB HOST HERE>
+  DB_PORT: <ENTER YOUR DB PORT HERE>
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: <NAME OF THE Secret>
+type: Opaque
+data:
+  <THE KEY FROM Secret WHICH has THE ENCODED PASSWORD>: <OUTPUT OF `echo -n 'the password' | base64`>

deployment-local/coworking.yaml

@@ -3,6 +3,7 @@ kind: Service
 metadata:
   name: coworking
 spec:
+  # A local environment doesn't generally have a LoadBalancer, so we use NodePort instead.
   type: NodePort
   selector:
     service: coworking
@@ -30,6 +31,7 @@ spec:
     spec:
       containers:
       - name: coworking
+        # Locally hosted docker image
         image: <DOCKER_IMAGE_NAME>:<IMAGE_TAG>
         imagePullPolicy: IfNotPresent
         livenessProbe:
@@ -44,18 +46,13 @@ spec:
             port: 5153
           initialDelaySeconds: 5
           timeoutSeconds: 5
+        envFrom:
+        - configMapRef:
+            name: <NAME OF THE ConfigMap>
         env:
-        - name: DB_HOST
-          value: <SERVICE_NAME>-postgresql
-        - name: DB_PORT
-          value: "5432"
-        - name: DB_USERNAME
-          value: postgres
         - name: DB_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: <SERVICE_NAME>-postgresql
-              key: postgres-password
-        - name: DB_NAME
-          value: postgres
+              name: <NAME OF THE Secret>
+              key: <THE KEY FROM Secret WHICH has THE ENCODED PASSWORD>
       restartPolicy: Always

deployment/configmap.yaml

@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: <NAME OF THE ConfigMap>
+data:
+  DB_NAME: <ENTER YOUR DB NAME HERE>
+  DB_USER: <ENTER YOUR USER NAME HERE>
+  DB_HOST: <ENTER YOUR DB HOST HERE>
+  DB_PORT: <ENTER YOUR DB PORT HERE>
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: <NAME OF THE Secret>
+type: Opaque
+data:
+  <THE KEY FROM Secret WHICH has THE ENCODED PASSWORD>: <OUTPUT OF `echo -n 'the password' | base64`>

deployment/coworking.yaml

@@ -44,18 +44,13 @@ spec:
             port: 5153
           initialDelaySeconds: 5
           timeoutSeconds: 5
+        envFrom:
+        - configMapRef:
+            name: <NAME OF THE ConfigMap>
         env:
-        - name: DB_HOST
-          value: <SERVICE_NAME>-postgresql
-        - name: DB_PORT
-          value: "5432"
-        - name: DB_USERNAME
-          value: postgres
         - name: DB_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: <SERVICE_NAME>-postgresql
-              key: postgres-password
-        - name: DB_NAME
-          value: postgres
+              name: <NAME OF THE Secret>
+              key: <THE KEY FROM Secret WHICH has THE ENCODED PASSWORD>
       restartPolicy: Always