Merge branch 'master' into change-docker-compose-images

CS3219-AY2324S1 · Oct 26, 2023 · 8902a9d · 8902a9d
2 parents 207a66b + 86ded76
commit 8902a9d
Show file tree

Hide file tree

Showing 9 changed files with 67 additions and 6 deletions.
diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml
@@ -18,9 +18,9 @@ env:
   PRISMA_DATABASE_URL: ${{ secrets.PRISMA_DATABASE_URL_PROD }}
   MONGO_ATLAS_URL: ${{ secrets.MONGO_ATLAS_URL_PROD }}
   NEXT_PUBLIC_FRONTEND_FIREBASE_CONFIG: ${{ secrets.FRONTEND_FIREBASE_CONFIG_PROD }}
-  NEXT_PUBLIC_HTTP_PROXY_GATEWAY_ADDRESS: http://api.codeparty.org:4000/
-  NEXT_PUBLIC_WS_MATCH_PROXY_GATEWAY_ADDRESS: http://api.codeparty.org:4002/
-  NEXT_PUBLIC_WS_COLLABORATION_PROXY_GATEWAY_ADDRESS: http://api.codeparty.org:4003/
+  NEXT_PUBLIC_HTTP_PROXY_GATEWAY_ADDRESS: https://api.codeparty.org/
+  NEXT_PUBLIC_WS_MATCH_PROXY_GATEWAY_ADDRESS: https://wsmatch.codeparty.org
+  NEXT_PUBLIC_WS_COLLABORATION_PROXY_GATEWAY_ADDRESS: https://wscollab.codeparty.org
   TWILIO_ACCOUNT_SID: ${{ secrets.TWILIO_ACCOUNT_SID }}
   TWILIO_API_KEY: ${{ secrets.TWILIO_API_KEY }}
   TWILIO_API_SECRET: ${{ secrets.TWILIO_API_SECRET }}

diff --git a/deployment/gke-prod-manifests/frontend-ingress.yaml b/deployment/gke-prod-manifests/frontend-ingress.yaml
@@ -0,0 +1,13 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: frontend-ingress
+  annotations:
+    networking.gke.io/managed-certificates: gke-managed-cert
+    kubernetes.io/ingress.class: "gce"
+spec:
+  defaultBackend:
+    service:
+      name: frontend
+      port:
+        number: 3000
diff --git a/deployment/gke-prod-manifests/frontend-service.yaml b/deployment/gke-prod-manifests/frontend-service.yaml
@@ -12,6 +12,5 @@ spec:
       targetPort: 3000
   selector:
     io.kompose.service: frontend
-  type: LoadBalancer
 status:
   loadBalancer: {}
diff --git a/deployment/gke-prod-manifests/gateway-deployment.yaml b/deployment/gke-prod-manifests/gateway-deployment.yaml
@@ -31,7 +31,7 @@ spec:
             - name: WS_COLLABORATION_PROXY_PORT
               value: "4003"
             - name: FRONTEND_ADDRESS
-              value: "http://www.codeparty.org:3000"
+              value: "https://www.codeparty.org"
           image: asia-southeast1-docker.pkg.dev/peerprep-group11-prod/codeparty-prod-images/gateway:latest
           name: gateway
           ports:

diff --git a/deployment/gke-prod-manifests/gateway-http-ingress.yaml b/deployment/gke-prod-manifests/gateway-http-ingress.yaml
@@ -0,0 +1,13 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: gateway-http-ingress
+  annotations:
+    networking.gke.io/managed-certificates: gke-managed-cert
+    kubernetes.io/ingress.class: "gce"
+spec:
+  defaultBackend:
+    service:
+      name: gateway
+      port:
+        number: 4000
diff --git a/deployment/gke-prod-manifests/gateway-service.yaml b/deployment/gke-prod-manifests/gateway-service.yaml
@@ -18,6 +18,5 @@ spec:
       targetPort: 4003
   selector:
     io.kompose.service: gateway
-  type: LoadBalancer
 status:
   loadBalancer: {}
diff --git a/deployment/gke-prod-manifests/gateway-wscollaboration-ingress.yaml b/deployment/gke-prod-manifests/gateway-wscollaboration-ingress.yaml
@@ -0,0 +1,13 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: gateway-wscollaboration-ingress
+  annotations:
+    networking.gke.io/managed-certificates: gke-managed-cert
+    kubernetes.io/ingress.class: "gce"
+spec:
+  defaultBackend:
+    service:
+      name: gateway
+      port:
+        number: 4003
diff --git a/deployment/gke-prod-manifests/gateway-wsmatch-ingress.yaml b/deployment/gke-prod-manifests/gateway-wsmatch-ingress.yaml
@@ -0,0 +1,13 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: gateway-wsmatch-ingress
+  annotations:
+    networking.gke.io/managed-certificates: gke-managed-cert
+    kubernetes.io/ingress.class: "gce"
+spec:
+  defaultBackend:
+    service:
+      name: gateway
+      port:
+        number: 4002
diff --git a/deployment/gke-prod-manifests/gke-managed-cert.yaml b/deployment/gke-prod-manifests/gke-managed-cert.yaml
@@ -0,0 +1,11 @@
+apiVersion: networking.gke.io/v1
+kind: ManagedCertificate
+metadata:
+  name: gke-managed-cert
+spec:
+  domains:
+    - codeparty.org
+    - www.codeparty.org
+    - api.codeparty.org
+    - wsmatch.codeparty.org
+    - wscollab.codeparty.org