PEER-255 Add updated k8s configs

Signed-off-by: SeeuSim <[email protected]>

Author: SeeuSim

backend/user/.env.compose

@@ -1,6 +1,7 @@
 # When run with compose
 EXPRESS_ENV="compose"
-PEERPREP_UI_HOST="http://frontend:3000"  # to be changed
+# to be changed
+PEERPREP_UI_HOST="http://frontend:3000"  
 
 EXPRESS_PORT=9001
 EXPRESS_DB_HOST="user-db" 

docker-compose.yaml

@@ -77,8 +77,11 @@ services:
 
 volumes:
   user-service:
+    external: false
   question-service:
+    external: false
   collab-service:
+    external: false
 
   # Persistent Volumes for Databases
   user-db-docker:

k8s/collab-db-deployment.yaml

@@ -14,29 +14,31 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/code-default: "true"
+        io.kompose.network/code-collab-db-network: "true"
         io.kompose.service: collab-db
     spec:
       containers:
         - env:
+            - name: EXPRESS_DB_HOST
+              value: localhost
+            - name: EXPRESS_DB_PORT
+              value: "5434"
+            - name: EXPRESS_ENV
+              value: local
             - name: PGDATA
               value: /data/collab-db
             - name: POSTGRES_DB
-              value: collab
+              value: collaboration
             - name: POSTGRES_PASSWORD
-              value: collab
+              value: /86awM+Izo6949YgEQIls8HU+j5RlFYEInRy8auiNa8=
             - name: POSTGRES_USER
-              value: express
+              value: peerprep-collab-express
           image: postgres:16.4
           name: collab-db
-          ports:
-            - containerPort: 5432
-              hostPort: 5433
-              protocol: TCP
           volumeMounts:
             - mountPath: /data/collab-db
               name: collab-db-docker
-      hostname: collabdb
+      hostname: collab-db
       restartPolicy: Always
       volumes:
         - name: collab-db-docker

k8s/collab-db-service.yaml

@@ -14,29 +14,35 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/code-default: "true"
+        io.kompose.network/code-question-db-network: "true"
         io.kompose.service: question-db
     spec:
       containers:
         - env:
+            - name: EXPRESS_DB_HOST
+              value: localhost
+            - name: EXPRESS_DB_PORT
+              value: "5433"
+            - name: EXPRESS_ENV
+              value: local
+            - name: EXPRESS_PORT
+              value: "9002"
+            - name: PEERPREP_UI_HOST
+              value: http://localhost:5173
             - name: PGDATA
-              value: /data/question-db
+              value: /data/qn-db
             - name: POSTGRES_DB
               value: question
             - name: POSTGRES_PASSWORD
-              value: question
+              value: Xk8qEcEI2sizjfEn/lF6mLqiyBECjIHY3q6sdXf9poQ=
             - name: POSTGRES_USER
-              value: express
+              value: peerprep-qn-express
           image: postgres:16.4
           name: question-db
-          ports:
-            - containerPort: 5432
-              hostPort: 5434
-              protocol: TCP
           volumeMounts:
-            - mountPath: /data/question-db
+            - mountPath: /data/qn-db
               name: question-db-docker
-      hostname: questiondb
+      hostname: question-db
       restartPolicy: Always
       volumes:
         - name: question-db-docker

k8s/question-db-deployment.yaml

@@ -14,29 +14,37 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/code-default: "true"
+        io.kompose.network/code-user-db-network: "true"
         io.kompose.service: user-db
     spec:
       containers:
         - env:
+            - name: EXPRESS_DB_HOST
+              value: localhost
+            - name: EXPRESS_DB_PORT
+              value: "5431"
+            - name: EXPRESS_ENV
+              value: local
+            - name: EXPRESS_JWT_SECRET_KEY
+              value: jd+9qlXA0a3YsmVf2KJgyiJ3SprIR318IAwhRXck4Y8=
+            - name: EXPRESS_PORT
+              value: "9001"
+            - name: PEERPREP_UI_HOST
+              value: http://localhost:5173
             - name: PGDATA
               value: /data/user-db
             - name: POSTGRES_DB
               value: user
             - name: POSTGRES_PASSWORD
-              value: user
+              value: 69/X8JxtAVsM+0YHT4RR5D7Ahf7bTobI4EED64FrzIU=
             - name: POSTGRES_USER
-              value: express
+              value: peerprep-user-express
           image: postgres:16.4
           name: user-db
-          ports:
-            - containerPort: 5432
-              hostPort: 5431
-              protocol: TCP
           volumeMounts:
             - mountPath: /data/user-db
               name: user-db-docker
-      hostname: userdb
+      hostname: user-db
       restartPolicy: Always
       volumes:
         - name: user-db-docker

k8s/question-db-service.yaml

@@ -0,0 +1,58 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    io.kompose.service: user-service
+  name: user-service
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      io.kompose.service: user-service
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        io.kompose.network/code-user-api-network: "true"
+        io.kompose.network/code-user-db-network: "true"
+        io.kompose.service: user-service
+    spec:
+      containers:
+        - command:
+            - ./entrypoint.sh
+          env:
+            - name: EXPRESS_DB_HOST
+              value: user-db
+            - name: EXPRESS_DB_PORT
+              value: "5432"
+            - name: EXPRESS_ENV
+              value: compose
+            - name: EXPRESS_JWT_SECRET_KEY
+              value: jd+9qlXA0a3YsmVf2KJgyiJ3SprIR318IAwhRXck4Y8=
+            - name: EXPRESS_PORT
+              value: "9001"
+            - name: PEERPREP_UI_HOST
+              value: http://frontend:3000
+            - name: PGDATA
+              value: /data/user-db
+            - name: POSTGRES_DB
+              value: user
+            - name: POSTGRES_PASSWORD
+              value: 69/X8JxtAVsM+0YHT4RR5D7Ahf7bTobI4EED64FrzIU=
+            - name: POSTGRES_USER
+              value: peerprep-user-express
+          image: user-express
+          name: user-express
+          ports:
+            - containerPort: 9001
+              hostPort: 9001
+              protocol: TCP
+          volumeMounts:
+            - mountPath: /data/question-express
+              name: user-service
+      restartPolicy: Always
+      volumes:
+        - name: user-service
+          persistentVolumeClaim:
+            claimName: user-service

k8s/user-db-deployment.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  labels:
+    io.kompose.service: user-service
+  name: user-service
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi