From 6c8a32cf584b7213d3de62d5e3840088ce521d3d Mon Sep 17 00:00:00 2001
From: Benjamin Jee <b.jee@f5.com>
Date: Thu, 9 May 2024 14:09:20 -0700
Subject: [PATCH 1/2] Fix rbac imagePullSecrets template

---
 .../nginx-gateway-fabric/templates/rbac.yaml   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/charts/nginx-gateway-fabric/templates/rbac.yaml b/charts/nginx-gateway-fabric/templates/rbac.yaml
index 69e4992605..7d0999e4c0 100644
--- a/charts/nginx-gateway-fabric/templates/rbac.yaml
+++ b/charts/nginx-gateway-fabric/templates/rbac.yaml
@@ -8,15 +8,15 @@ metadata:
   annotations:
     {{- toYaml .Values.serviceAccount.annotations | nindent 4 }}
   {{- if or .Values.serviceAccount.imagePullSecret .Values.serviceAccount.imagePullSecrets }}
-  imagePullSecrets:
-    {{- if .Values.serviceAccount.imagePullSecret }}
-    - name: {{ .Values.serviceAccount.imagePullSecret }}
-    {{- end }}
-    {{- if .Values.serviceAccount.imagePullSecrets }}
-    {{- range .Values.serviceAccount.imagePullSecrets }}
-    - name: {{ . }}
-    {{- end }}
-    {{- end }}
+imagePullSecrets:
+  {{- if .Values.serviceAccount.imagePullSecret }}
+  - name: {{ .Values.serviceAccount.imagePullSecret }}
+  {{- end }}
+  {{- if .Values.serviceAccount.imagePullSecrets }}
+  {{- range .Values.serviceAccount.imagePullSecrets }}
+  - name: {{ . }}
+  {{- end }}
+  {{- end }}
   {{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1

From dff216a5bbfa9bb664096393d3a68579c5ba47c5 Mon Sep 17 00:00:00 2001
From: Benjamin Jee <b.jee@f5.com>
Date: Thu, 9 May 2024 15:59:02 -0700
Subject: [PATCH 2/2] Fix spacing

---
 charts/nginx-gateway-fabric/templates/rbac.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/nginx-gateway-fabric/templates/rbac.yaml b/charts/nginx-gateway-fabric/templates/rbac.yaml
index 7d0999e4c0..a5e5188e31 100644
--- a/charts/nginx-gateway-fabric/templates/rbac.yaml
+++ b/charts/nginx-gateway-fabric/templates/rbac.yaml
@@ -7,7 +7,7 @@ metadata:
   {{- include "nginx-gateway.labels" . | nindent 4 }}
   annotations:
     {{- toYaml .Values.serviceAccount.annotations | nindent 4 }}
-  {{- if or .Values.serviceAccount.imagePullSecret .Values.serviceAccount.imagePullSecrets }}
+{{- if or .Values.serviceAccount.imagePullSecret .Values.serviceAccount.imagePullSecrets }}
 imagePullSecrets:
   {{- if .Values.serviceAccount.imagePullSecret }}
   - name: {{ .Values.serviceAccount.imagePullSecret }}
@@ -17,7 +17,7 @@ imagePullSecrets:
   - name: {{ . }}
   {{- end }}
   {{- end }}
-  {{- end }}
+{{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole