Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[chore] Java dbconnector enabled by default #184

Merged
merged 2 commits into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/retool/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: retool
description: A Helm chart for Kubernetes
type: application
version: 6.2.8
version: 6.2.9
maintainers:
- name: Retool Engineering
email: engineering+helm@retool.com
Expand Down
18 changes: 8 additions & 10 deletions charts/retool/templates/deployment_backend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
9 changes: 4 additions & 5 deletions charts/retool/templates/deployment_workflows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions charts/retool/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 2 additions & 3 deletions values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading