From 917a994bbac97eb091432f107b8674c6b42d148b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E6=8C=AF=E5=AE=87?= <>
Date: Mon, 30 Dec 2024 18:02:24 +0800
Subject: [PATCH] fix(deployments): add imagePullSecrets configuration to
 backend and frontend YAML files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 孙振宇 <>
---
 .../magicleaps/templates/deployments/backend.yaml         | 8 ++++----
 .../magicleaps/templates/deployments/frontend.yaml        | 8 ++++----
 magicleaps/helm-pkg/magicleaps/values.alpha.yaml          | 7 ++++---
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/magicleaps/helm-pkg/magicleaps/templates/deployments/backend.yaml b/magicleaps/helm-pkg/magicleaps/templates/deployments/backend.yaml
index 357002c0..a18ae676 100644
--- a/magicleaps/helm-pkg/magicleaps/templates/deployments/backend.yaml
+++ b/magicleaps/helm-pkg/magicleaps/templates/deployments/backend.yaml
@@ -16,6 +16,10 @@ spec:
       labels:
         {{- include "magicleaps.backend.labels" . | nindent 8 }}
     spec:
+      {{- if .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml .Values.imagePullSecrets | nindent 8 }}
+      {{- end }}
       containers:
         - name: {{ .Values.backend.name }}
           image: "{{ .Values.backend.image.repository }}/{{ .Values.backend.image.name }}{{ if .Values.backend.image.tag }}:{{ .Values.backend.image.tag }}{{ end }}"
@@ -80,8 +84,4 @@ spec:
                 secretKeyRef:
                   name: backend-secrets
                   key: LOG_LEVEL
-{{- if .Values.imagePullSecrets -}}
-      imagePullSecrets:
-        {{- toYaml .Values.imagePullSecrets | nindent 8 }}
-{{- end -}}
 {{- end -}}
\ No newline at end of file
diff --git a/magicleaps/helm-pkg/magicleaps/templates/deployments/frontend.yaml b/magicleaps/helm-pkg/magicleaps/templates/deployments/frontend.yaml
index 883c5303..8700ece5 100644
--- a/magicleaps/helm-pkg/magicleaps/templates/deployments/frontend.yaml
+++ b/magicleaps/helm-pkg/magicleaps/templates/deployments/frontend.yaml
@@ -16,6 +16,10 @@ spec:
       labels:
         {{- include "magicleaps.frontend.labels" . | nindent 8 }}
     spec:
+      {{- if .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml .Values.imagePullSecrets | nindent 8 }}
+      {{- end }}
       containers:
         - name: {{ .Values.frontend.name }}
           image: "{{ .Values.frontend.image.repository }}/{{ .Values.frontend.image.name }}{{ if .Values.frontend.image.tag }}:{{ .Values.frontend.image.tag }}{{ end }}"
@@ -34,8 +38,4 @@ spec:
           resources:
             {{- toYaml .Values.frontend.resources | nindent 12 }}
           {{- end }}
-      {{- if .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml .Values.imagePullSecrets | nindent 8 }}
-      {{- end }}
 {{- end }}
diff --git a/magicleaps/helm-pkg/magicleaps/values.alpha.yaml b/magicleaps/helm-pkg/magicleaps/values.alpha.yaml
index 972481c0..9fdb0dcb 100644
--- a/magicleaps/helm-pkg/magicleaps/values.alpha.yaml
+++ b/magicleaps/helm-pkg/magicleaps/values.alpha.yaml
@@ -1,9 +1,10 @@
-imagePullSecrets: []
+imagePullSecrets: 
+  - name: docker-secret
 backend:
   enabled: true
   name: magicleaps-backend
   image:
-    repository: docker.io/magicleaps
+    repository: docker.io/zhenyus
     name: magicleaps
     imagePullPolicy: IfNotPresent
     tag: "backend-snapshot-5e9dea2-linux-amd64"
@@ -47,7 +48,7 @@ frontend:
   enabled: true
   name: magicleaps-frontend
   image:
-    repository: docker.io/magicleaps
+    repository: docker.io/zhenyus
     name: magicleaps
     imagePullPolicy: IfNotPresent
     tag: "frontend-snapshot-5e9dea2-linux-amd64"