Skip to content

Bump helm chart version and update image #2208

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.

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

Closed
wants to merge 18 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 17 additions & 1 deletion .github/workflows/release-helm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
20 changes: 11 additions & 9 deletions apps/webapp/app/components/SetupCommands.tsx
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -35,8 +36,6 @@ function usePackageManager() {
return context;
}

const v3PackageTag = "latest";

function getApiUrlArg() {
const appOrigin = useAppOrigin();

Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -118,6 +118,7 @@ export function InitCommandV3({ title }: TabsProps) {
}

export function TriggerDevStepV3({ title }: TabsProps) {
const triggerCliTag = useTriggerCliTag();
const { activePackageManager, setActivePackageManager } = usePackageManager();

return (
Expand All @@ -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 (
Expand All @@ -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>
Expand Down
3 changes: 3 additions & 0 deletions apps/webapp/app/env.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
8 changes: 8 additions & 0 deletions apps/webapp/app/hooks/useTriggerCliTag.ts
Original file line number Diff line number Diff line change
@@ -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;
}
1 change: 1 addition & 0 deletions apps/webapp/app/root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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) } }
Expand Down
22 changes: 10 additions & 12 deletions docs/self-hosting/kubernetes.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -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"
```
Expand All @@ -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"
Expand Down Expand Up @@ -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:
Expand All @@ -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"

Expand All @@ -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
Expand All @@ -315,7 +313,7 @@ webapp:
**Email authentication (Resend):**
```yaml
webapp:
extraEnv:
extraEnvVars:
- name: EMAIL_TRANSPORT
value: "resend"
- name: FROM_EMAIL
Expand All @@ -329,7 +327,7 @@ webapp:
**Restricting access:**
```yaml
webapp:
extraEnv:
extraEnvVars:
- name: WHITELISTED_EMAILS
value: "user1@company\\.com|user2@company\\.com"
```
Expand Down
3 changes: 2 additions & 1 deletion hosting/k8s/helm/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
values-*.yaml
!values-production-example.yaml
*.tgz
*.tgz
/charts
15 changes: 15 additions & 0 deletions hosting/k8s/helm/Chart.lock
Original file line number Diff line number Diff line change
@@ -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"
23 changes: 21 additions & 2 deletions hosting/k8s/helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.8
appVersion: trigger-helm-rc.1
home: https://trigger.dev
sources:
- https://github.com/triggerdotdev/trigger.dev
Expand All @@ -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
Loading