[bitnami/cassandra] Fix merge issue

bitnami/cassandra/Chart.yaml

@@ -1,5 +1,5 @@
 name: cassandra
-version: 2.1.0
+version: 2.1.1
 appVersion: 3.11.3
 description: Apache Cassandra is a free and open-source distributed database management system designed to handle large amounts of data across many commodity servers, providing high availability with no single point of failure. Cassandra offers robust support for clusters spanning multiple datacenters, with asynchronous masterless replication allowing low latency operations for all clients.
 icon: https://bitnami.com/assets/stacks/cassandra/img/cassandra-stack-220x234.png

bitnami/cassandra/templates/statefulset.yaml

@@ -222,20 +222,21 @@ spec:
               path: keystore
             - key: truststore
               path: truststore
+{{- end }}
 {{- if or (.Files.Glob "files/conf/*") .Values.existingConfiguration }}
       - name: configurations
         configMap:
           name: {{ template "cassandra.configurationCM" . }}
 {{- end }}
-{{- if not .Values.persistence.enabled }}
-      - name: data
-        emptyDir: {}
-{{- else }}
 {{- if or (.Files.Glob "files/docker-entrypoint-initdb.d/*") (.Values.initDBConfigMap) }}
       - name: init-db
         configMap:
           name: {{ template "cassandra.initDbCM" . }}
 {{- end }}
+{{- if not .Values.persistence.enabled }}
+      - name: data
+        emptyDir: {}
+{{- else }}
   volumeClaimTemplates:
   - metadata:
       name: data