helm: Enable setting engine pod annotations (dagger#9623)

jasonmccallister · Feb 20, 2025 · 9903699 · 9903699
1 parent 5859b9b
commit 9903699
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/helm/dagger/.changes/unreleased/Added-20250219-113502.yaml b/helm/dagger/.changes/unreleased/Added-20250219-113502.yaml
@@ -0,0 +1,6 @@
+kind: Added
+body: 'helm: Enable setting engine pod annotations'
+time: 2025-02-19T11:35:02.695824Z
+custom:
+    Author: vmaffet
+    PR: "9623"
diff --git a/helm/dagger/templates/engine-daemonset.yaml b/helm/dagger/templates/engine-daemonset.yaml
@@ -13,14 +13,17 @@ spec:
       name: {{ include "dagger.fullname" . }}-engine
   template:
     metadata:
-      {{- if (or .Values.engine.config .Values.magicache.enabled) }}
+      {{- if (or .Values.engine.config .Values.magicache.enabled .Values.engine.annotations) }}
       annotations:
         {{- if .Values.engine.config }}
         checksum/config: {{ include (print $.Template.BasePath "/engine-config.yaml") . | sha256sum }}
         {{- end }}
         {{- if .Values.magicache.enabled }}
         checksum/secret: {{ include (print $.Template.BasePath "/magicache-secret.yaml") . | sha256sum }}
         {{- end }}
+      {{- with .Values.engine.annotations }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- end }}
       labels:
         name: {{ include "dagger.fullname" . }}-engine

diff --git a/helm/dagger/templates/engine-statefulset.yaml b/helm/dagger/templates/engine-statefulset.yaml
@@ -16,14 +16,17 @@ spec:
       name: {{ include "dagger.fullname" . }}-engine
   template:
     metadata:
-      {{- if (or .Values.engine.config .Values.magicache.enabled) }}
+      {{- if (or .Values.engine.config .Values.magicache.enabled .Values.engine.annotations) }}
       annotations:
         {{- if .Values.engine.config }}
         checksum/config: {{ include (print $.Template.BasePath "/engine-config.yaml") . | sha256sum }}
         {{- end }}
         {{- if .Values.magicache.enabled }}
         checksum/secret: {{ include (print $.Template.BasePath "/magicache-secret.yaml") . | sha256sum }}
         {{- end }}
+      {{- with .Values.engine.annotations }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- end }}
       labels:
         name: {{ include "dagger.fullname" . }}-engine

diff --git a/helm/dagger/values.yaml b/helm/dagger/values.yaml
@@ -14,6 +14,9 @@ engine:
   #     mirrors = ["mirror.gcr.io"]
   #   [log]
   #     format = "json"
+
+  annotations: {}
+
   labels: {}
 
   ### `DaemonSet` guarantees a single Engine per K8s node (default behaviour)