From d3f381f1375d4984873117b57b3784c15af3492c Mon Sep 17 00:00:00 2001 From: pmariglia Date: Thu, 12 Sep 2024 15:18:47 -0400 Subject: [PATCH] Use literal YAML for imagePullSecrets --- charts/nx-agents/Chart.yaml | 2 +- charts/nx-agents/ci/basic-values.yaml | 4 ++-- charts/nx-agents/templates/serviceaccounts.yaml | 10 +++------- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/charts/nx-agents/Chart.yaml b/charts/nx-agents/Chart.yaml index e34a70c..8646daa 100644 --- 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 index 6f4994a..cbf6526 100644 --- 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 index 6113ba3..f1ebd26 100644 --- 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 4 }} {{- 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 4 }} {{- end }} metadata: labels: