Merge pull request #45 from CS3219-AY2425S1/fix-deployment

fix deployment
CS3219-AY2425S1 · Nov 10, 2024 · d78ac44 · d78ac44
2 parents 0342ef8 + 4933cea
commit d78ac44
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/deploy-collab-service.yaml b/.github/workflows/deploy-collab-service.yaml
@@ -13,7 +13,8 @@ env:
   GKE_CLUSTER: peerprep-cluster-1
   GKE_ZONE: asia-southeast1
   REPOSITORY_NAME: peerprep
-  SERVICE: collab-service
+  K8_DIR: collab-service
+  SERVICE: collaboration-service
   IMAGE: collaboration
 
 jobs:
@@ -68,6 +69,6 @@ jobs:
     # Deploy the Docker image to the GKE cluster
     - name: Deploy
       run: |-
-        kubectl apply -f kubernetes/${SERVICE}
-        kubectl rollout status deployment/${SERVICE}
+        kubectl apply -f kubernetes/${K8_DIR}
+        kubectl rollout status deployment/${K8_DIR}
         kubectl get services -o wide
diff --git a/.github/workflows/deploy-matching-service.yaml b/.github/workflows/deploy-matching-service.yaml
@@ -13,7 +13,8 @@ env:
   GKE_CLUSTER: peerprep-cluster-1
   GKE_ZONE: asia-southeast1
   REPOSITORY_NAME: peerprep
-  SERVICE: match-service
+  K8_DIR: match-service
+  SERVICE: matching-service
   IMAGE: matching
 
 jobs:
@@ -68,6 +69,6 @@ jobs:
     # Deploy the Docker image to the GKE cluster
     - name: Deploy
       run: |-
-        kubectl apply -f kubernetes/${SERVICE}
-        kubectl rollout status deployment/${SERVICE}
+        kubectl apply -f kubernetes/${K8_DIR}
+        kubectl rollout status deployment/${K8_DIR}
         kubectl get services -o wide
diff --git a/.github/workflows/deploy-question-service.yaml b/.github/workflows/deploy-question-service.yaml
@@ -13,7 +13,8 @@ env:
   GKE_CLUSTER: peerprep-cluster-1
   GKE_ZONE: asia-southeast1
   REPOSITORY_NAME: peerprep
-  SERVICE: qn-service
+  K8_DIR: qn-service
+  SERVICE: question-service
   IMAGE: questions
 
 jobs:
@@ -68,6 +69,6 @@ jobs:
     # Deploy the Docker image to the GKE cluster
     - name: Deploy
       run: |-
-        kubectl apply -f kubernetes/${SERVICE}
-        kubectl rollout status deployment/${SERVICE}
+        kubectl apply -f kubernetes/${K8_DIR}
+        kubectl rollout status deployment/${K8_DIR}
         kubectl get services -o wide
diff --git a/client/src/components/CollaborationPage/index.js b/client/src/components/CollaborationPage/index.js
@@ -139,10 +139,7 @@ function CollaborationPage() {
     if (initialCode) {
     setValue(initialCode);
     }
-
-
-
-
+
     return () => {
       collaborationSocket.off("code_change");
       collaborationSocket.off("code_update");