removed the values used for testing

ToolJet · Nov 8, 2023 · e368137 · e368137
1 parent c4e57af
commit e368137
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 34 deletions.
diff --git a/charts/tooljet/templates/deployment-pgrst.yml b/charts/tooljet/templates/deployment-pgrst.yml
@@ -25,8 +25,13 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
+            {{ if .Values.tooljetdb_external_postgresql.enabled}}
+            - name: PGRST_DB_URI
+              value: {{ .Values.tooljetdb_external_postgresql.db_uri }}
+            {{ else }}
             - name: PGRST_DB_URI
               value: {{ .Values.env.db_uri }}
+            {{- end }}
 
             - name: PGRST_HOST
               value: "tooljet-postgrest-service.default.svc.cluster.local"

diff --git a/charts/tooljet/templates/deployment.yaml b/charts/tooljet/templates/deployment.yaml
@@ -33,61 +33,66 @@ spec:
             initialDelaySeconds: 10
             periodSeconds: 5
             failureThreshold: 6
-
           env:
             - name: TOOLJET_HOST
               value: "{{ .Values.apps.tooljet.service.host }}"
-
+            {{ if .Values.external_postgresql.enabled }}
+            - name: PG_HOST
+              value: "{{ .Values.external_postgresql.PG_HOST }}"
+            - name: PG_USER
+              value: "{{ .Values.external_postgresql.PG_USER }}"
+            - name: PG_PASS
+              value: "{{ .Values.external_postgresql.PG_PASS }}"
+            - name: PG_PORT
+              value: {{ .Values.external_postgresql.PG_PORT }}
+            {{ else }}
             - name: PG_HOST
               value: "{{ .Release.Name }}-postgresql"
-
             {{- if .Values.postgresql.existingSecret }}
             - name: POSTGRES_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: {{ .Values.postgresql.existingSecret }}
                   key: {{ default "password" .Values.postgresql.existingSecretKey }}
             {{- end }}
+            {{- end }}
 
             - name: ENABLE_TOOLJET_DB
               value: {{ .Values.env.ENABLE_TOOLJET_DB }}
 
-            - name:  TOOLJET_DB
+            - name: TOOLJET_DB
               value: {{ .Values.env.TOOLJET_DB }}
 
+            {{ if .Values.tooljetdb_external_postgresql.enabled }}
             - name: TOOLJET_DB_HOST
-              value: {{ print .Release.Name  "-postgresql" }}
-
-            {{- if .Values.postgresql.existingSecret }}
-            - name:   TOOLJET_DB_PASS
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.postgresql.existingSecret }}
-                  key: {{ default "password" .Values.postgresql.existingSecretKey }}
-            {{- end }}
-
+              value: "{{ .Values.tooljetdb_external_postgresql.TOOLJET_DB_HOST }}"
+            - name: TOOLJET_DB_PASS
+              value: "{{ .Values.tooljetdb_external_postgresql.TOOLJET_DB_PASS }}"
             - name: TOOLJET_DB_USER
-              value: {{ .Values.postgresql.auth.username }}
+              value: "{{ .Values.tooljetdb_external_postgresql.TOOLJET_DB_USER }}"
+            {{ else }}
+            - name: TOOLJET_DB_HOST
+              value: "{{ .Values.env.TOOLJET_DB_HOST }}"
+            - name: TOOLJET_DB_USER
+              value: "{{ .Values.env.TOOLJET_DB_USER }}"
+            - name: TOOLJET_DB_PASS
+              value: "{{ .Values.env.TOOLJET_DB_PASS }}"
+            {{- end }}
 
             - name: PGRST_HOST
               value: "tooljet-postgrest-service"
 
             - name: PGRST_JWT_SECRET
               value: {{ .Values.env.jwt_secret }}
 
-            - name: PGRST_DB_URI
-              value: {{ .Values.env.db_uri }}
-
-            {{- if .Values.enterprise.enabled }}
-            - name: LICENSE_KEY
-              value: {{ .Values.enterprise.LICENSE_KEY }}
-
             - name: REDIS_HOST
               value: {{ .Values.enterprise.REDIS_HOST }}
-
             - name: REDIS_PORT
               value: {{ .Values.enterprise.REDIS_PORT }}
-            {{- end }}
+            - name: REDIS_USER
+              value: {{ .Values.enterprise.REDIS_USER }}
+            - name: REDIS_PASSWORD
+              value: {{ .Values.enterprise.REDIS_PASSWORD }}
           envFrom:
             - secretRef:
-                name: {{ .Values.apps.tooljet.secret.name }}
+                name: {{ .Values.apps.tooljet.secret.name }}
diff --git a/charts/tooljet/templates/secret.yaml b/charts/tooljet/templates/secret.yaml
@@ -9,9 +9,9 @@ data:
   PG_PASS: {{ .Values.postgresql.auth.postgresPassword | b64enc | quote }}
   PG_USER: {{ .Values.postgresql.auth.username | b64enc | quote }}
   {{- else }}
-  PG_HOST: {{ .Values.postgresql.postgresqlHost | b64enc | quote }}
-  PG_PORT: {{ .Values.postgresql.postgresqlPort | b64enc | quote }}
-  PG_USER: {{ .Values.postgresql.auth.username | b64enc | quote }}
+  PG_HOST: {{ .Values.external_postgresql.PG_HOST | b64enc | quote }}
+  PG_PORT: {{ .Values.external_postgresql.PG_PORT | b64enc | quote }}
+  PG_USER: {{ .Values.external_postgresql.PG_USER | b64enc | quote }}
   {{- end}}
   PG_DB: {{  .Values.postgresql.auth.database | b64enc | quote }}
   LOCKBOX_MASTER_KEY: {{ .Values.apps.tooljet.secret.data.lockbox_key | b64enc | quote }}

diff --git a/charts/tooljet/values.yaml b/charts/tooljet/values.yaml
@@ -54,12 +54,13 @@ postgresql:
       enabled: true
       size: 8Gi
       storageClass: ""
-  # The following variables are to be used when internal PG is disabled
-  # postgresqlHost: postgres
-  # postgresqlPort: 5432
-  # When defined the `postgresqlPassword` field is ignored
-  # existingSecret: secret-name
-  # existingSecretKey: password
+
+external_postgresql: #Please enter your external database vaules, Please set above posgtresql as false.
+  enabled: true
+  PG_HOST: #Database hostname
+  PG_USER: #Database username
+  PG_PASS: #Database password
+  PG_PORT: '"5432"'
 
 # Environment variables
 # Configure additional env variables down below
@@ -75,6 +76,13 @@ env:
   TOOLJET_DB: "tooljet_db"
   PGRST_HOST: "tooljet-postgrest.default.svc.cluster.local"
 
+tooljetdb_external_postgresql:
+  enabled: true
+  TOOLJET_DB_USER:  #Database username
+  TOOLJET_DB_HOST: #Database hostname
+  TOOLJET_DB_PASS: #Database password
+  db_uri: #postgres://<postgres_username>:<postgres_password><@postgres_hostname>/<database_name>
+
 enterprise:
   enabled: false
   LICENSE_KEY: ""