From f178d640ec66c0c4b1690a12c82f4f65c7e53a56 Mon Sep 17 00:00:00 2001
From: sunshine <henrique.fernandes@turbi.com.br>
Date: Wed, 15 Apr 2026 08:24:51 -0300
Subject: [PATCH] feat: add optional custom serviceAccount name for lake, ui
 and grafana deployments

---
 charts/devlake/templates/deployments.yaml |  6 ++++++
 charts/devlake/values.yaml                | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/charts/devlake/templates/deployments.yaml b/charts/devlake/templates/deployments.yaml
index 6702169..a81c8c5 100644
--- a/charts/devlake/templates/deployments.yaml
+++ b/charts/devlake/templates/deployments.yaml
@@ -51,6 +51,9 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.ui.serviceAccount.name }}
+      serviceAccountName: {{ . }}
+      {{- end }}
       {{- with .Values.ui.securityContext }}
       securityContext:
         {{- toYaml . | nindent 8 }}
@@ -155,6 +158,9 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.lake.serviceAccount.name }}
+      serviceAccountName: {{ . }}
+      {{- end }}
       {{- with .Values.lake.securityContext }}
       securityContext:
       {{- toYaml . | nindent 8 }}
diff --git a/charts/devlake/values.yaml b/charts/devlake/values.yaml
index f8a091c..6c05c52 100644
--- a/charts/devlake/values.yaml
+++ b/charts/devlake/values.yaml
@@ -265,6 +265,11 @@ lake:
   #     subPath: test_file.yaml
   volumeMounts: []
 
+  # Name of an existing ServiceAccount to use for the lake pod.
+  # If empty, the pod uses the namespace default ServiceAccount.
+  serviceAccount:
+    name: ""
+
 ui:
   replicaCount: 1
   revisionHistoryLimit: 10
@@ -343,6 +348,11 @@ ui:
 
   ## Side Contaainer Configuration
   extraContainers: []
+
+  # Name of an existing ServiceAccount to use for the config-ui pod.
+  # If empty, the pod uses the namespace default ServiceAccount.
+  serviceAccount:
+    name: ""
 #  - name: vault-agent
 #    image: vault:1.6.2
 #    args: