From bd08da0b2e4c66caa84c4813e439ede19e4999bc Mon Sep 17 00:00:00 2001 From: nicktrn <55853254+nicktrn@users.noreply.github.com> Date: Wed, 2 Jul 2025 12:30:20 +0100 Subject: [PATCH 1/4] set default webapp container --- hosting/k8s/helm/templates/webapp.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hosting/k8s/helm/templates/webapp.yaml b/hosting/k8s/helm/templates/webapp.yaml index b5c98ff155..ca51d0647b 100644 --- a/hosting/k8s/helm/templates/webapp.yaml +++ b/hosting/k8s/helm/templates/webapp.yaml @@ -48,10 +48,11 @@ spec: {{- include "trigger-v4.componentSelectorLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 6 }} template: metadata: - {{- with .Values.webapp.podAnnotations }} annotations: + kubectl.kubernetes.io/default-container: webapp + {{- with .Values.webapp.podAnnotations }} {{- toYaml . | nindent 8 }} - {{- end }} + {{- end }} labels: {{- include "trigger-v4.componentSelectorLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 8 }} spec: From f699c86d7e6819a231512b761470efb2b88471ed Mon Sep 17 00:00:00 2001 From: nicktrn <55853254+nicktrn@users.noreply.github.com> Date: Wed, 2 Jul 2025 12:30:38 +0100 Subject: [PATCH 2/4] bump version --- hosting/k8s/helm/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/k8s/helm/Chart.yaml b/hosting/k8s/helm/Chart.yaml index 3dafe105fc..be1eb40dc5 100644 --- a/hosting/k8s/helm/Chart.yaml +++ b/hosting/k8s/helm/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: trigger description: The official Trigger.dev Helm chart type: application -version: 4.0.0-beta.12 +version: 4.0.0-beta.13 appVersion: trigger-helm-rc.1 home: https://trigger.dev sources: From f184e26177f7125af4f3264e665bc2f84e91f56e Mon Sep 17 00:00:00 2001 From: nicktrn <55853254+nicktrn@users.noreply.github.com> Date: Wed, 2 Jul 2025 12:53:51 +0100 Subject: [PATCH 3/4] add webapp extraVolumes and extraVolumeMounts --- hosting/k8s/helm/templates/webapp.yaml | 6 ++++++ hosting/k8s/helm/values.yaml | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/hosting/k8s/helm/templates/webapp.yaml b/hosting/k8s/helm/templates/webapp.yaml index ca51d0647b..aec47bc51f 100644 --- a/hosting/k8s/helm/templates/webapp.yaml +++ b/hosting/k8s/helm/templates/webapp.yaml @@ -324,6 +324,9 @@ spec: volumeMounts: - name: shared mountPath: /home/node/shared + {{- with .Values.webapp.extraVolumeMounts }} + {{- toYaml . | nindent 12 }} + {{- end }} volumes: - name: shared {{- if .Values.persistence.shared.enabled }} @@ -332,6 +335,9 @@ spec: {{- else }} emptyDir: {} {{- end }} + {{- with .Values.webapp.extraVolumes }} + {{- toYaml . | nindent 8 }} + {{- end }} {{- with .Values.webapp.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/hosting/k8s/helm/values.yaml b/hosting/k8s/helm/values.yaml index c3e1559df3..e3d1993aa6 100644 --- a/hosting/k8s/helm/values.yaml +++ b/hosting/k8s/helm/values.yaml @@ -115,6 +115,26 @@ webapp: # name: my-secret # key: secret-key + # Extra volumes for the webapp pod + extraVolumes: + [] + # - name: config-volume + # configMap: + # name: my-config + # - name: secret-volume + # secret: + # secretName: my-secret + + # Extra volume mounts for the webapp container + extraVolumeMounts: + [] + # - name: config-volume + # mountPath: /etc/config + # readOnly: true + # - name: secret-volume + # mountPath: /etc/secrets + # readOnly: true + # ServiceMonitor for Prometheus monitoring serviceMonitor: enabled: false From a471a91371c5940f0b2dee282cbfb22e0c8a29e7 Mon Sep 17 00:00:00 2001 From: nicktrn <55853254+nicktrn@users.noreply.github.com> Date: Wed, 2 Jul 2025 12:54:12 +0100 Subject: [PATCH 4/4] bump version --- hosting/k8s/helm/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/k8s/helm/Chart.yaml b/hosting/k8s/helm/Chart.yaml index be1eb40dc5..fffe0d73b5 100644 --- a/hosting/k8s/helm/Chart.yaml +++ b/hosting/k8s/helm/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: trigger description: The official Trigger.dev Helm chart type: application -version: 4.0.0-beta.13 +version: 4.0.0-beta.14 appVersion: trigger-helm-rc.1 home: https://trigger.dev sources: