Merge r2 → main: R² (React Retool) self-hosted support (chart 6.12.0)

[JatinNanda]

What

Lands the full R² (React Retool) self-hosted feature set from the long-lived r2 branch onto the published main chart line. Chart version 6.10.6 → 6.12.0.

This is a real merge commit (not a squash) so the 33-commit R² history is preserved — see the Commits tab.

What's included

• rr.* values layout ([rr] Restructure into top-level rr.enabled master switch + rename r2 → rr #321) — one top-level rr.enabled master switch over rr.jsExecutor / rr.agent / rr.agentSandbox, with null-inherit per-component overrides. Fail-loud guard (retool.rr.validateLegacyValues) on the old r2.* / top-level keys.
• js-executor workload ([INF-6675] add js executor #275), self-contained env, Guaranteed QoS.
• rr.agent server-side agent worker.
• agent-sandbox service (support agent-sandbox service #281, agent sandbox secret overrides #290, agent-sandbox: validate required secrets + existing-secret DSN ref #308): controller + proxy + ephemeral Job sandboxes, flexible Postgres sourcing (inherit backend by default), flexible secret sourcing (JWT required, encryption/api optional), same-origin proxy by default (no extra ingress), NetworkPolicy, device plugin.
• git server ([feat][r2] enable git_server in-process with rrGitServer.enabled + blobStorage config #296) in-process by default; optional split deployment ([feat][r2] optionally split rrGitServer into its own deployment #309).
• shared blob storage block (s3/gcs/azure) + raw-env escape hatch.
• MCP server (Add MCP server support to Retool Helm chart #285), top-level and opt-in (not part of the master switch, [fix][r2] drop mcp from the r2.enabled master switch #316).

Conflict resolution

• charts/retool/Chart.yaml version → 6.12.0 (the R² release; subsumes main's 6.10.6 from [fix] update startupProbe.successThreshold example to be 1 #305).
• main's [fix] update startupProbe.successThreshold example to be 1 #305 startupProbe.successThreshold example and r2's temporal dependency-condition change are both preserved (auto-merged).

Prerequisites (done)

Consumer migrations to the (non-backwards-compatible) rr.* layout landed before this merge:

• retool-k8s #18177 — internal-onprem + admin + managed-self-hosted
• retool-k8s #18178 — nuon

Validation (on the merged tree)

• helm lint clean
• All 19 ci/*option.yaml permutations render
• Legacy-values guard fires on stale r2.* keys

Not in this PR

• Publishing to charts.retool.com (6.12.0) — deliberate separate rollout step.
• retool-self-hosted-blueprints rr.* migration — still to do before that repo consumes the published chart (it currently pins ref=r2, so unaffected by this merge).

⚠️ Merge note: repo is configured squash-only, which would flatten the 33 commits. To preserve history on main, enable merge commits before merging this PR.

🤖 Generated with Claude Code

[greptile-apps]

Greptile Summary

This PR lands the full R² (React Retool) self-hosted feature set from the long-lived r2 branch, bumping the chart from 6.10.6 to 6.12.0. It adds five new workloads (JS executor, RR agent worker, agent-sandbox controller + proxy + Job-based sandboxes, optional split git server, MCP server) under a unified rr.* top-level values hierarchy with a single master switch and per-component overrides, plus fail-loud guards for stale r2.* / legacy key names.

• New deployments: deployment_js_executor.yaml, deployment_mcp.yaml, deployment_git_server.yaml, and deployment_agent_sandbox.yaml (controller + proxy + Job template ConfigMap + RBAC + Services + optional Ingress + PDB).
• Cross-cutting wiring: deployment_backend.yaml, deployment_workflows.yaml, deployment_jobs.yaml, and _workers.tpl all gain conditional JS-executor domain, agent-sandbox backend env vars, and git-server SERVICE_TYPE injection; the main Service gains an optional second port for MCP OAuth metadata paths.
• Supporting resources: seccomp DaemonSet, image-prepuller DaemonSet, device-plugin DaemonSet, NetworkPolicy set, and shared blob-storage env rendering for the git server.

Confidence Score: 4/5

Safe to merge; all new workloads are gated behind opt-in switches so existing deployments are unaffected.

The core logic is carefully crafted and well-tested across 19 CI permutations. The two MCP template oversights (missing standard pod labels, wrong extraConfigMapMounts placement) only affect MCP adopters who rely on standard chart labels or use extraContainers alongside extraConfigMapMounts. No previously-working paths are regressed.

charts/retool/templates/deployment_mcp.yaml — pod template labels and extraConfigMapMounts ordering should be reviewed before MCP is widely adopted.

Important Files Changed

Filename	Overview
charts/retool/templates/deployment_mcp.yaml	New MCP deployment template with oauthIntrospectionAuthToken guard. Two issues: pod template labels omit the standard retool.labels include present in every other template, and extraConfigMapMounts volume mounts are rendered after extraContainers, which mis-parents them when extra containers are used.
charts/retool/templates/deployment_agent_sandbox.yaml	New 714-line file rendering the full agent-sandbox stack (Secret, RBAC, job-template ConfigMap, controller/proxy Deployments and Services, proxy Ingress, headless sandbox Service, PDB). JWT key in the job-template JSON now correctly uses toJson.
charts/retool/templates/deployment_js_executor.yaml	New JS executor deployment with seccomp init-container installer and NET_ADMIN capability. AppArmor is set via the beta annotation only; the agent-sandbox job template in the same PR already uses the native appArmorProfile field.
charts/retool/templates/_helpers.tpl	Large expansion adding RR helper templates: componentEnabled/validateLegacyValues guards, agentSandbox secret/postgres/backend-env helpers, gitServer blob-storage validation, MCP routing helpers, and updated retool.env to support map-style valueFrom entries.
charts/retool/templates/deployment_git_server.yaml	New optional split git-server deployment sharing the main backend image and credentials. Correctly waits for Postgres, carries standard retool.labels in pod template, and auto-points MCP at it when separate mode is enabled.
charts/retool/templates/agent_sandbox_networkpolicy.yaml	New NetworkPolicy set for sandbox pods, controller, and proxy. The proxy egress IPv4 rule always emits except: without a guard for an empty blockedRanges list (flagged in a previous thread).
charts/retool/values.yaml	Adds mcp, rr (jsExecutor/agent/agentSandbox/gitServer/blobStorage) top-level blocks with detailed inline documentation. The jsExecutor.volumes/volumeMounts defaults of {} (previously flagged) remain maps instead of lists.
charts/retool/templates/deployment_backend.yaml	Adds legacy-values guard, git-server SERVICE_TYPE injection, agentSandbox backend env vars, JS_EXECUTOR_INGRESS_DOMAIN, and git-server host/port split-mode env vars. All conditional and safe.

Flowchart

%%{init: {'theme': 'neutral'}}%%
flowchart TD
    BE["Backend (main)\nSERVICE_TYPE: MAIN,JOBS_RUNNER\n[+RR_GIT_SERVER if inline]"]
    WF["Workflows worker"]
    JOB["Jobs worker"]
    RRA["RR Agent worker\n(R2_AGENT_TEMPORAL_WORKER)"]
    JSE["JS Executor\n(tryretool/js-executor-service)"]
    MCP["MCP Server\n(SERVICE_TYPE: MCP_SERVER)"]
    GIT["Git Server (optional split)\n(SERVICE_TYPE: RR_GIT_SERVER)"]
    SC["AgentSandbox Controller"]
    SP["AgentSandbox Proxy"]
    SJ["Sandbox Jobs\n(ephemeral K8s Jobs)"]
    PG[("Postgres")]

    BE -->|"JS_EXECUTOR_INGRESS_DOMAIN"| JSE
    BE -->|"AGENT_SANDBOX_CONTROLLER_INGRESS_DOMAIN"| SC
    BE -->|"AGENT_SANDBOX_PROXY_INGRESS_DOMAIN"| SP
    BE -->|"RR_GIT_SERVER_HOST/PORT (split mode)"| GIT
    WF -->|"JS_EXECUTOR_INGRESS_DOMAIN"| JSE
    WF -->|agentSandbox env| SC
    JOB -->|agentSandbox env| SC
    RRA -->|agentSandbox env| SC
    MCP -->|"RETOOL_BACKEND_URL"| BE
    MCP -->|"RETOOL_GIT_SERVER_URL (split mode)"| GIT
    SC -->|"manages"| SJ
    SC -->|"state"| PG
    SP -->|"proxy egress"| SJ
    SP -->|"state"| PG
    GIT -->|"blob storage\n(S3/GCS/Azure)"| BS[("Blob Storage")]

Loading

_{Reviews (2): Last reviewed commit: "[agent-sandbox] fix jwtPublicKey breakin..." | Re-trigger Greptile}

[greptile-apps]

JWT public key interpolated into JSON without escaping

On line 181, jwtPublicKey is embedded directly into a JSON string literal: "value": "{{ $as.jwtPublicKey }}". ES256 keys are ECDSA/P-256, commonly stored in PEM format with newline characters (\n) and -----BEGIN/END PUBLIC KEY----- headers. An unescaped newline inside a JSON string literal produces invalid JSON, causing the controller to fail when reading the job-template ConfigMap to spawn sandbox Jobs. Even a compact JWK ({"kty":"EC",...}) would embed unescaped double-quotes and break the JSON. The fix is to replace the surrounding "..." with {{ $as.jwtPublicKey | toJson }} so newlines and quotes are properly JSON-escaped.

[greptile-apps]

except: rendered with no items when blockedRanges is cleared

The proxy egress rule always emits except: regardless of whether blockedRanges is populated. If a user explicitly sets networkPolicy.blockedRanges: [], the template renders except: with a null value, which Kubernetes rejects because the field expects a list of CIDR strings. The default values include a populated blockedRanges list so this doesn't affect typical usage, but it would silently break a user who tries to allow all egress by clearing the list. Wrapping the except: key in {{- if $as.networkPolicy.blockedRanges }} would guard against the empty case.

[ryanartecona]

should be 6.11.0 no?

[ryanartecona]

this is a breaking change, which we were otherwise able to avoid. I think @lukefoster11 you may have introduced this IIRC? is this load bearing for r2 stuff or can we undo this part?