From 69455d0b3578bae3233da2a191776f2fe7d46f21 Mon Sep 17 00:00:00 2001
From: Shahar Harari <shahar.harari@sap.com>
Date: Fri, 29 Dec 2023 01:07:15 +0200
Subject: [PATCH] fix(helm): fix incorrect imagePullSecrets indentation

Signed-off-by: Shahar Harari <shahar.harari@sap.com>
---
 charts/gateway-helm/templates/certgen.yaml                | 8 ++++----
 .../gateway-helm/templates/envoy-gateway-deployment.yaml  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/charts/gateway-helm/templates/certgen.yaml b/charts/gateway-helm/templates/certgen.yaml
index 341096e7571..3a228b7959f 100644
--- a/charts/gateway-helm/templates/certgen.yaml
+++ b/charts/gateway-helm/templates/certgen.yaml
@@ -33,11 +33,11 @@ spec:
           value: {{ .Values.kubernetesClusterDomain }}
         image: {{ .Values.deployment.envoyGateway.image.repository }}:{{ .Values.deployment.envoyGateway.image.tag | default .Chart.AppVersion }}
         imagePullPolicy: {{ .Values.deployment.envoyGateway.imagePullPolicy }}
-        {{- with .Values.deployment.envoyGateway.imagePullSecrets }}
-        imagePullSecrets:
-          {{- toYaml . | nindent 8 }}
-        {{- end }}
         name: envoy-gateway-certgen
+      {{- with .Values.deployment.envoyGateway.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       restartPolicy: Never
       securityContext:
         runAsGroup: 65534
diff --git a/charts/gateway-helm/templates/envoy-gateway-deployment.yaml b/charts/gateway-helm/templates/envoy-gateway-deployment.yaml
index aea9f903527..4bbe5b25146 100644
--- a/charts/gateway-helm/templates/envoy-gateway-deployment.yaml
+++ b/charts/gateway-helm/templates/envoy-gateway-deployment.yaml
@@ -51,10 +51,6 @@ spec:
           value: {{ .Values.kubernetesClusterDomain }}
         image: {{ .Values.deployment.envoyGateway.image.repository }}:{{ .Values.deployment.envoyGateway.image.tag | default .Chart.AppVersion }}
         imagePullPolicy: {{ .Values.deployment.envoyGateway.imagePullPolicy }}
-        {{- with .Values.deployment.envoyGateway.imagePullSecrets }}
-        imagePullSecrets:
-          {{- toYaml . | nindent 8 }}
-        {{- end }}
         livenessProbe:
           httpGet:
             path: /healthz
@@ -79,6 +75,10 @@ spec:
         - mountPath: /certs
           name: certs
           readOnly: true
+      {{- with .Values.deployment.envoyGateway.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       securityContext:
         runAsNonRoot: true
       serviceAccountName: envoy-gateway