From 4b5be43a80857530c65aedeaf4e7680edc076bbe Mon Sep 17 00:00:00 2001
From: Jason Gao <jasonjlgao@gmail.com>
Date: Fri, 30 Aug 2024 16:39:34 -0700
Subject: [PATCH] [chore] Java dbconnector enabled by default

---
 .../retool/templates/deployment_backend.yaml   | 18 ++++++++----------
 .../retool/templates/deployment_workflows.yaml |  9 ++++-----
 charts/retool/values.yaml                      |  5 ++---
 values.yaml                                    |  5 ++---
 4 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/charts/retool/templates/deployment_backend.yaml b/charts/retool/templates/deployment_backend.yaml
index 1f5e475..86a1b51 100644
--- a/charts/retool/templates/deployment_backend.yaml
+++ b/charts/retool/templates/deployment_backend.yaml
@@ -75,21 +75,19 @@ spec:
           - name: NODE_ENV
             value: production
           {{- if include "retool.jobRunner.enabled" . }}
-          {{ if $.Values.dbconnector.java.enabled }}
-          - name: SERVICE_TYPE
-            value: MAIN_BACKEND,DB_CONNECTOR,DB_SSH_CONNECTOR,JAVA_DBCONNECTOR
-          {{ else }}
+          {{ if ( not $.Values.dbconnector.java.enabled ) }}
+          - name: DISABLE_JAVA_DBCONNECTOR
+            value: "true"
+          {{ end }}
           - name: SERVICE_TYPE
             value: MAIN_BACKEND,DB_CONNECTOR,DB_SSH_CONNECTOR
-          {{ end }}
           {{- else }}
-          {{ if $.Values.dbconnector.java.enabled }}
-          - name: SERVICE_TYPE
-            value: MAIN_BACKEND,DB_CONNECTOR,DB_SSH_CONNECTOR,JAVA_DBCONNECTOR,JOBS_RUNNER
-          {{ else }}
+          {{ if ( not $.Values.dbconnector.java.enabled ) }}
+          - name: DISABLE_JAVA_DBCONNECTOR
+            value: "true"
+          {{ end }}
           - name: SERVICE_TYPE
             value: MAIN_BACKEND,DB_CONNECTOR,DB_SSH_CONNECTOR,JOBS_RUNNER
-          {{ end }}
           {{- end }}
           - name: CLIENT_ID
             value: {{ default "" .Values.config.auth.google.clientId }}
diff --git a/charts/retool/templates/deployment_workflows.yaml b/charts/retool/templates/deployment_workflows.yaml
index 7695ed4..7002b9b 100644
--- a/charts/retool/templates/deployment_workflows.yaml
+++ b/charts/retool/templates/deployment_workflows.yaml
@@ -66,13 +66,12 @@ spec:
             value: {{ template "retool.deploymentTemplateVersion" . }}
           - name: NODE_ENV
             value: production
-          {{ if $.Values.dbconnector.java.enabled }}
-          - name: SERVICE_TYPE
-            value: WORKFLOW_BACKEND,DB_CONNECTOR,DB_SSH_CONNECTOR,JAVA_DBCONNECTOR
-          {{ else }}
+          {{ if ( not $.Values.dbconnector.java.enabled ) }}
+          - name: DISABLE_JAVA_DBCONNECTOR
+            value: "true"
+          {{ end }}
           - name: SERVICE_TYPE
             value: WORKFLOW_BACKEND,DB_CONNECTOR,DB_SSH_CONNECTOR
-          {{ end }}
           - name: DBCONNECTOR_POSTGRES_POOL_MAX_SIZE
             value: "100"
           - name: DBCONNECTOR_QUERY_TIMEOUT_MS
diff --git a/charts/retool/values.yaml b/charts/retool/values.yaml
index 80c8b03..cad00bc 100644
--- a/charts/retool/values.yaml
+++ b/charts/retool/values.yaml
@@ -405,9 +405,8 @@ workflows:
 
 dbconnector:
   java:
-    # Enable this to use Retool's experimental next-gen dbconnector to connect to resources.
-    # This feature is not ready for production use; please check with the Retool team before enablement.
-    enabled: false
+    # Disable this to disable Retool's Java dbconnector.
+    enabled: true
 
 multiplayer:
   # Enable this to use Retool's experimental multiplayer editing feature.
diff --git a/values.yaml b/values.yaml
index 80c8b03..cad00bc 100644
--- a/values.yaml
+++ b/values.yaml
@@ -405,9 +405,8 @@ workflows:
 
 dbconnector:
   java:
-    # Enable this to use Retool's experimental next-gen dbconnector to connect to resources.
-    # This feature is not ready for production use; please check with the Retool team before enablement.
-    enabled: false
+    # Disable this to disable Retool's Java dbconnector.
+    enabled: true
 
 multiplayer:
   # Enable this to use Retool's experimental multiplayer editing feature.