Helm chart improvements (#2207)

* add helm deps

* configurablecli tag for setup commands

* enabled -> deploy

* extraEnv -> extraEnvVars

* update docs

* minio -> s3

* improve persistence config

* set cli tag to v4-beta

* chart and image bump

* fix tests

* lock chart

* workflow hotfix

* quote for niels

* make probes configurable

* fix webapp and supervisor templates

* bump chart

Author: nicktrn

.github/workflows/release-helm.yml

@@ -29,6 +29,14 @@ jobs:
         with:
           version: "3.18.3"
 
+      - name: Build dependencies
+        run: helm dependency build ./hosting/k8s/helm/
+
+      - name: Extract dependency charts
+        run: |
+          cd ./hosting/k8s/helm/
+          for file in ./charts/*.tgz; do echo "Extracting $file"; tar -xzf "$file" -C ./charts; done
+
       - name: Lint Helm Chart
         run: |
           helm lint ./hosting/k8s/helm/
@@ -60,6 +68,14 @@ jobs:
         with:
           version: "3.18.3"
 
+      - name: Build dependencies
+        run: helm dependency build ./hosting/k8s/helm/
+
+      - name: Extract dependency charts
+        run: |
+          cd ./hosting/k8s/helm/
+          for file in ./charts/*.tgz; do echo "Extracting $file"; tar -xzf "$file" -C ./charts; done
+
       - name: Log in to Container Registry
         uses: docker/login-action@v3
         with:
@@ -115,7 +131,7 @@ jobs:
             ```bash
             helm upgrade --install trigger \
               oci://${{ env.REGISTRY }}/${{ github.repository_owner }}/charts/${{ env.CHART_NAME }} \
-              --version ${{ steps.version.outputs.version }}
+              --version "${{ steps.version.outputs.version }}"
             ```
             
             ### Changes

apps/webapp/app/components/SetupCommands.tsx

@@ -1,6 +1,7 @@
 import { createContext, useContext, useState } from "react";
 import { useAppOrigin } from "~/hooks/useAppOrigin";
 import { useProject } from "~/hooks/useProject";
+import { useTriggerCliTag } from "~/hooks/useTriggerCliTag";
 import {
   ClientTabs,
   ClientTabsContent,
@@ -35,8 +36,6 @@ function usePackageManager() {
   return context;
 }
 
-const v3PackageTag = "latest";
-
 function getApiUrlArg() {
   const appOrigin = useAppOrigin();
 
@@ -69,8 +68,9 @@ export function InitCommandV3({ title }: TabsProps) {
   const project = useProject();
   const projectRef = project.externalRef;
   const apiUrlArg = getApiUrlArg();
+  const triggerCliTag = useTriggerCliTag();
 
-  const initCommandParts = [`trigger.dev@${v3PackageTag}`, "init", `-p ${projectRef}`, apiUrlArg];
+  const initCommandParts = [`trigger.dev@${triggerCliTag}`, "init", `-p ${projectRef}`, apiUrlArg];
   const initCommand = initCommandParts.filter(Boolean).join(" ");
 
   const { activePackageManager, setActivePackageManager } = usePackageManager();
@@ -118,6 +118,7 @@ export function InitCommandV3({ title }: TabsProps) {
 }
 
 export function TriggerDevStepV3({ title }: TabsProps) {
+  const triggerCliTag = useTriggerCliTag();
   const { activePackageManager, setActivePackageManager } = usePackageManager();
 
   return (
@@ -139,30 +140,31 @@ export function TriggerDevStepV3({ title }: TabsProps) {
           variant="secondary/medium"
           iconButton
           className="mb-4"
-          value={`npx trigger.dev@${v3PackageTag} dev`}
+          value={`npx trigger.dev@${triggerCliTag} dev`}
         />
       </ClientTabsContent>
       <ClientTabsContent value={"pnpm"}>
         <ClipboardField
           variant="secondary/medium"
           iconButton
           className="mb-4"
-          value={`pnpm dlx trigger.dev@${v3PackageTag} dev`}
+          value={`pnpm dlx trigger.dev@${triggerCliTag} dev`}
         />
       </ClientTabsContent>
       <ClientTabsContent value={"yarn"}>
         <ClipboardField
           variant="secondary/medium"
           iconButton
           className="mb-4"
-          value={`yarn dlx trigger.dev@${v3PackageTag} dev`}
+          value={`yarn dlx trigger.dev@${triggerCliTag} dev`}
         />
       </ClientTabsContent>
     </ClientTabs>
   );
 }
 
 export function TriggerLoginStepV3({ title }: TabsProps) {
+  const triggerCliTag = useTriggerCliTag();
   const { activePackageManager, setActivePackageManager } = usePackageManager();
 
   return (
@@ -184,23 +186,23 @@ export function TriggerLoginStepV3({ title }: TabsProps) {
           variant="secondary/medium"
           iconButton
           className="mb-4"
-          value={`npx trigger.dev@${v3PackageTag} login`}
+          value={`npx trigger.dev@${triggerCliTag} login`}
         />
       </ClientTabsContent>
       <ClientTabsContent value={"pnpm"}>
         <ClipboardField
           variant="secondary/medium"
           iconButton
           className="mb-4"
-          value={`pnpm dlx trigger.dev@${v3PackageTag} login`}
+          value={`pnpm dlx trigger.dev@${triggerCliTag} login`}
         />
       </ClientTabsContent>
       <ClientTabsContent value={"yarn"}>
         <ClipboardField
           variant="secondary/medium"
           iconButton
           className="mb-4"
-          value={`yarn dlx trigger.dev@${v3PackageTag} login`}
+          value={`yarn dlx trigger.dev@${triggerCliTag} login`}
         />
       </ClientTabsContent>
     </ClientTabs>

apps/webapp/app/env.server.ts

@@ -856,6 +856,9 @@ const EnvironmentSchema = z.object({
 
   // Machine presets
   MACHINE_PRESETS_OVERRIDE_PATH: z.string().optional(),
+
+  // CLI package tag (e.g. "latest", "v4-beta", "4.0.0") - used for setup commands
+  TRIGGER_CLI_TAG: z.string().default("latest"),
 });
 
 export type Environment = z.infer<typeof EnvironmentSchema>;

apps/webapp/app/hooks/useTriggerCliTag.ts

@@ -0,0 +1,8 @@
+import { useTypedRouteLoaderData } from "remix-typedjson";
+import { type loader } from "~/root";
+
+export function useTriggerCliTag() {
+  const routeMatch = useTypedRouteLoaderData<typeof loader>("root");
+
+  return routeMatch!.triggerCliTag;
+}

apps/webapp/app/root.tsx

@@ -56,6 +56,7 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
       features,
       appEnv: env.APP_ENV,
       appOrigin: env.APP_ORIGIN,
+      triggerCliTag: env.TRIGGER_CLI_TAG,
       kapa,
     },
     { headers: { "Set-Cookie": await commitSession(session) } }

docs/self-hosting/kubernetes.mdx

@@ -181,7 +181,7 @@ You can set extra environment variables on all services. For example:
 
 ```yaml
 webapp:
-  extraEnv:
+  extraEnvVars:
     - name: EXTRA_ENV_VAR
       value: "extra-value"
 ```
@@ -202,9 +202,8 @@ You can disable the built-in services and use external services instead. For exa
 
 ```yaml
 postgres:
-  enabled: false
-  external: true
-  externalConnection:
+  deploy: false
+  external:
     host: "my-postgres.example.com"
     port: 5432
     database: "my-database"
@@ -262,10 +261,10 @@ See the [Docker registry setup](/self-hosting/docker#registry-setup) for concept
 ```yaml
 # Use external registry (recommended)
 registry:
-  external: true
+  deploy: false
   # Part of deployment image ref, for example: your-registry.example.com/your-company/proj_123:20250625.1.prod
   repositoryNamespace: "your-company"
-  externalConnection:
+  external:
     host: "your-registry.example.com"
     port: 5000
     auth:
@@ -285,9 +284,8 @@ See the [Docker object storage setup](/self-hosting/docker#object-storage) for c
 ```yaml
 # Use external S3-compatible storage
 minio:
-  enabled: false
-  external: true
-  externalConnection:
+  deploy: false
+  external:
     url: "https://s3.amazonaws.com"
     # or: "https://your-minio.com:9000"
 
@@ -305,7 +303,7 @@ Authentication options are identical to the [Docker-based installation](/self-ho
 **GitHub OAuth:**
 ```yaml
 webapp:
-  extraEnv:
+  extraEnvVars:
     - name: AUTH_GITHUB_CLIENT_ID
       value: "your-github-client-id"
     - name: AUTH_GITHUB_CLIENT_SECRET
@@ -315,7 +313,7 @@ webapp:
 **Email authentication (Resend):**
 ```yaml
 webapp:
-  extraEnv:
+  extraEnvVars:
     - name: EMAIL_TRANSPORT
       value: "resend"
     - name: FROM_EMAIL
@@ -329,7 +327,7 @@ webapp:
 **Restricting access:**
 ```yaml
 webapp:
-  extraEnv:
+  extraEnvVars:
     - name: WHITELISTED_EMAILS
       value: "user1@company\\.com|user2@company\\.com"
 ```

hosting/k8s/helm/.gitignore

@@ -1,3 +1,4 @@
 values-*.yaml
 !values-production-example.yaml
-*.tgz
+*.tgz
+/charts

hosting/k8s/helm/Chart.lock

@@ -0,0 +1,15 @@
+dependencies:
+- name: postgresql
+  repository: oci://registry-1.docker.io/bitnamicharts
+  version: 16.7.14
+- name: redis
+  repository: oci://registry-1.docker.io/bitnamicharts
+  version: 21.2.6
+- name: clickhouse
+  repository: oci://registry-1.docker.io/bitnamicharts
+  version: 9.3.7
+- name: minio
+  repository: oci://registry-1.docker.io/bitnamicharts
+  version: 17.0.9
+digest: sha256:b6cef61abc0b8bcdf4e6d7d86bd8dd7999dd07543f5532f3d94797ffdf0ad30b
+generated: "2025-06-27T19:27:24.075488134+01:00"

hosting/k8s/helm/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: trigger
 description: The official Trigger.dev Helm chart
 type: application
-version: 4.0.0-beta.5
-appVersion: v4.0.0-v4-beta.21
+version: 4.0.0-beta.7
+appVersion: trigger-helm-rc.0
 home: https://trigger.dev
 sources:
   - https://github.com/triggerdotdev/trigger.dev
@@ -16,3 +16,22 @@ keywords:
   - automation
 annotations:
   category: Development
+dependencies:
+  - name: postgresql
+    version: "16.7.14"
+    repository: "oci://registry-1.docker.io/bitnamicharts"
+    condition: postgres.deploy
+    alias: postgres
+  - name: redis
+    version: "21.2.6"
+    repository: "oci://registry-1.docker.io/bitnamicharts"
+    condition: redis.deploy
+  - name: clickhouse
+    version: "9.3.7"
+    repository: "oci://registry-1.docker.io/bitnamicharts"
+    condition: clickhouse.deploy
+  - name: minio
+    version: "17.0.9"
+    repository: "oci://registry-1.docker.io/bitnamicharts"
+    condition: s3.deploy
+    alias: s3