From 0424e3c8b64f181acf0caed0060ce482b5f845f0 Mon Sep 17 00:00:00 2001
From: Michael Raimondi <mike@mikeraimondi.com>
Date: Tue, 24 Jul 2018 03:03:24 -0400
Subject: [PATCH] move serviceAccountName out of if block (#6783)

---
 stable/redis/Chart.yaml                        | 2 +-
 stable/redis/templates/metrics-deployment.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/stable/redis/Chart.yaml b/stable/redis/Chart.yaml
index 6eb5b0719c..da64846768 100644
--- a/stable/redis/Chart.yaml
+++ b/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:
diff --git a/stable/redis/templates/metrics-deployment.yaml b/stable/redis/templates/metrics-deployment.yaml
index e4774dc27a..2a020395f8 100644
--- a/stable/redis/templates/metrics-deployment.yaml
+++ b/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 }}