Update chart to work with app v0.33.

AMecea · Dec 9, 2024 · 66f2df7 · 66f2df7
1 parent 33bdd96
commit 66f2df7
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 16 deletions.
diff --git a/.github/workflows/publish-helm-chart.yml b/.github/workflows/publish-helm-chart.yml
@@ -8,7 +8,7 @@ on:
       - 'charts/**'
 
 permissions:
-  contents: read
+  contents: write
   pages: write
   id-token: write
 

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # TwentyCRM helm chart
 
 
-This repository provides a helm chart to deploy TwentyCRM.
+This repository provides a helm chart to deploy [TwentyCRM](https://twenty.com/).
 
 ## Install
 
@@ -20,7 +20,8 @@ For a complete list of configuration fields please check [values.yaml](./values.
 | Field Name                       | Description                                                                               | Default Value           |
 |----------------------------------|-------------------------------------------------------------------------------------------|-------------------------|
 | `image`                          | Docker image for the application.                                                        | `twentycrm/twenty:latest` |
-| `env`                            | List of environment variables for configuring the application.                           | `[]`                    |
+| `env`                            | [List of environment variables](https://twenty.com/developers/section/self-hosting/self-hosting-var) for configuring the application.| `{}`|
+| `secrets.appSecret`              | Secret used for encryption across the app.                                               |                         |
 | `secrets.accessToken`            | Access token for authentication.                                                         |                         |
 | `secrets.loginToken`             | Login token for authentication.                                                          |                         |
 | `secrets.refreshToken`           | Refresh token for authentication.                                                        |                         |

diff --git a/charts/twentycrm/templates/deployment-db.yaml b/charts/twentycrm/templates/deployment-db.yaml
@@ -42,6 +42,12 @@ spec:
         imagePullPolicy: Always
         env:
         - name: POSTGRES_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Release.Name }}-app-secrets
+              key: PG_PASSWORD
+
+        - name: POSTGRESQL_POSTGRES_PASSWORD
           valueFrom:
             secretKeyRef:
               name: {{ .Release.Name }}-app-secrets
@@ -55,6 +61,7 @@ spec:
 
         - name: BITNAMI_DEBUG
           value: "true"
+
         ports:
         - containerPort: 5432
           name: tcp

diff --git a/charts/twentycrm/templates/deployment-server.yaml b/charts/twentycrm/templates/deployment-server.yaml
@@ -66,12 +66,8 @@ spec:
           value: "https://{{ .Values.ingress.host }}"
         - name: ENABLE_DB_MIGRATIONS
           value: "true"
-        - name: SIGN_IN_PREFILLED
-          value: "true"
-        - name: STORAGE_TYPE
-          value: "local"
         - name: "MESSAGE_QUEUE_TYPE"
-          value: "pg-boss"
+          value: "bull-mq"
 
         ports:
         - containerPort: 3000

diff --git a/charts/twentycrm/templates/secret-tokens.yaml b/charts/twentycrm/templates/secret-tokens.yaml
@@ -15,4 +15,5 @@ data:
   LOGIN_TOKEN_SECRET: {{ default (randAlphaNum 32) .Values.secrets.loginToken | b64enc | quote }}
   REFRESH_TOKEN_SECRET: {{ default (randAlphaNum 32) .Values.secrets.refreshToken | b64enc | quote }}
   FILE_TOKEN_SECRET: {{ default (randAlphaNum 32) .Values.secrets.fileToken | b64enc | quote }}
+  APP_SECRET: {{ default (randAlphaNum 32) .Values.secrets.appSecret | b64enc | quote }}
 
diff --git a/charts/twentycrm/templates/secret.yaml b/charts/twentycrm/templates/secret.yaml
@@ -11,10 +11,12 @@ type: Opaque
 data:
   PG_DATABASE: {{ .Values.db.database | b64enc | quote }}
   PG_USER: {{ .Values.db.user | b64enc | quote }}
+  PG_PASSWORD: {{ .Values.db.password | b64enc | quote }}
   PG_ADMIN_PASSWORD: {{ required ".db.adminPassword is missing" .Values.db.password | b64enc | quote }}
-  PG_DATABASE_URL: {{ printf "postgres://%s:%s@%s-db/twenty" .Values.db.user .Values.db.password .Release.Name | b64enc | quote}}
+  PG_DATABASE_URL: {{ printf "postgres://%s:%s@%s-db:5432/twenty" .Values.db.user .Values.db.password .Release.Name | b64enc | quote}}
 
-  REDIS_HOST: {{ printf "%s-redis" .Release.Name |b64enc | quote}}
+  REDIS_HOST: {{ printf "%s-redis" .Release.Name | b64enc | quote}}
+  REDIS_URL: {{ printf "redis://%s-redis:6379/0" .Release.Name | b64enc | quote}}
 
   {{- range $key, $value := .Values.env }}
   {{ $key }}: {{ printf "%s" $value | b64enc | quote }}

diff --git a/charts/twentycrm/values.yaml b/charts/twentycrm/values.yaml
@@ -3,14 +3,19 @@ image: twentycrm/twenty:latest
 
 # A list of env that can be set:
 # https://twenty.com/developers/section/self-hosting/self-hosting-var
-env: []
+env:
+  STORAGE_TYPE: "local"
+  SIGN_IN_PREFILLED: "false"
+  ACCESS_TOKEN_EXPIRES_IN: 7d
+  LOGIN_TOKEN_EXPIRES_IN: 1h
+  #IS_SIGN_UP_DISABLED: "true"
 
 secrets:
-  accessToken:
-  loginToken:
-  refreshToken:
-  fileToken:
-
+  # appToken:
+  # accessToken:
+  # loginToken:
+  # refreshToken:
+  # fileToken:
 
 
 server: