Skip to content

Commit

Permalink
[fix] Update chart to handle the opt-in mechanism for Java dbconnecto…
Browse files Browse the repository at this point in the history
…r before 3.93-edge
  • Loading branch information
jjlgao committed Nov 8, 2024
1 parent ea16ecb commit 87bd0e9
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 2 deletions.
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.10
version: 6.2.11
maintainers:
- name: Retool Engineering
email: [email protected]
Expand Down
26 changes: 25 additions & 1 deletion charts/retool/templates/deployment_backend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,19 +78,43 @@ spec:
- name: NODE_ENV
value: production
{{- if include "retool.jobRunner.enabled" . }}

{{- if semverCompare ">= 3.93.0-0" .Values.image.tag -}}
{{ if ( not $.Values.dbconnector.java.enabled ) }}
- name: DISABLE_JAVA_DBCONNECTOR
value: "true"
{{ end }}
- name: SERVICE_TYPE
value: MAIN_BACKEND,DB_CONNECTOR,DB_SSH_CONNECTOR
{{- else }}
{{- else }} # Corresponds to {{- if semverCompare ">= 3.93.0-0" .Values.image.tag -}}
{{ if $.Values.dbconnector.java.enabled }}
- name: SERVICE_TYPE
value: MAIN_BACKEND,DB_CONNECTOR,DB_SSH_CONNECTOR,JAVA_DBCONNECTOR
{{ else }}
- name: SERVICE_TYPE
value: MAIN_BACKEND,DB_CONNECTOR,DB_SSH_CONNECTOR
{{ end }}
{{- end }}

{{- else }} # Corresponds to {{- if include "retool.jobRunner.enabled" . }}

{{- if semverCompare ">= 3.93.0-0" .Values.image.tag -}}
{{ 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
{{- else }} # Corresponds to {{- if semverCompare ">= 3.93.0-0" .Values.image.tag -}}
{{ if $.Values.dbconnector.java.enabled }}
- name: SERVICE_TYPE
value: MAIN_BACKEND,DB_CONNECTOR,DB_SSH_CONNECTOR,JOBS_RUNNER,JAVA_DBCONNECTOR
{{ else }}
- name: SERVICE_TYPE
value: MAIN_BACKEND,DB_CONNECTOR,DB_SSH_CONNECTOR,JOBS_RUNNER
{{ end }}
{{- end }}

{{- end }}
- name: CLIENT_ID
value: {{ default "" .Values.config.auth.google.clientId }}
Expand Down
10 changes: 10 additions & 0 deletions charts/retool/templates/deployment_workflows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,22 @@ spec:
value: {{ template "retool.deploymentTemplateVersion" . }}
- name: NODE_ENV
value: production
{{- if semverCompare ">= 3.93.0-0" .Values.image.tag -}}
{{ if ( not $.Values.dbconnector.java.enabled ) }}
- name: DISABLE_JAVA_DBCONNECTOR
value: "true"
{{ end }}
- name: SERVICE_TYPE
value: WORKFLOW_BACKEND,DB_CONNECTOR,DB_SSH_CONNECTOR
{{- else }} # Corresponds to {{- if semverCompare ">= 3.93.0-0" .Values.image.tag -}}
{{ if $.Values.dbconnector.java.enabled }}
- name: SERVICE_TYPE
value: WORKFLOW_BACKEND,DB_CONNECTOR,DB_SSH_CONNECTOR,JAVA_DBCONNECTOR
{{ else }}
- name: SERVICE_TYPE
value: WORKFLOW_BACKEND,DB_CONNECTOR,DB_SSH_CONNECTOR
{{ end }}
{{- end }}
- name: DBCONNECTOR_POSTGRES_POOL_MAX_SIZE
value: "100"
- name: DBCONNECTOR_QUERY_TIMEOUT_MS
Expand Down

0 comments on commit 87bd0e9

Please sign in to comment.