diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml index 65062518..4195dd4b 100644 --- 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 new file mode 100644 index 00000000..c99b9e91 --- /dev/null +++ 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 index 9f0ca682..a72a5a12 100644 --- 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 index db1cf683..37d8493b 100644 --- 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 new file mode 100644 index 00000000..cb6434ae --- /dev/null +++ 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 index 519efc3f..64815258 100644 --- 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 new file mode 100644 index 00000000..b3900773 --- /dev/null +++ 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 new file mode 100644 index 00000000..5aea8575 --- /dev/null +++ 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 new file mode 100644 index 00000000..4390e533 --- /dev/null +++ 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