Skip to content

[fix] Java dbconnector support when standalone dbconnector is enabled #231

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.

Sign up for GitHub

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

Merged
jjlgao merged 2 commits into from
Apr 9, 2025
Merged

[fix] Java dbconnector support when standalone dbconnector is enabled #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3601af
[fix] Java dbconnector support when standalone dbconnector is enabled
jjlgao Apr 9, 2025
672df83
fix formatting
jjlgao Apr 9, 2025
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
View file
Open in desktop
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.4.6
version: 6.4.7
maintainers:
- name: Retool Engineering
email: [email protected]
Expand Down
10 changes: 8 additions & 2 deletions charts/retool/templates/deployment_backend.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ spec:
{{- if and ( not ( include "retool_version_with_java_dbconnector_opt_out" . ) ) ( $.Values.dbconnector.java.enabled ) }}
{{- $serviceType = append $serviceType "JAVA_DBCONNECTOR" }}
{{- end }}
{{- /*
{{- /*
The dbconnector.enabled setting is to enable a standalone dbconnector deployment.
If it is not enabled (default), the main backend acts as its own dbconnector.
*/ -}}
Expand Down Expand Up @@ -123,7 +123,13 @@ spec:
- name: DB_CONNECTOR_HOST
value: http://{{ template "retool.fullname" . }}-dbconnector
- name: DB_CONNECTOR_PORT
value: {{ .Values.dbconnector.port | quote }}
value: {{ $.Values.dbconnector.port | quote }}
{{- if $.Values.dbconnector.java.enabled }}
- name: JAVA_DBCONNECTOR_HOST
value: http://{{ template "retool.fullname" . }}-dbconnector
- name: JAVA_DBCONNECTOR_PORT
value: {{ $.Values.dbconnector.java.port | quote }}
{{- end }}
{{- end }}
{{- if .Values.config.dbConnectorTimeout }}
- name: DBCONNECTOR_QUERY_TIMEOUT_MS
Expand Down
8 changes: 7 additions & 1 deletion charts/retool/templates/deployment_dbconnector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
{{- include "retool.labels" . | nindent 8 }}
spec:
{{- if .Values.dbconnector.terminationGracePeriodSeconds }}
terminationGracePeriodSeconds: {{ .Values.dbconnector.terminationGracePeriodSeconds }}
terminationGracePeriodSeconds: {{ .Values.dbconnector.terminationGracePeriodSeconds }}
{{- end }}
containers:
- args:
Expand Down Expand Up @@ -267,4 +267,10 @@ spec:
name: http-server
port: {{ .Values.dbconnector.port }}
targetPort: {{ .Values.dbconnector.port }}
{{ if .Values.dbconnector.java.enabled }}
- protocol: TCP
name: java-dbconnector-server
port: {{ .Values.dbconnector.java.port }}
targetPort: {{ .Values.dbconnector.java.port }}
{{ end }}
{{- end }}
10 changes: 8 additions & 2 deletions charts/retool/templates/deployment_workflows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ spec:
{{- if and ( not ( include "retool_version_with_java_dbconnector_opt_out" . ) ) ( $.Values.dbconnector.java.enabled ) }}
{{- $serviceType = append $serviceType "JAVA_DBCONNECTOR" }}
{{- end }}
{{- /*
{{- /*
The dbconnector.enabled setting is to enable a standalone dbconnector deployment.
If it is not enabled (default), the main backend acts as its own dbconnector.
*/ -}}
Expand All @@ -87,7 +87,13 @@ spec:
- name: DB_CONNECTOR_HOST
value: http://{{ template "retool.fullname" . }}-dbconnector
- name: DB_CONNECTOR_PORT
value: {{ .Values.dbconnector.port | quote }}
value: {{ $.Values.dbconnector.port | quote }}
{{- if $.Values.dbconnector.java.enabled }}
- name: JAVA_DBCONNECTOR_HOST
value: http://{{ template "retool.fullname" . }}-dbconnector
- name: JAVA_DBCONNECTOR_PORT
value: {{ $.Values.dbconnector.java.port | quote }}
{{- end }}
{{- end }}
{{ if and ( include "retool_version_with_java_dbconnector_opt_out" . ) ( not $.Values.dbconnector.java.enabled ) }}
- name: DISABLE_JAVA_DBCONNECTOR
Expand Down
8 changes: 7 additions & 1 deletion charts/retool/templates/deployment_workflows_worker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,13 @@ spec:
- name: DB_CONNECTOR_HOST
value: http://{{ template "retool.fullname" . }}-dbconnector
- name: DB_CONNECTOR_PORT
value: {{ .Values.dbconnector.port | quote }}
value: {{ $.Values.dbconnector.port | quote }}
{{- if $.Values.dbconnector.java.enabled }}
- name: JAVA_DBCONNECTOR_HOST
value: http://{{ template "retool.fullname" . }}-dbconnector
- name: JAVA_DBCONNECTOR_PORT
value: {{ $.Values.dbconnector.java.port | quote }}
{{- end }}
{{ end }}
- name: DBCONNECTOR_QUERY_TIMEOUT_MS
{{- if .Values.workflows.dbConnectorTimeout }}
Expand Down
1 change: 1 addition & 0 deletions charts/retool/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,7 @@ dbconnector:
# Disable this to disable Retool's Java dbconnector. Applies whether
# dbconnector.enabled is true or false.
enabled: true
port: 3007

# Desired pod count for dbconnector deployment.
replicas: 1
Expand Down
1 change: 1 addition & 0 deletions values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,7 @@ dbconnector:
# Disable this to disable Retool's Java dbconnector. Applies whether
# dbconnector.enabled is true or false.
enabled: true
port: 3007

# Desired pod count for dbconnector deployment.
replicas: 1
Expand Down
Loading