move serviceAccountName out of if block (#6783)

stable/redis/Chart.yaml

@@ -1,5 +1,5 @@
 name: redis
-version: 3.7.0
+version: 3.7.1
 appVersion: 4.0.10
 description: Open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets.
 keywords:

stable/redis/templates/metrics-deployment.yaml

@@ -30,10 +30,10 @@ spec:
         {{- end}}
       {{- end}}
       {{- if .Values.metrics.nodeSelector }}
-      serviceAccountName: "{{ template "redis.serviceAccountName" . }}"
       nodeSelector:
 {{ toYaml .Values.metrics.nodeSelector | indent 8 }}
       {{- end }}
+      serviceAccountName: "{{ template "redis.serviceAccountName" . }}"
       {{- if .Values.metrics.tolerations }}
       tolerations:
 {{ toYaml .Values.metrics.tolerations | indent 8 }}