PEER-244,245: Add collab service and initContainer for matching service

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

Author: SeeuSim

backend/collaboration/.env.compose

@@ -3,7 +3,7 @@
 
 EXPRESS_PORT=9003
 EXPRESS_DB_HOST="collab-db"
-EXPRESS_DB_PORT=5435
+EXPRESS_DB_PORT=5432
 POSTGRES_DB="collab"
 POSTGRES_USER="peerprep-collab-express"
 POSTGRES_PASSWORD="6rYE0nIzI2ThzDO"

k8s/04-collab-svc-deployment.yaml

@@ -0,0 +1,97 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: collab-service
+  namespace: peerprep
+  labels:
+    project: peerprep
+    peerprep.service: collab-service
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      project: peerprep
+      peerprep.service: collab-service
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        project: peerprep
+        peerprep.service: collab-service
+        peerprep.network.collab-api: "true"
+        peerprep.network.collab-db: "true"
+    spec:
+      initContainers:
+        - name: wait-for-postgres
+          image: postgres:16.4
+          env:
+            - name: PGHOST
+              valueFrom:
+                secretKeyRef:
+                  name: collaboration-secret
+                  key: EXPRESS_DB_HOST
+            - name: PGPORT
+              valueFrom:
+                secretKeyRef:
+                  name: collaboration-secret
+                  key: EXPRESS_DB_PORT
+            - name: PGPASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: collaboration-secret
+                  key: POSTGRES_PASSWORD
+            - name: PGUSER
+              valueFrom:
+                secretKeyRef:
+                  name: collaboration-secret
+                  key: POSTGRES_USER
+            - name: PGDATABASE
+              valueFrom:
+                secretKeyRef:
+                  name: collaboration-secret
+                  key: POSTGRES_DB
+          command:
+            - /bin/sh
+            - -c
+            - |
+              while ! psql -c 'SELECT 1' > /dev/null 2>&1; do
+                echo "Waiting for $PGDATABASE"
+                sleep 1
+              done
+              echo "$PGDATABASE is ready!"
+      
+      containers:
+        - name: collab-express
+          image: ay2425s1cs3219g16/collab-express:main
+          imagePullPolicy: IfNotPresent
+          envFrom:
+          - secretRef: 
+              name: collaboration-secret
+          env:
+            # When load testing, it exposes port 80 by default.
+            - name: LOAD_TEST_POD
+              value: http://collab-service-load-test
+            - name: PEERPREP_UI_HOST
+              value: http://frontend
+          livenessProbe:
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                - wget --no-verbose --tries=1 --spider http://localhost:9003/health || exit 1
+            periodSeconds: 30
+            initialDelaySeconds: 5
+            timeoutSeconds: 10
+            failureThreshold: 5
+          ports:
+            - name: collab-svc-ctr
+              containerPort: 9003
+          resources:
+            requests:
+              cpu: 500m
+              memory: 512Mi
+            limits:
+              cpu: "1"
+              memory: 1Gi
+                

k8s/04-collab-svc-hpa.yaml

@@ -0,0 +1,19 @@
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: collab-service-hpa
+  namespace: peerprep
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: collab-service
+  minReplicas: 1
+  maxReplicas: 5
+  metrics:
+  - type: Resource
+    resource:
+      name: cpu
+      target:
+        type: Utilization
+        averageUtilization: 30

k8s/04-collab-svc-service.yaml

@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: collab-service
+  namespace: peerprep
+  labels:
+    project: peerprep
+    peerprep.service: collab-service
+spec:
+  type: ClusterIP
+  selector:
+    project: peerprep
+    peerprep.service: collab-service
+  ports:
+    - name: collab-svc-prt
+      port: 9003
+      targetPort: collab-svc-ctr

k8s/04-match-svc-deployment.yaml

@@ -21,9 +21,12 @@ spec:
         peerprep.service: matching-service
         peerprep.network.match-api: "true"
         peerprep.network.match-db: "true"
+        peerprep.network.user-api: "true"
+        peerprep.network.question-api: "true"
+        peerprep.network.collab-api: "true"
     spec:
       initContainers:
-        - name: wait-for-redis
+        - name: wait-for-services
           image: redis:alpine
           env:
             - name: MATCHING_DB_USER
@@ -38,15 +41,38 @@ spec:
                   key: MATCHING_DB_PASSWORD
             - name: MATCHING_DB_HOST
               value: match-db
+            - name: PEERPREP_USER_HOST
+              value: http://user-service:9001
+            - name: PEERPREP_QUESTION_HOST
+              value: http://question-service:9002
+            - name: PEERPREP_COLLAB_HOST
+              value: http://collab-service:9003
           command:
             - /bin/sh
             - -c
             - |
               until REDISCLI_AUTH="$MATCHING_DB_PASSWORD" redis-cli -h "$MATCHING_DB_HOST" --user "$MATCHING_DB_USERNAME" ping; do
                 echo "Waiting for Redis to be ready..."
-                sleep 1
-              done
-              echo "Redis is Healthy"
+                sleep 2
+              done &
+          
+              until wget --no-verbose --tries=1 --spider "$PEERPREP_USER_HOST/health"; do
+                echo "Waiting for User Service"
+                sleep 2
+              done &
+
+              until wget --no-verbose --tries=1 --spider "$PEERPREP_QUESTION_HOST/health"; do
+                echo "Waiting for Question Service"
+                sleep 2
+              done &
+
+              until wget --no-verbose --tries=1 --spider "$PEERPREP_COLLAB_HOST/health"; do
+                echo "Waiting for Collaboration Service"
+                sleep 2
+              done &
+
+              wait
+              echo "All services healthy"
 
       containers:
         - name: match-express
@@ -62,6 +88,12 @@ spec:
               value: "6379"
             - name: PEERPREP_UI_HOST
               value: http://frontend:3000
+            - name: PEERPREP_USER_HOST
+              value: http://user-service:9001
+            - name: PEERPREP_QUESTION_HOST
+              value: http://question-service:9002
+            - name: PEERPREP_COLLAB_HOST
+              value: http://collab-service:9003
           livenessProbe:
             exec:
               command:
@@ -80,6 +112,6 @@ spec:
               cpu: 500m
               memory: 512Mi
             limits:
-              cpu: 1
+              cpu: "1"
               memory: 1Gi