From 25c3b868fd153cb9a80cd8edc5cd756872451701 Mon Sep 17 00:00:00 2001
From: Ben Grabham <git@chillichef.com>
Date: Tue, 18 May 2021 14:41:53 +0100
Subject: [PATCH] ceph: fix helm chart to allow multiple filesystems

Fix helm chart to allow multiple filesystems. This isn't required for Pacific but when upgrading from 1.5.x this is usually still set.

Signed-off-by: Ben Grabham <git@chillichef.com>
---
 cluster/charts/rook-ceph/templates/deployment.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cluster/charts/rook-ceph/templates/deployment.yaml b/cluster/charts/rook-ceph/templates/deployment.yaml
index ebab5840a..c06db620c 100644
--- a/cluster/charts/rook-ceph/templates/deployment.yaml
+++ b/cluster/charts/rook-ceph/templates/deployment.yaml
@@ -288,14 +288,14 @@ spec:
         - name: ROOK_UNREACHABLE_NODE_TOLERATION_SECONDS
           value: {{ .Values.unreachableNodeTolerationSeconds | quote }}
 {{- end }}
-{{- if .Values.resources }}
-        resources:
-{{ toYaml .Values.resources | indent 10 }}
-{{- end }}
 {{- if .Values.allowMultipleFilesystems }}
         - name: ROOK_ALLOW_MULTIPLE_FILESYSTEMS
           value: {{ .Values.allowMultipleFilesystems | quote }}
 {{- end }}
+{{- if .Values.resources }}
+        resources:
+{{ toYaml .Values.resources | indent 10 }}
+{{- end }}
 {{- if .Values.useOperatorHostNetwork }}
       hostNetwork: true
 {{- end }}