chore: wider cors + helm updates (fix ports + load balancer)

xolvio · Dec 18, 2024 · 59f62ea · 59f62ea
1 parent 38931d9
commit 59f62ea
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 17 deletions.
diff --git a/backend/package.json b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backend",
-  "version": "1.0.0-beta.4.1",
+  "version": "1.0.0-beta.4.3",
   "main": "dist/server.js",
   "scripts": {
     "build": "rm -rf dist/ && npx tsc && npm run copy-graphql",

diff --git a/backend/src/server.ts b/backend/src/server.ts
@@ -120,15 +120,7 @@ const initializeApp = async () => {
   app.use(express.urlencoded({limit: '50mb', extended: true}));
   app.use(
     cors({
-      origin: (origin, callback) => {
-        const allowedOrigins = [getWebsiteDomain()];
-        const regex =
-          /^(https:\/\/[a-zA-Z0-9-]+\.narrative\.tech|https?:\/\/localhost(:\d+)?|https:\/\/[a-zA-Z0-9-]+\.xspecs\.io)$/;
-
-        if (!origin || allowedOrigins.includes(origin) || regex.test(origin))
-          callback(null, true);
-        else callback(new Error('Not allowed by CORS'));
-      },
+      origin: '*',
       allowedHeaders: [
         'content-type',
         ...supertokens.getAllCORSHeaders(),

diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "1.0.0-beta.4.1",
+  "version": "1.0.0-beta.4.3",
   "private": true,
   "dependencies": {
     "@apollo/explorer": "^3.7.0",

diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 name: instantmock
 description: A Helm chart for deploying InstantMock
 version: 0.2.0
-appVersion: "1.0.0-beta.4.1"
+appVersion: '1.0.0-beta.4.3'
diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml
@@ -16,7 +16,10 @@ spec:
         - name: backend
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           ports:
-            - containerPort: 3007
+            - containerPort: 3033
+          env:
+            - name: NODE_ENV
+              value: "production"
           volumeMounts:
             - mountPath: /app/backend/data
               name: sqlite-storage

diff --git a/helm/templates/ingress.yaml b/helm/templates/ingress.yaml
@@ -0,0 +1,18 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ .Release.Name }}-ingress
+  annotations:
+    nginx.ingress.kubernetes.io/rewrite-target: /
+spec:
+  rules:
+    - host: example.com 
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: {{ .Release.Name }}-backend
+                port:
+                  number: {{ .Values.service.port }} 
diff --git a/helm/templates/pv.yaml b/helm/templates/pv.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: instant-mock-pv
+spec:
+  capacity:
+    storage: 1Gi
+  accessModes:
+    - ReadWriteOnce
+  hostPath:
+    path: /mnt/data
diff --git a/helm/templates/service.yaml b/helm/templates/service.yaml
@@ -6,6 +6,6 @@ spec:
   type: {{ .Values.service.type }}
   ports:
     - port: {{ .Values.service.port }}
-      targetPort: 3007
+      targetPort: 3033
   selector:
     app: {{ .Release.Name }}-backend
diff --git a/helm/values.yaml b/helm/values.yaml
@@ -1,10 +1,10 @@
 replicaCount: 1
 image:
   repository: xolvio/instant-mock
-  tag: 1.0.0-beta.4.1
+  tag: 1.0.0-beta.4.3
   pullPolicy: Always
 service:
-  type: ClusterIP
+  type: LoadBalancer
   port: 80
 resources: {}
 persistence:

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "instant-mock",
-  "version": "1.0.0-beta.4.1",
+  "version": "1.0.0-beta.4.3",
   "description": "![instant-mock-screen-cap-final](https://github.com/user-attachments/assets/de0f50d4-5a71-4e5a-b479-37c6cfa0481d)",
   "main": "index.js",
   "module": "true",