Merge branch 'main' of https://github.com/CS3219-AY2425S1/cs3219-ay2425s1-project-g11 into fix/audio-call

Author: tyouwei

api-gateway/Dockerfile

@@ -3,6 +3,7 @@ FROM node:18-alpine AS base
 
 # Install pnpm globally
 RUN npm install -g pnpm
+RUN npm install -g typescript
 
 # Set the working directory in the container
 WORKDIR /app
@@ -22,7 +23,6 @@ COPY tsconfig.json ./
 
 CMD ["pnpm", "dev"]
 
-
 # Production stage
 FROM base AS production
 ENV NODE_ENV=production
@@ -33,4 +33,6 @@ COPY tsconfig.json ./
 
 EXPOSE ${PORT}
 
+RUN pnpm build
+
 CMD ["pnpm", "start"]

api-gateway/package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "dev": "nodemon --exec ts-node src/app.ts",
-    "start": "tsc && node dist/app.js",
+    "start": "node dist/app.js",
     "build": "tsc",
     "format": "prettier --write \"src/**/*.ts\"",
     "test": "echo \"Error: no test specified\" && exit 1",

api-gateway/src/app.ts

@@ -17,7 +17,7 @@ app.use(express.json());
 app.use(cors()); // configured so any one can use
 app.options('*', cors());
 
-// Health check route
+// Health check route, redeploy
 app.get('/', (req, res) => {
   res.status(200).send('OK');
 });

k8s/api-gateway.yml

@@ -20,22 +20,36 @@ spec:
           imagePullPolicy: Always
           resources:
             requests:
-              cpu: "500m"
-              memory: "512Mi"
+              memory: "128Mi"
+              cpu: "100m"
             limits:
-              cpu: "1"
-              memory: "1Gi"
+              memory: "256Mi"
+              cpu: "200m"
           ports:
             - containerPort: 8001
           envFrom:
             - secretRef:
                 name: api-gateway-config
+          livenessProbe:  # Add this block for liveness probe
+            httpGet:
+              path: /
+              port: 8001
+            initialDelaySeconds: 10
+            periodSeconds: 10
+          readinessProbe:  # Add this block for readiness probe
+            httpGet:
+              path: /
+              port: 8001
+            initialDelaySeconds: 5
+            periodSeconds: 5
       dnsPolicy: ClusterFirst
 ---
 apiVersion: v1
 kind: Service
 metadata:
   name: api-gateway
+  annotations:
+    cloud.google.com/neg: '{"ingress": true}'
 spec:
   type: LoadBalancer
   ports:

k8s/ingress.yml

@@ -1,22 +1,61 @@
+apiVersion: networking.gke.io/v1beta1
+kind: FrontendConfig
+metadata:
+  name: http-to-https
+spec:
+  redirectToHttps:
+    enabled: true
+    responseCodeName: MOVED_PERMANENTLY_DEFAULT
+---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: fe-ingress
+  name: nginx-ingress-session
   annotations: 
-    ingress.kubernetes.io/rewrite-target: /
+    kubernetes.io/ingress.global-static-ip-name: nginx-api
+    networking.gke.io/managed-certificates: peerprep-fe-cs3219-g11-nginx-all
+    kubernetes.io/ingress.class: "gce"
+    networking.gke.io/frontend-config: "http-to-https"
 spec:
-  tls: 
-    - hosts:
-      - peerprep-interview.duckdns.org
-      secretName: peerprep-config
+  ingressClassName: "gce"
   rules:
-    - host: peerprep-interview.duckdns.org
+    - host: peerprep-fe.duckdns.org
       http:
-        paths: 
-        - path: /
-          pathType: Prefix
-          backend: 
-            service:
+        paths:
+        - path: /* 
+          pathType: ImplementationSpecific
+          backend:
+            service: 
               name: peerprep-fe
               port:
-                number: 80
+                number: 80
+    - host: peerprep-api.duckdns.org
+      http:
+        paths:
+        - path: /*
+          pathType: ImplementationSpecific
+          backend:
+            service: 
+              name: api-gateway
+              port:
+                number: 8001
+    - host: peerprep-session.duckdns.org
+      http:
+        paths:
+        - path: /*
+          pathType: ImplementationSpecific
+          backend:
+            service: 
+              name: session-svc
+              port:
+                number: 4444
+    - host: peerprep-audio.duckdns.org
+      http:
+        paths:
+        - path: /*
+          pathType: ImplementationSpecific
+          backend:
+            service: 
+              name: session-svc
+              port:
+                number: 5555

k8s/managed-cert.yml

@@ -0,0 +1,10 @@
+apiVersion: networking.gke.io/v1
+kind: ManagedCertificate
+metadata:
+  name: peerprep-fe-cs3219-g11-nginx-all
+spec:
+  domains:
+    - peerprep-mock-interview.duckdns.org
+    - peerprep-api.duckdns.org
+    - peerprep-session.duckdns.org
+    - peerprep-audio.duckdns.org

k8s/peerprep-fe.yml

@@ -42,7 +42,13 @@ metadata:
 spec:
   type: LoadBalancer
   ports:
-    - port: 80
+    - name: http
+      protocol: TCP
+      port: 80
+      targetPort: 3000  
+    - name: https
+      protocol: TCP
+      port: 443
       targetPort: 3000
   selector:
     type: frontend

session-service/src/audio-service.ts

@@ -19,6 +19,11 @@ app.use(
   })
 );
 
+// Health check route
+app.get('/', (req, res) => {
+  res.status(200).send('OK');
+});
+
 const httpServer = createServer(app);
 const io = new Server(httpServer, {
   cors: {

session-service/src/server.ts

@@ -24,7 +24,12 @@ app.use(
     credentials: true,
   })
 );
-app.use(express.json()); //
+app.use(express.json());
+
+// Health check route
+app.get('/', (req, res) => {
+  res.status(200).send('OK');
+});
 
 /**
  * Create an http server