Skip to content

Commit 959f04c

Browse files
nicktrnLeoKaynan
authored andcommitted
chore(helm): migrate to bitnami legacy registry and add configurable utility images (#2574)
* chore(docker): use bitnami legacy repo * chore(helm): use bitnami legacy repo * Make Helm webapp chart images configurable Adds configurability for init and token syncer container images through new values in the Helm chart configuration * chore(helm): refactor utility image config * chore(helm): bump chart version to 4.0.3 --------- Co-authored-by: LeoKaynan <leokaynan@hotmail.com>
1 parent d1152c3 commit 959f04c

File tree

7 files changed

+77
-8
lines changed

7 files changed

+77
-8
lines changed

docker/dev-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ services:
4848
- db
4949

5050
clickhouse:
51-
image: bitnami/clickhouse:latest
51+
image: bitnamilegacy/clickhouse:latest
5252
container_name: clickhouse-dev
5353
environment:
5454
CLICKHOUSE_ADMIN_USER: default

docker/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ services:
7676
- database
7777

7878
clickhouse:
79-
image: bitnami/clickhouse:latest
79+
image: bitnamilegacy/clickhouse:latest
8080
restart: always
8181
container_name: clickhouse
8282
environment:

hosting/docker/webapp/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ services:
139139
start_period: 10s
140140

141141
clickhouse:
142-
image: bitnami/clickhouse:${CLICKHOUSE_IMAGE_TAG:-latest}
142+
image: bitnamilegacy/clickhouse:${CLICKHOUSE_IMAGE_TAG:-latest}
143143
restart: ${RESTART_POLICY:-unless-stopped}
144144
logging: *logging-config
145145
ports:
@@ -183,7 +183,7 @@ services:
183183
start_period: 10s
184184

185185
minio:
186-
image: bitnami/minio:${MINIO_IMAGE_TAG:-latest}
186+
image: bitnamilegacy/minio:${MINIO_IMAGE_TAG:-latest}
187187
restart: ${RESTART_POLICY:-unless-stopped}
188188
logging: *logging-config
189189
ports:

hosting/k8s/helm/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: trigger
33
description: The official Trigger.dev Helm chart
44
type: application
5-
version: 4.0.2
5+
version: 4.0.3
66
appVersion: v4.0.4
77
home: https://trigger.dev
88
sources:

hosting/k8s/helm/templates/_helpers.tpl

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,34 @@ Get the full image name for supervisor
9595
{{- end }}
9696
{{- end }}
9797

98+
{{/*
99+
Get the full image name for webapp volumePermissions init container
100+
*/}}
101+
{{- define "trigger-v4.webapp.volumePermissions.image" -}}
102+
{{- $registry := .Values.global.imageRegistry | default .Values.webapp.volumePermissions.image.registry -}}
103+
{{- $repository := .Values.webapp.volumePermissions.image.repository -}}
104+
{{- $tag := .Values.webapp.volumePermissions.image.tag -}}
105+
{{- if $registry }}
106+
{{- printf "%s/%s:%s" $registry $repository $tag }}
107+
{{- else }}
108+
{{- printf "%s:%s" $repository $tag }}
109+
{{- end }}
110+
{{- end }}
111+
112+
{{/*
113+
Get the full image name for webapp tokenSyncer sidecar
114+
*/}}
115+
{{- define "trigger-v4.webapp.tokenSyncer.image" -}}
116+
{{- $registry := .Values.global.imageRegistry | default .Values.webapp.tokenSyncer.image.registry -}}
117+
{{- $repository := .Values.webapp.tokenSyncer.image.repository -}}
118+
{{- $tag := .Values.webapp.tokenSyncer.image.tag -}}
119+
{{- if $registry }}
120+
{{- printf "%s/%s:%s" $registry $repository $tag }}
121+
{{- else }}
122+
{{- printf "%s:%s" $repository $tag }}
123+
{{- end }}
124+
{{- end }}
125+
98126
{{/*
99127
PostgreSQL hostname (deprecated - used only for legacy DATABASE_HOST env var)
100128
*/}}

hosting/k8s/helm/templates/webapp.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,9 @@ spec:
6767
{{- toYaml . | nindent 8 }}
6868
{{- end }}
6969
initContainers:
70-
- name: init-shared
71-
image: busybox:1.35
70+
- name: volume-permissions
71+
image: {{ include "trigger-v4.webapp.volumePermissions.image" . }}
72+
imagePullPolicy: {{ .Values.webapp.volumePermissions.image.pullPolicy }}
7273
command: ['sh', '-c', 'mkdir -p /home/node/shared']
7374
securityContext:
7475
runAsUser: 1000
@@ -77,7 +78,8 @@ spec:
7778
mountPath: /home/node/shared
7879
containers:
7980
- name: token-syncer
80-
image: bitnami/kubectl:1.28
81+
image: {{ include "trigger-v4.webapp.tokenSyncer.image" . }}
82+
imagePullPolicy: {{ .Values.webapp.tokenSyncer.image.pullPolicy }}
8183
securityContext:
8284
runAsUser: 1000
8385
runAsNonRoot: true

hosting/k8s/helm/values.yaml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ global:
22
imageRegistry: ""
33
imagePullSecrets: []
44
storageClass: ""
5+
security:
6+
# Required when using bitnami legacy images
7+
allowInsecureImages: true
58

69
nameOverride: ""
710
fullnameOverride: ""
@@ -45,6 +48,22 @@ webapp:
4548
tag: "" # Defaults to Chart.appVersion when empty
4649
pullPolicy: IfNotPresent
4750

51+
# Init container for shared directory setup
52+
volumePermissions:
53+
image:
54+
registry: docker.io
55+
repository: busybox
56+
tag: "1.35"
57+
pullPolicy: IfNotPresent
58+
59+
# Sidecar for token syncing
60+
tokenSyncer:
61+
image:
62+
registry: docker.io
63+
repository: bitnamilegacy/kubectl
64+
tag: "1.28"
65+
pullPolicy: IfNotPresent
66+
4867
# Origin configuration
4968
appOrigin: "http://localhost:3040"
5069
loginOrigin: "http://localhost:3040"
@@ -361,6 +380,11 @@ supervisor:
361380
postgres:
362381
deploy: true
363382

383+
image:
384+
# Use bitnami legacy repo
385+
repository: bitnamilegacy/postgresql
386+
# image: docker.io/bitnamilegacy/postgresql:17.5.0-debian-12-r12
387+
364388
# Bitnami PostgreSQL chart configuration (when deploy: true)
365389
auth:
366390
enablePostgresUser: true
@@ -411,6 +435,11 @@ postgres:
411435
redis:
412436
deploy: true
413437

438+
image:
439+
# Use bitnami legacy repo
440+
repository: bitnamilegacy/redis
441+
# image: docker.io/bitnamilegacy/redis:8.0.2-debian-12-r4
442+
414443
# Bitnami Redis chart configuration (when deploy: true)
415444
auth:
416445
enabled: false
@@ -501,6 +530,11 @@ electric:
501530
clickhouse:
502531
deploy: true
503532

533+
image:
534+
# Use bitnami legacy repo
535+
repository: bitnamilegacy/clickhouse
536+
# image: docker.io/bitnamilegacy/clickhouse:25.6.1-debian-12-r0
537+
504538
# TLS/Secure connection configuration
505539
secure: false # Set to true to use HTTPS and secure connections
506540

@@ -563,6 +597,11 @@ s3:
563597
# Set to true to deploy internal MinIO (default)
564598
deploy: true
565599

600+
image:
601+
# Use bitnami legacy repo
602+
repository: bitnamilegacy/minio
603+
# image: docker.io/bitnamilegacy/minio:2025.6.13-debian-12-r0
604+
566605
# Bitnami MinIO chart configuration (when deploy: true)
567606
# MinIO provides S3-compatible storage when deployed internally
568607
auth:

0 commit comments

Comments
 (0)