diff --git a/k8s/helm_charts2/templates/filer-statefulset.yaml b/k8s/helm_charts2/templates/filer-statefulset.yaml index 689c1092c..978cdeec8 100644 --- a/k8s/helm_charts2/templates/filer-statefulset.yaml +++ b/k8s/helm_charts2/templates/filer-statefulset.yaml @@ -225,13 +225,13 @@ spec: {{- if eq .Values.filer.logs.type "hostPath" }} - name: seaweedfs-filer-log-volume hostPath: - path: /storage/logs/seaweedfs/filer + path: {{ .Values.filer.logs.hostPathPrefix }}/logs/seaweedfs/filer type: DirectoryOrCreate {{- end }} {{- if eq .Values.filer.data.type "hostPath" }} - name: data-filer hostPath: - path: /storage/filer_store + path: {{ .Values.filer.data.hostPathPrefix }}/filer_store type: DirectoryOrCreate {{- end }} - name: db-schema-config-volume diff --git a/k8s/helm_charts2/templates/master-statefulset.yaml b/k8s/helm_charts2/templates/master-statefulset.yaml index 0b58843fd..c31962036 100644 --- a/k8s/helm_charts2/templates/master-statefulset.yaml +++ b/k8s/helm_charts2/templates/master-statefulset.yaml @@ -196,13 +196,13 @@ spec: {{- if eq .Values.master.logs.type "hostPath" }} - name: seaweedfs-master-log-volume hostPath: - path: /storage/logs/seaweedfs/master + path: {{ .Values.master.logs.hostPathPrefix }}/logs/seaweedfs/master type: DirectoryOrCreate {{- end }} {{- if eq .Values.master.data.type "hostPath" }} - name: data-{{ .Release.Namespace }} hostPath: - path: /ssd/seaweed-master/ + path: {{ .Values.master.data.hostPathPrefix }}/seaweed-master/ type: DirectoryOrCreate {{- end }} {{- if .Values.global.enableSecurity }} diff --git a/k8s/helm_charts2/templates/s3-deployment.yaml b/k8s/helm_charts2/templates/s3-deployment.yaml index b9efef827..c9e12e9cb 100644 --- a/k8s/helm_charts2/templates/s3-deployment.yaml +++ b/k8s/helm_charts2/templates/s3-deployment.yaml @@ -79,6 +79,7 @@ spec: -v={{ .Values.global.loggingLevel }} \ {{- end }} s3 \ + -ip.bind={{ .Values.s3.bindAddress }} \ -port={{ .Values.s3.port }} \ {{- if .Values.s3.metricsPort }} -metricsPort {{ .Values.s3.metricsPort }} \ @@ -167,7 +168,7 @@ spec: {{- if eq .Values.s3.logs.type "hostPath" }} - name: logs hostPath: - path: /storage/logs/seaweedfs/s3 + path: {{ .Values.s3.logs.hostPathPrefix }}/logs/seaweedfs/s3 type: DirectoryOrCreate {{- end }} {{- if .Values.global.enableSecurity }} diff --git a/k8s/helm_charts2/templates/volume-statefulset.yaml b/k8s/helm_charts2/templates/volume-statefulset.yaml index 0201c9cc4..55431f477 100644 --- a/k8s/helm_charts2/templates/volume-statefulset.yaml +++ b/k8s/helm_charts2/templates/volume-statefulset.yaml @@ -206,19 +206,19 @@ spec: {{- if eq .Values.volume.data.type "hostPath" }} - name: data hostPath: - path: /storage/object_store/ + path: {{ .Values.volume.data.hostPathPrefix }}/object_store/ type: DirectoryOrCreate {{- end }} {{- if and (eq .Values.volume.idx.type "hostPath") .Values.volume.dir_idx }} - name: idx hostPath: - path: /ssd/seaweedfs-volume-idx/ + path: {{ .Values.volume.idx.hostPathPrefix }}/seaweedfs-volume-idx/ type: DirectoryOrCreate {{- end }} {{- if eq .Values.volume.logs.type "hostPath" }} - name: logs hostPath: - path: /storage/logs/seaweedfs/volume + path: {{ .Values.volume.logs.hostPathPrefix }}/logs/seaweedfs/volume type: DirectoryOrCreate {{- end }} {{- if .Values.global.enableSecurity }} diff --git a/k8s/helm_charts2/values.yaml b/k8s/helm_charts2/values.yaml index 02978927b..21d031eb5 100644 --- a/k8s/helm_charts2/values.yaml +++ b/k8s/helm_charts2/values.yaml @@ -68,11 +68,13 @@ master: type: "hostPath" size: "" storageClass: "" + hostPathPrefix: /ssd logs: type: "hostPath" size: "" storageClass: "" + hostPathPrefix: /storage initContainers: "" @@ -176,15 +178,19 @@ volume: type: "hostPath" size: "" storageClass: "" + hostPathPrefix: /storage + idx: type: "hostPath" size: "" storageClass: "" + hostPathPrefix: /ssd logs: type: "hostPath" size: "" storageClass: "" + hostPathPrefix: /storage # limit background compaction or copying speed in mega bytes per second compactionMBps: "50" @@ -308,11 +314,13 @@ filer: type: "hostPath" size: "" storageClass: "" + hostPathPrefix: /storage logs: type: "hostPath" size: "" storageClass: "" + hostPathPrefix: /storage initContainers: "" @@ -418,6 +426,7 @@ s3: imageTag: null restartPolicy: null replicas: 1 + bindAddress: 0.0.0.0 port: 8333 metricsPort: 9327 loggingOverrideLevel: null @@ -463,7 +472,7 @@ s3: type: "hostPath" size: "" storageClass: "" - + hostPathPrefix: /storage certificates: commonName: "SeaweedFS CA"