From cac0ee7f846d5e6f5401a3c9442f606a951dd59b Mon Sep 17 00:00:00 2001
From: deen13 <dierkes@smartsquare.de>
Date: Tue, 16 Mar 2021 16:58:19 +0100
Subject: [PATCH] fix(helm): Move pullSecrets up to pod level

Previously the pullSecrets was defined on container level which is not supported by kubernetes.
---
 deploy/charts/emqx/templates/StatefulSet.yaml | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/deploy/charts/emqx/templates/StatefulSet.yaml b/deploy/charts/emqx/templates/StatefulSet.yaml
index c364ec83d..db6c28815 100644
--- a/deploy/charts/emqx/templates/StatefulSet.yaml
+++ b/deploy/charts/emqx/templates/StatefulSet.yaml
@@ -88,17 +88,17 @@ spec:
       {{- if .Values.initContainers }}
       initContainers:
 {{ toYaml .Values.initContainers | indent 8 }}
+      {{- end }}
+      {{- if .Values.image.pullSecrets }}
+      imagePullSecrets:
+        {{- range .Values.image.pullSecrets }}
+        - name: {{ . }}
+      {{- end }}
       {{- end }}
       containers:
         - name: emqx
           image: "{{ .Values.image.repository }}:{{ .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          {{- if .Values.image.pullSecrets }}
-          imagePullSecrets:
-          {{- range .Values.image.pullSecrets }}
-          - name: {{ . }}
-          {{- end }}
-          {{- end }}
           ports:
           - name: mqtt
             containerPort: {{ .Values.emqxConfig.EMQX_LISTENER__TCP__EXTERNAL | default 1883 }}
@@ -120,14 +120,14 @@ spec:
             containerPort: 4370
           envFrom:
             - configMapRef:
-                name: {{ include "emqx.fullname" . }}-env 
+                name: {{ include "emqx.fullname" . }}-env
           env:
           - name: EMQX_NAME
-            value: {{ .Release.Name }} 
+            value: {{ .Release.Name }}
           - name: EMQX_CLUSTER__K8S__APP_NAME
-            value: {{ .Release.Name }} 
+            value: {{ .Release.Name }}
           - name: EMQX_CLUSTER__DISCOVERY
-            value: k8s 
+            value: k8s
           - name: EMQX_CLUSTER__K8S__SERVICE_NAME
             value: {{ include "emqx.fullname" . }}-headless
           - name: EMQX_CLUSTER__K8S__NAMESPACE