From 3000d7f1ef2fd8714d69f61ef5ddcc0521190496 Mon Sep 17 00:00:00 2001
From: weixiao-huang <hwx.simle@gmail.com>
Date: Thu, 9 Nov 2023 14:03:37 +0800
Subject: [PATCH] feat: auto detect storage volumeMount while setting it in
 volumeMounts

Signed-off-by: huangweixiao <huangweixiao@msh.team>
---
 .../templates/seed-peer/seed-peer-statefulset.yaml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/charts/dragonfly/templates/seed-peer/seed-peer-statefulset.yaml b/charts/dragonfly/templates/seed-peer/seed-peer-statefulset.yaml
index 9ed4703b..c3026984 100644
--- a/charts/dragonfly/templates/seed-peer/seed-peer-statefulset.yaml
+++ b/charts/dragonfly/templates/seed-peer/seed-peer-statefulset.yaml
@@ -115,13 +115,19 @@ spec:
           items:
           - key: dfget.yaml
             path: dfget.yaml
-      {{- if not (.Values.seedPeer.persistence.enable) }}
-      - name: storage
-        emptyDir: {}
-      {{- end }}
+      {{- $needStorage := true }}
       {{- if .Values.seedPeer.extraVolumes }}
+      {{- range .Values.seedPeer.extraVolumes }}
+      {{- if eq .name "storage" }}
+      {{- $needStorage = false }}
+      {{- end }}
+      {{- end }}
       {{- toYaml .Values.seedPeer.extraVolumes | nindent 6 }}
       {{- end }}
+      {{- if and (not (.Values.seedPeer.persistence.enable)) $needStorage }}
+      - name: storage
+        emptyDir: { }
+      {{- end }}
   {{- if .Values.seedPeer.persistence.enable }}
   volumeClaimTemplates:
     - metadata: