Service accounts additional labels (#78)

* feat(workerpool-controller): Support additional labels in workerpool controller service account. * feat(vcs-agent): Support additional labels in vcs-agent service account. --------- Co-authored-by: siddharth.deshmukh2 <[email protected]>
spacelift-io · Sep 24, 2024 · 457e7fe · 457e7fe
1 parent 4775e4a
commit 457e7fe
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 2 deletions.
diff --git a/spacelift-workerpool-controller/Chart.yaml b/spacelift-workerpool-controller/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: spacelift-workerpool-controller
 description: A Helm chart for deploying spacelift workerpool controller
 type: application
-version: 0.1.0
+version: 0.2.0
 appVersion: "v0.0.13"
 
 dependencies:

diff --git a/spacelift-workerpool-controller/templates/serviceaccount.yaml b/spacelift-workerpool-controller/templates/serviceaccount.yaml
@@ -7,5 +7,8 @@ metadata:
     app.kubernetes.io/created-by: spacelift-workerpool-controller
     app.kubernetes.io/part-of: spacelift-workerpool-controller
   {{- include "spacelift-workerpool-controller.labels" . | nindent 4 }}
+  {{- with .Values.controllerManager.serviceAccount.labels }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   annotations:
     {{- toYaml .Values.controllerManager.serviceAccount.annotations | nindent 4 }}
diff --git a/spacelift-workerpool-controller/values.yaml b/spacelift-workerpool-controller/values.yaml
@@ -53,6 +53,7 @@ controllerManager:
   podAnnotations: {}
   serviceAccount:
     annotations: {}
+    labels: {}
   nodeSelector: {}
   tolerations: []
   topologySpreadConstraints: []

diff --git a/vcs-agent/Chart.yaml b/vcs-agent/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: vcs-agent
 description: A Helm chart for deploying Spacelift VCS Agent
 type: application
-version: 0.1.0
+version: 0.2.0
 
 # The appVersion is the version of the VCS Agent binary. Since the chart is currently configured
 # to always use the latest version, this is set to "latest".

diff --git a/vcs-agent/templates/serviceaccount.yaml b/vcs-agent/templates/serviceaccount.yaml
@@ -5,6 +5,9 @@ metadata:
   name: {{ include "vcs-agent.serviceAccountName" . }}
   labels:
     {{- include "vcs-agent.labels" . | nindent 4 }}
+    {{- with .Values.serviceAccount.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   {{- with .Values.serviceAccount.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

diff --git a/vcs-agent/values.yaml b/vcs-agent/values.yaml
@@ -34,6 +34,8 @@ serviceAccount:
   # The name of the service account to use.
   # If not set and create is true, a name is generated using the fullname template
   name: ""
+  # Labels to add to the service account
+  labels: {}
 
 vcsagent:
   extraEnv: []