Merge pull request #133 from nrwl/imagePullSecrets-agents

Use literal YAML for imagePullSecrets
nrwl · Sep 12, 2024 · 00703fd · 00703fd
2 parents e174539 + bb8d0f5
commit 00703fd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 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.3
+version: 1.2.4
 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
@@ -9,11 +9,11 @@ serviceAccounts:
   controller:
     annotations: {}
     imagePullSecrets:
-      - "regcreds"
+      - name: controller
   runner:
     annotations: {}
     imagePullSecrets:
-      - "regcreds"
+      - name: runner
 
 controller:
   deployment:

diff --git a/charts/nx-agents/templates/serviceaccounts.yaml b/charts/nx-agents/templates/serviceaccounts.yaml
@@ -3,9 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 {{- if .Values.serviceAccounts.runner.imagePullSecrets }}
 imagePullSecrets:
-  {{- range .Values.serviceAccounts.runner.imagePullSecrets }}
-  - name: {{ . }}
-  {{- end }}
+  {{- toYaml .Values.serviceAccounts.runner.imagePullSecrets | nindent 2 }}
 {{- end }}
 metadata:
   labels:
@@ -19,11 +17,9 @@ metadata:
 ---
 apiVersion: v1
 kind: ServiceAccount
-{{- if .Values.serviceAccounts.runner.imagePullSecrets }}
+{{- if .Values.serviceAccounts.controller.imagePullSecrets }}
 imagePullSecrets:
-  {{- range .Values.serviceAccounts.runner.imagePullSecrets }}
-  - name: {{ . }}
-  {{- end }}
+  {{- toYaml .Values.serviceAccounts.controller.imagePullSecrets | nindent 2 }}
 {{- end }}
 metadata:
   labels:

diff --git a/charts/nx-agents/values.yaml b/charts/nx-agents/values.yaml
@@ -22,11 +22,11 @@ serviceAccounts:
   controller:
     name: nx-cloud-workflow-controller
     annotations: {}
-    imagePullSecrets: {}
+    imagePullSecrets: []
   runner:
     name: nx-cloud-workflow-runner
     annotations: {}
-    imagePullSecrets: {}
+    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