From 5fa8f40fdfa2521a12d6463b5d1e6bd7b95fbd45 Mon Sep 17 00:00:00 2001
From: spastorclovr <134076845+spastorclovr@users.noreply.github.com>
Date: Mon, 29 Jan 2024 16:11:37 +0100
Subject: [PATCH] Fix/bad mount path better default value (#5253)

---
 .../templates/volume-statefulset.yaml         |  4 +-
 k8s/charts/seaweedfs/values.yaml              | 38 ++++++++++++-------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/k8s/charts/seaweedfs/templates/volume-statefulset.yaml b/k8s/charts/seaweedfs/templates/volume-statefulset.yaml
index 09c5f7d45..eef8f521f 100644
--- a/k8s/charts/seaweedfs/templates/volume-statefulset.yaml
+++ b/k8s/charts/seaweedfs/templates/volume-statefulset.yaml
@@ -62,7 +62,7 @@ spec:
           args: [ 'ls {{range $dir :=  .Values.volume.dataDirs }}/{{$dir.name}}/*.idx {{end}} && xargs -I {} mv {} /idx/' ]
           volumeMounts:
             - name: idx
-              mountPath: {{ .Values.volume.idx.name }}
+              mountPath: /idx
           {{- range $dir :=  .Values.volume.dataDirs }} 
             - name: {{ $dir.name }}
               mountPath: /{{ $dir.name }}
@@ -119,7 +119,7 @@ spec:
                 {{- end }}
                 -dir {{range $index, $dir :=  .Values.volume.dataDirs }}{{if ne $index 0}},{{end}}/{{$dir.name}}{{end}} \
                 {{- if .Values.volume.idx }}
-                -dir.idx= /idx \
+                -dir.idx=/idx \
                 {{- end }}
                 -max {{range $index, $dir :=  .Values.volume.dataDirs }}{{if ne $index 0}},{{end}}{{$dir.maxVolumes}}{{end}} \
                 {{- if .Values.volume.rack }}
diff --git a/k8s/charts/seaweedfs/values.yaml b/k8s/charts/seaweedfs/values.yaml
index b0bcaf837..f8938ac1f 100644
--- a/k8s/charts/seaweedfs/values.yaml
+++ b/k8s/charts/seaweedfs/values.yaml
@@ -247,20 +247,19 @@ volume:
   #     storageClass: "local-path-provisioner"
   #     annotations:
   #      "key": "value"
-  #     maxVolumes: 0
+  #     maxVolumes: 0  # If set to zero on non-windows OS, the limit will be auto configured. (default "7")
   #
   # You may also spacify an existing claim:
   #    - name: data
   #      type: "existingClaim"
   #      claimName: "my-pvc"
-  #     maxVolumes: 0
-
+  #     maxVolumes: 0  # If set to zero on non-windows OS, the limit will be auto configured. (default "7")
 
   dataDirs:
    - name: data1
      type: "hostPath"
      hostPathPrefix: /ssd
-     maxVolumes: 0   # If set to zero on non-windows OS, the limit will be auto configured. (default "7")
+     maxVolumes: 0 
 
    #- name: data2
    #  type: "persistentVolumeClaim"
@@ -268,19 +267,30 @@ volume:
    #  size: "800Gi"
    #  maxVolumes: 0
 
+  # idx can be defined by:
+  #
+  # idx:
+  #  type: "hostPath"
+  #  hostPathPrefix: /ssd
+  #
+  # or
+  #
+  # idx:
+  #  type: "persistentVolumeClaim"
+  #  size: "20Gi"
+  #  storageClass: "local-path-provisioner"
+  #
+  # or
+  #
+  # idx:
+  #   type: "existingClaim"
+  #   claimName: "myClaim"
 
-  idx:
-    type: "hostPath"
-    size: ""
-    storageClass: ""
-    hostPathPrefix: /ssd
+  # same applies to "logs"
 
+  idx: ""
 
-  logs:
-    type: "hostPath"
-    size: ""
-    storageClass: ""
-    hostPathPrefix: /storage
+  logs: ""
 
   # limit background compaction or copying speed in mega bytes per second
   compactionMBps: "50"