Updating terraform and k8s files adding redis...

packages/twenty-docker/k8s/manifests/deployment-db.yaml

@@ -22,33 +22,33 @@ spec:
         app: twentycrm-db
     spec:
       volumes:
-      - name: twentycrm-db-data
-        persistentVolumeClaim:
-          claimName: twentycrm-db-pvc
+        - name: twentycrm-db-data
+          persistentVolumeClaim:
+            claimName: twentycrm-db-pvc
       containers:
-      - env:
-        - name: POSTGRES_PASSWORD
-          value: "twenty"
-        - name: BITNAMI_DEBUG
-          value: "true"
-      - image: twentycrm/twenty-postgres:latest
-        imagePullPolicy: Always
-        name: twentycrm
-        ports:
-        - containerPort: 5432
-          name: tcp
-          protocol: TCP
-        resources:
-          requests:
-            memory: "256Mi"
-            cpu: "250m"
-          limits:
-            memory: "1024Mi"
-            cpu: "1000m"
-        stdin: true
-        tty: true
-        volumeMounts:
-        - mountPath: /bitnami/postgresql
-          name: twentycrm-db-data
+        - name: twentycrm
+          image: twentycrm/twenty-postgres:latest
+          imagePullPolicy: Always
+          env:
+            - name: POSTGRES_PASSWORD
+              value: "twenty"
+            - name: BITNAMI_DEBUG
+              value: "true"
+          ports:
+            - containerPort: 5432
+              name: tcp
+              protocol: TCP
+          resources:
+            requests:
+              memory: "256Mi"
+              cpu: "250m"
+            limits:
+              memory: "1024Mi"
+              cpu: "1000m"
+          stdin: true
+          tty: true
+          volumeMounts:
+            - mountPath: /bitnami/postgresql
+              name: twentycrm-db-data
       dnsPolicy: ClusterFirst
       restartPolicy: Always

packages/twenty-docker/k8s/manifests/deployment-redis.yaml

@@ -0,0 +1,44 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: twentycrm-redis
+  name: twentycrm-redis
+  namespace: twentycrm
+spec:
+  progressDeadlineSeconds: 600
+  replicas: 1
+  strategy:
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 1
+    type: RollingUpdate
+  selector:
+    matchLabels:
+      app: twentycrm-redis
+  template:
+    metadata:
+      labels:
+        app: twentycrm-redis
+    spec:
+      containers:
+        - name: redis
+          image: redis/redis-stack-server:latest
+          imagePullPolicy: Always
+          env:
+            - name: PORT
+              value: 6379
+          ports:
+            - containerPort: 6379
+              name: redis
+              protocol: TCP
+          resources:
+            requests:
+              memory: "1024Mi"
+              cpu: "250m"
+            limits:
+              memory: "2048Mi"
+              cpu: "500m"
+
+      dnsPolicy: ClusterFirst
+      restartPolicy: Always

packages/twenty-docker/k8s/manifests/deployment-server.yaml

@@ -22,67 +22,78 @@ spec:
         app: twentycrm-server
     spec:
       volumes:
-      - name: twentycrm-server-data
-        persistentVolumeClaim:
-          claimName: twentycrm-server-pvc
+        - name: twentycrm-server-data
+          persistentVolumeClaim:
+            claimName: twentycrm-server-pvc
+        - name: twentycrm-docker-data
+          persistentVolumeClaim:
+            claimName: twentycrm-docker-data-pvc
       containers:
-      - env:
-        - name: PORT
-          value: 3000
-        - name: SERVER_URL
-          value: "https://crm.example.com:443"
-        - name: FRONT_BASE_URL
-          value: "https://crm.example.com:443"
-        - name: PG_DATABASE_URL
-          value: "postgres:https://twenty:[email protected]/default"
-        - name: ENABLE_DB_MIGRATIONS
-          value: "true"
-        - name: SIGN_IN_PREFILLED
-          value: "true"
-        - name: STORAGE_TYPE
-          value: "local"
-        - name: "MESSAGE_QUEUE_TYPE"
-          value: "pg-boss"
-        - name: ACCESS_TOKEN_SECRET
-          valueFrom:
-            secretKeyRef:
-              name: tokens
-              key: accessToken
-        - name: LOGIN_TOKEN_SECRET
-          valueFrom:
-            secretKeyRef:
-              name: tokens
-              key: loginToken
-        - name: REFRESH_TOKEN_SECRET
-          valueFrom:
-            secretKeyRef:
-              name: tokens
-              key: refreshToken
-        - name: FILE_TOKEN_SECRET
-          valueFrom:
-            secretKeyRef:
-              name: tokens
-              key: fileToken
-      - image: twentycrm/twenty:latest
-        imagePullPolicy: Always
-        name: twentycrm
-        ports:
-        - containerPort: 3000
-          name: http-tcp
-          protocol: TCP
-        resources:
-          requests:
-            memory: "256Mi"
-            cpu: "250m"
-          limits:
-            memory: "1024Mi"
-            cpu: "1000m"
-        stdin: true
-        tty: true
-        volumeMounts:
-        - mountPath: /app/docker-data
-          name: twentycrm-server-data
-        - mountPath: /app/.local-storage
-          name: twentycrm-server-data
+        - name: twentycrm
+          image: twentycrm/twenty:latest
+          imagePullPolicy: Always
+          env:
+            - name: PORT
+              value: 3000
+            - name: SERVER_URL
+              value: "https://crm.example.com:443"
+            - name: FRONT_BASE_URL
+              value: "https://crm.example.com:443"
+            - name: "PG_DATABASE_URL"
+              value: "postgres:https://twenty:[email protected]/default"
+            - name: "REDIS_HOST"
+              value: "twentycrm-redis.twentycrm.svc.cluster.local"
+            - name: "REDIS_PORT"
+              value: 6379
+            - name: ENABLE_DB_MIGRATIONS
+              value: "true"
+            - name: SIGN_IN_PREFILLED
+              value: "true"
+            - name: STORAGE_TYPE
+              value: "local"
+            - name: "MESSAGE_QUEUE_TYPE"
+              value: "bull-mq"
+            - name: "ACCESS_TOKEN_EXPIRES_IN"
+              value: "7d"
+            - name: "LOGIN_TOKEN_EXPIRES_IN"
+              value: "1h"
+            - name: ACCESS_TOKEN_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: tokens
+                  key: accessToken
+            - name: LOGIN_TOKEN_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: tokens
+                  key: loginToken
+            - name: REFRESH_TOKEN_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: tokens
+                  key: refreshToken
+            - name: FILE_TOKEN_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: tokens
+                  key: fileToken
+          ports:
+            - containerPort: 3000
+              name: http-tcp
+              protocol: TCP
+          resources:
+            requests:
+              memory: "256Mi"
+              cpu: "250m"
+            limits:
+              memory: "1024Mi"
+              cpu: "1000m"
+          stdin: true
+          tty: true
+          volumeMounts:
+            - mountPath: /app/docker-data
+              name: twentycrm-docker-data
+            - mountPath: /app/packages/twenty-server/.local-storage
+              name: twentycrm-server-data
       dnsPolicy: ClusterFirst
       restartPolicy: Always

