Allow imagePullSecrets in agents values.yaml

Allows using imagePullSecrets for both the controller & executor's SA.
nrwl · Sep 12, 2024 · 698327b · 698327b
1 parent f4b9c9d
commit 698327b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/charts/nx-agents/Chart.yaml b/charts/nx-agents/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: nx-agents
 description: Nx Cloud Agents Helm Chart
 type: application
-version: 1.2.2
+version: 1.2.3
 maintainers:
   - name: nx
     url: "https://nx.app/"

diff --git a/charts/nx-agents/ci/basic-values.yaml b/charts/nx-agents/ci/basic-values.yaml
@@ -8,8 +8,12 @@ naming:
 serviceAccounts:
   controller:
     annotations: {}
+    imagePullSecrets:
+      - "regcreds"
   runner:
     annotations: {}
+    imagePullSecrets:
+      - "regcreds"
 
 controller:
   deployment:

diff --git a/charts/nx-agents/templates/serviceaccounts.yaml b/charts/nx-agents/templates/serviceaccounts.yaml
@@ -1,6 +1,12 @@
 ---
 apiVersion: v1
 kind: ServiceAccount
+{{- if .Values.serviceAccounts.runner.imagePullSecrets }}
+imagePullSecrets:
+  {{- range .Values.serviceAccounts.runner.imagePullSecrets }}
+  - name: {{ . }}
+  {{- end }}
+{{- end }}
 metadata:
   labels:
     {{- include "nxCloud.app.labels" . | indent 4 }}
@@ -10,10 +16,15 @@ metadata:
   annotations:
     {{- toYaml .Values.serviceAccounts.runner.annotations | nindent 4 }}
   {{- end }}
-
 ---
 apiVersion: v1
 kind: ServiceAccount
+{{- if .Values.serviceAccounts.runner.imagePullSecrets }}
+imagePullSecrets:
+  {{- range .Values.serviceAccounts.runner.imagePullSecrets }}
+  - name: {{ . }}
+  {{- end }}
+{{- end }}
 metadata:
   labels:
     {{- include "nxCloud.app.labels" . | indent 4 }}
@@ -23,5 +34,3 @@ metadata:
   annotations:
     {{- toYaml .Values.serviceAccounts.controller.annotations | nindent 4 }}
   {{- end }}
-
-
diff --git a/charts/nx-agents/values.yaml b/charts/nx-agents/values.yaml
@@ -22,9 +22,11 @@ serviceAccounts:
   controller:
     name: nx-cloud-workflow-controller
     annotations: {}
+    imagePullSecrets: {}
   runner:
     name: nx-cloud-workflow-runner
     annotations: {}
+    imagePullSecrets: {}
 
 # The controller is the main component of the workflow system. It is responsible for managing the state of workflows, starting
 # new runs in your cluster, and managing the agents that run your workflows. It should be internally accessible from both