PEER-244,245: Add Matching Service

TODO: Debug redis connection issues with client code in container

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

Author: SeeuSim

backend/matching/.env.compose

@@ -7,4 +7,4 @@ EXPRESS_PORT=9004
 
 MATCHING_DB_USERNAME="peerprep-match-express"
 MATCHING_DB_PASSWORD="G7jBgyz9wGAFQ5La"
-REDIS_ARGS="--requirepass G7jBgyz9wGAFQ5La --user ${MATCHING_DB_USERNAME} on >G7jBgyz9wGAFQ5La ~* allcommands --user default off nopass nocommands"
+REDIS_ARGS="--requirepass G7jBgyz9wGAFQ5La --user peerprep-match-express on >G7jBgyz9wGAFQ5La ~* allcommands --user default off nopass nocommands"

backend/matching/src/lib/db/client.ts

@@ -13,9 +13,14 @@ class RedisClient {
         host: DB_HOSTNAME,
         port: DB_PORT,
       },
-    }).on('error', (err) => {
-      logger.error(`Redis Client error: ${err}`);
-    });
+    })
+      .on('error', (err) => {
+        const { name, message, stack, cause } = err as Error;
+        logger.error({ name, message, stack, cause }, 'Redis Client error');
+      })
+      .on('connect', () => {
+        logger.info('Redis Client connected');
+      });
   }
 }
 

backend/matching/src/lib/db/seed.ts

@@ -24,7 +24,6 @@ const main = async () => {
     return;
   }
 
-  logger.info('Connected');
   const isSeeded = await redisClient.hGetAll(SEED_KEY);
 
   if (Object.keys(isSeeded).length > 0) {

backend/question/.env.compose

@@ -2,8 +2,8 @@
 # PEERPREP_UI_HOST="http://frontend:3000"  
 
 EXPRESS_PORT=9002
-EXPRESS_DB_HOST="qn-db"
-EXPRESS_DB_PORT=5433
+EXPRESS_DB_HOST="question-db"
+EXPRESS_DB_PORT=5432
 POSTGRES_DB="question"
 POSTGRES_USER="peerprep-qn-express"
 POSTGRES_PASSWORD="Xk8qEcEI2sizjfEn/lF6mLqiyBECjIHY3q6sdXf9poQ="

backend/question/src/config.ts

@@ -12,4 +12,4 @@ export const dbConfig = {
   password: process.env.POSTGRES_PASSWORD,
 };
 
-export const LOAD_TEST_POD = process.env.LOAD_TEST_POD || 'http://user-service-load-test';
+export const LOAD_TEST_POD = process.env.LOAD_TEST_POD || 'http://question-service-load-test';

k8s/03-match-db-service.yaml

@@ -14,4 +14,4 @@ spec:
   ports:
     - name: match-db-6379
       port: 6379
-      targetPort: user-db-6379
+      targetPort: match-db-6379

k8s/04-match-svc-deployment.yaml

@@ -0,0 +1,79 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: matching-service
+  namespace: peerprep
+  labels:
+    project: peerprep
+    peerprep.service: matching-service
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      project: peerprep
+      peerprep.service: matching-service
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        project: peerprep
+        peerprep.service: matching-service
+        peerprep.network.match-api: "true"
+        peerprep.network.match-db: "true"
+    spec:
+      initContainers:
+        - name: wait-for-redis
+          image: redis:alpine
+          env:
+            - name: MATCHING_DB_USER
+              valueFrom:
+                secretKeyRef:
+                  name: matching-secret
+                  key: MATCHING_DB_PASSWORD
+            - name: MATCHING_DB_PASSWORD
+              valueFrom:
+                secretKeyRef: 
+                  name: matching-secret
+                  key: MATCHING_DB_PASSWORD
+            - name: MATCHING_DB_HOST
+              value: match-db
+          command:
+            - /bin/sh
+            - -c
+            - |
+              # until REDISCLI_AUTH="$MATCHING_DB_PASSWORD" redis-cli -h match-db --user "$MATCHING_DB_USER" ping; do
+              until redis-cli -h match-db ping; do
+                echo "Waiting for Redis to be ready..."
+                sleep 1
+              done
+              echo "Redis is Healthy"
+      
+      containers:
+        - name: match-express
+          image: ay2425s1cs3219g16/match-express:main
+          imagePullPolicy: IfNotPresent
+          envFrom:
+          - secretRef: 
+              name: matching-secret
+          livenessProbe:
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                - wget --no-verbose --tries=1 --spider http://localhost:9004/health || exit 1
+            periodSeconds: 30
+            initialDelaySeconds: 5
+            timeoutSeconds: 10
+            failureThreshold: 5
+          ports:
+            - name: match-svc-ctr
+              containerPort: 9004
+          resources:
+            requests:
+              cpu: 500m
+              memory: 512Mi
+            limits:
+              cpu: 1
+              memory: 1Gi
+                

k8s/04-match-svc-service.yaml

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

k8s/04-question-svc-deployment.yaml

@@ -64,7 +64,6 @@ spec:
       containers:
         - name: question-express
           image: ay2425s1cs3219g16/question-express:main
-          # image: ay2425s1cs3219g16/question-express:sha-ff94455
           imagePullPolicy: IfNotPresent
           envFrom:
           - secretRef: 
@@ -83,7 +82,7 @@ spec:
             timeoutSeconds: 10
             failureThreshold: 5
           ports:
-            - name: question-svc-ctr
+            - name: qn-svc-ctr
               containerPort: 9002
           resources:
             requests:

k8s/04-question-svc-service.yaml

@@ -12,6 +12,6 @@ spec:
     project: peerprep
     peerprep.service: question-service
   ports:
-    - name: question-svc-prt
+    - name: qn-svc-prt
       port: 9002
-      targetPort: question-svc-ctr
+      targetPort: qn-svc-ctr