packages/twenty-docker/k8s/manifests/deployment-worker.yaml

@@ -21,58 +21,60 @@ spec:
       labels:
         app: twentycrm-worker
     spec:
-      volumes:
-      - name: twentycrm-worker-data
-        persistentVolumeClaim:
-          claimName: twentycrm-worker-pvc
       containers:
-      - env:
-        - name: SERVER_URL
-          value: "https://crm.example.com:443"
-        - name: FRONT_BASE_URL
-          value: "https://crm.example.com:443"
-        - name: PG_DATABASE_URL
-          value: "postgres:https://twenty:[email protected]/default"
-        - name: ENABLE_DB_MIGRATIONS
-          value: "false" # it already runs on the server
-        - name: STORAGE_TYPE
-          value: "local"
-        - name: "MESSAGE_QUEUE_TYPE"
-          value: "pg-boss"
-        - name: ACCESS_TOKEN_SECRET
-          valueFrom:
-            secretKeyRef:
-              name: tokens
-              key: accessToken
-        - name: LOGIN_TOKEN_SECRET
-          valueFrom:
-            secretKeyRef:
-              name: tokens
-              key: loginToken
-        - name: REFRESH_TOKEN_SECRET
-          valueFrom:
-            secretKeyRef:
-              name: tokens
-              key: refreshToken
-        - name: FILE_TOKEN_SECRET
-          valueFrom:
-            secretKeyRef:
-              name: tokens
-              key: fileToken
-      - image: twentycrm/twenty:latest
-        imagePullPolicy: Always
-        name: twentycrm
-        command:
-        - yarn
-        - worker:prod
-        resources:
-          requests:
-            memory: "256Mi"
-            cpu: "250m"
-          limits:
-            memory: "1024Mi"
-            cpu: "1000m"
-        stdin: true
-        tty: true
+        - name: twentycrm
+          image: twentycrm/twenty:latest
+          imagePullPolicy: Always
+          env:
+            - name: SERVER_URL
+              value: "https://crm.example.com:443"
+            - name: FRONT_BASE_URL
+              value: "https://crm.example.com:443"
+            - name: PG_DATABASE_URL
+              value: "postgres:https://twenty:[email protected]/default"
+            - name: ENABLE_DB_MIGRATIONS
+              value: "false" # it already runs on the server
+            - name: STORAGE_TYPE
+              value: "local"
+            - name: "MESSAGE_QUEUE_TYPE"
+              value: "bull-mq"
+            - name: "CACHE_STORAGE_TYPE"
+              value: "redis"
+            - name: "REDIS_HOST"
+              value: "twentycrm-redis.twentycrm.svc.cluster.local"
+            - name: "REDIS_PORT"
+              value: 6379
+            - name: ACCESS_TOKEN_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: tokens
+                  key: accessToken
+            - name: LOGIN_TOKEN_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: tokens
+                  key: loginToken
+            - name: REFRESH_TOKEN_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: tokens
+                  key: refreshToken
+            - name: FILE_TOKEN_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: tokens
+                  key: fileToken
+          command:
+            - yarn
+            - worker:prod
+          resources:
+            requests:
+              memory: "1024Mi"
+              cpu: "250m"
+            limits:
+              memory: "2048Mi"
+              cpu: "1000m"
+          stdin: true
+          tty: true
       dnsPolicy: ClusterFirst
       restartPolicy: Always

packages/twenty-docker/k8s/manifests/ingress.yaml

@@ -4,21 +4,21 @@ metadata:
   name: twentycrm
   namespace: twentycrm
   annotations:
-   nginx.ingress.kubernetes.io/configuration-snippet: |
+    nginx.ingress.kubernetes.io/configuration-snippet: |
       more_set_headers "X-Forwarded-For $http_x_forwarded_for";
-   nginx.ingress.kubernetes.io/force-ssl-redirect: "false"
-   kubernetes.io/ingress.class: "nginx"
-   nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "false"
+    kubernetes.io/ingress.class: "nginx"
+    nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
 spec:
   ingressClassName: nginx
   rules:
-  - host: crm.example.com
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: twentycrm-server
-            port:
-              name: http-tcp
+    - host: crm.example.com
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: twentycrm-server
+                port:
+                  name: http-tcp