Skip to content

[fix] Update standalone dbconnector service type definition to match … #232

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 11, 2025
Merged

[fix] Update standalone dbconnector service type definition to match … #232

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
6f9d442
[fix] Update standalone dbconnector service type definition to match …
jjlgao Apr 9, 2025
07629b1
remove DISABLE_JAVA_DBCONNECTOR from backends when standalone dbconne…
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.7
version: 6.4.8
maintainers:
- name: Retool Engineering
email: [email protected]
Expand Down
2 changes: 1 addition & 1 deletion charts/retool/templates/deployment_backend.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ spec:
{{- end }}
- name: SERVICE_TYPE
value: {{ join "," $serviceType }}
{{ if and ( include "retool_version_with_java_dbconnector_opt_out" . ) ( not $.Values.dbconnector.java.enabled ) }}
{{ if and ( not $.Values.dbconnector.enabled ) ( and ( include "retool_version_with_java_dbconnector_opt_out" . ) ( not $.Values.dbconnector.java.enabled ) ) }}
- name: DISABLE_JAVA_DBCONNECTOR
value: "true"
{{ end }}
Expand Down
15 changes: 9 additions & 6 deletions charts/retool/templates/deployment_dbconnector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,16 @@ spec:
{{- toYaml .Values.resources | nindent 10 }}
{{- end }}
env:
{{- if $.Values.dbconnector.java.enabled }}
- name: SERVICE_TYPE
value: DB_CONNECTOR,DB_SSH_CONNECTOR,JAVA_DBCONNECTOR
{{- else }}
- name: SERVICE_TYPE
value: DB_CONNECTOR,DB_SSH_CONNECTOR
{{- $serviceType := list "DB_CONNECTOR" "DB_SSH_CONNECTOR" }}
{{- if and ( not ( include "retool_version_with_java_dbconnector_opt_out" . ) ) ( $.Values.dbconnector.java.enabled ) }}
{{- $serviceType = append $serviceType "JAVA_DBCONNECTOR" }}
{{- end }}
- name: SERVICE_TYPE
value: {{ join "," $serviceType }}
{{ if and ( include "retool_version_with_java_dbconnector_opt_out" . ) ( not $.Values.dbconnector.java.enabled ) }}
- name: DISABLE_JAVA_DBCONNECTOR
value: "true"
{{ end }}
- name: DEPLOYMENT_TEMPLATE_TYPE
value: {{ template "retool.deploymentTemplateType" . }}
- name: DEPLOYMENT_TEMPLATE_VERSION
Expand Down
2 changes: 1 addition & 1 deletion charts/retool/templates/deployment_workflows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ spec:
value: {{ $.Values.dbconnector.java.port | quote }}
{{- end }}
{{- end }}
{{ if and ( include "retool_version_with_java_dbconnector_opt_out" . ) ( not $.Values.dbconnector.java.enabled ) }}
{{ if and ( not $.Values.dbconnector.enabled ) ( and ( include "retool_version_with_java_dbconnector_opt_out" . ) ( not $.Values.dbconnector.java.enabled ) ) }}
- name: DISABLE_JAVA_DBCONNECTOR
value: "true"
{{ end }}
Expand Down
Loading