Revert back to HTTP with LoadBalancer services (#199)

CS3219-AY2324S1 · Oct 27, 2023 · fe4dc1d · fe4dc1d
1 parent 7f7b2d8
commit fe4dc1d
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 70 deletions.
diff --git a/deployment/gke-prod-manifests/frontend-ingress.yaml b/deployment/gke-prod-manifests/frontend-ingress.yaml
diff --git a/deployment/gke-prod-manifests/frontend-service.yaml b/deployment/gke-prod-manifests/frontend-service.yaml
@@ -12,5 +12,6 @@ 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: "https://www.codeparty.org"
+              value: "http://www.codeparty.org"
           image: asia-southeast1-docker.pkg.dev/peerprep-group11-prod/codeparty-prod-images/gateway:latest
           name: gateway
           ports:
@@ -44,10 +44,6 @@ spec:
             - containerPort: 4003
               hostPort: 4003
               protocol: TCP
-            # Needed for health check
-            - containerPort: 8080
-              hostPort: 8080
-              protocol: TCP
           resources: 
             # You must specify requests for CPU to autoscale
             # based on CPU utilization

diff --git a/deployment/gke-prod-manifests/gateway-http-ingress.yaml b/deployment/gke-prod-manifests/gateway-http-ingress.yaml
diff --git a/deployment/gke-prod-manifests/gateway-service.yaml b/deployment/gke-prod-manifests/gateway-service.yaml
@@ -24,5 +24,6 @@ spec:
       targetPort: 8080
   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
diff --git a/deployment/gke-prod-manifests/gateway-wsmatch-ingress.yaml b/deployment/gke-prod-manifests/gateway-wsmatch-ingress.yaml
diff --git a/deployment/gke-prod-manifests/gke-managed-cert.yaml b/deployment/gke-prod-manifests/gke-managed-cert.yaml
diff --git a/deployment/prod-dockerfiles/Dockerfile.frontend-prod b/deployment/prod-dockerfiles/Dockerfile.frontend-prod
@@ -23,9 +23,9 @@ RUN yarn prisma generate
 ARG NEXT_PUBLIC_FRONTEND_FIREBASE_CONFIG_ARG
 ENV NEXT_PUBLIC_FRONTEND_FIREBASE_CONFIG=$NEXT_PUBLIC_FRONTEND_FIREBASE_CONFIG_ARG
 
-ENV NEXT_PUBLIC_HTTP_PROXY_GATEWAY_ADDRESS="https://api.codeparty.org/"
-ENV NEXT_PUBLIC_WS_MATCH_PROXY_GATEWAY_ADDRESS="https://wsmatch.codeparty.org"
-ENV NEXT_PUBLIC_WS_COLLABORATION_PROXY_GATEWAY_ADDRESS="https://wscollab.codeparty.org"
+ENV NEXT_PUBLIC_HTTP_PROXY_GATEWAY_ADDRESS="http://api.codeparty.org:4000/"
+ENV NEXT_PUBLIC_WS_MATCH_PROXY_GATEWAY_ADDRESS="http://api.codeparty.org:4002"
+ENV NEXT_PUBLIC_WS_COLLABORATION_PROXY_GATEWAY_ADDRESS="http://api.codeparty.org:4003"
 
 RUN yarn build