From f729643e06239c077145e632fc236b14fde56f04 Mon Sep 17 00:00:00 2001
From: Matt Westrik <mattw@retool.com>
Date: Tue, 1 Sep 2026 11:50:10 -0700
Subject: [PATCH 1/2] Set R2_ORCHESTRATION_BACKEND=postgres when Temporal is
 disabled
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

R² sandbox workflows run on either Temporal or pg-boss. When no Temporal
cluster is enabled (neither the retool-temporal-services-helm subchart nor
an external temporal config), emit `R2_ORCHESTRATION_BACKEND=postgres` on the
backend, workflow backend, workers, and jobs runner so R² falls back to
pg-boss instead of failing to reach a nonexistent Temporal frontend.

Gated on image tag >= 4.47.0 — older images don't support the postgres backend and keep the Temporal default.
---
 charts/retool/templates/_helpers.tpl         | 31 ++++++++++++++++++++
 charts/retool/templates/deployment_jobs.yaml |  1 +
 2 files changed, 32 insertions(+)

diff --git a/charts/retool/templates/_helpers.tpl b/charts/retool/templates/_helpers.tpl
index 758f387c..c275a000 100644
--- a/charts/retool/templates/_helpers.tpl
+++ b/charts/retool/templates/_helpers.tpl
@@ -585,6 +585,36 @@ Set Temporal namespace
 {{- end -}}
 {{- end -}}
 
+{{/*
+Returns "1" when a Temporal cluster is enabled for this deployment -- either
+via the bundled retool-temporal-services-helm subchart or an external Temporal
+cluster configured under .Values.workflows.temporal / .Values.temporal.
+Usage: (include "retool.temporal.enabled" .)
+*/}}
+{{- define "retool.temporal.enabled" -}}
+{{- $temporalConfig := include "retool.temporalConfig" . | fromYaml -}}
+{{- if or (index .Values "retool-temporal-services-helm" "enabled") ($temporalConfig).enabled -}}1{{- end -}}
+{{- end -}}
+
+{{/*
+R² orchestration backend env var. R² sandbox workflows run on either Temporal
+(the code default) or pg-boss (a Postgres-backed durable job queue). When no
+Temporal cluster is enabled, fall back to pg-boss so self-hosted deployments
+without Temporal can still run R² tasks. Requires Retool >= 4.47.0.
+Usage: {{- include "retool.r2.orchestrationBackendEnv" . | nindent 10 }}
+*/}}
+{{- define "retool.r2.orchestrationBackendEnv" -}}
+{{- if ne (include "retool.temporal.enabled" .) "1" -}}
+{{- $valid_retool_version_regexp := "([0-9]+\\.[0-9]+(\\.[0-9]+)?(-[a-zA-Z0-9]+)?)" }}
+{{- $semver_version_regexp := "[0-9]+\\.[0-9]+(\\.[0-9]+)?" }}
+{{- $retool_version_supports_r2_postgres := ( and ( regexMatch $valid_retool_version_regexp .Values.image.tag ) ( semverCompare ">= 4.47.0-0" ( regexFind $semver_version_regexp .Values.image.tag ) ) ) }}
+{{- if $retool_version_supports_r2_postgres -}}
+- name: R2_ORCHESTRATION_BACKEND
+  value: "postgres"
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Set dbconnector service name
 */}}
@@ -927,6 +957,7 @@ Usage: {{- include "retool.agentSandbox.backendEnvVars" . | nindent 10 }}
 {{- $defaultSecretName := .Values.rr.agentSandbox.externalSecret.name | default (include "retool.agentSandbox.name" .) -}}
 - name: RR_AGENT_PUBSUB_BACKEND
   value: "postgres"
+{{ include "retool.r2.orchestrationBackendEnv" . }}
 - name: AGENT_SANDBOX_CONTROLLER_INGRESS_DOMAIN
   value: {{ .Values.rr.agentSandbox.controllerUrl | default (printf "http://%s:%s" (include "retool.agentSandbox.controller.name" .) (toString .Values.rr.agentSandbox.controller.port)) | quote }}
 {{- include "retool.agentSandbox.proxyEnvVars" . }}
diff --git a/charts/retool/templates/deployment_jobs.yaml b/charts/retool/templates/deployment_jobs.yaml
index 771fabac..8a3ee451 100644
--- a/charts/retool/templates/deployment_jobs.yaml
+++ b/charts/retool/templates/deployment_jobs.yaml
@@ -96,6 +96,7 @@ spec:
           {{- if eq (include "retool.rr.componentEnabled" (dict "root" $ "component" "agentSandbox")) "1" }}
           - name: RR_AGENT_PUBSUB_BACKEND
             value: "postgres"
+          {{- include "retool.r2.orchestrationBackendEnv" . | nindent 10 }}
           {{- end }}
 
           {{- $temporalConfig := (include "retool.temporalConfig" . | fromYaml) }}

From 1892554f7d1f338a9c4687ce216a8a575f32a138 Mon Sep 17 00:00:00 2001
From: Matt Westrik <mattw@retool.com>
Date: Tue, 1 Sep 2026 11:56:12 -0700
Subject: [PATCH 2/2] Bump chart version to 6.11.24

---
 charts/retool/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/retool/Chart.yaml b/charts/retool/Chart.yaml
index bcd97ca7..e61ded67 100644
--- a/charts/retool/Chart.yaml
+++ b/charts/retool/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: retool
 description: A Helm chart for Kubernetes
 type: application
-version: 6.11.23
+version: 6.11.24
 maintainers:
   - name: Retool Engineering
     email: engineering+helm@retool.com