mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2024-01-19 02:48:24 +00:00
Merge branch 'master' of https://github.com/seaweedfs/seaweedfs
This commit is contained in:
commit
4878e0fd46
|
@ -225,13 +225,13 @@ spec:
|
||||||
{{- if eq .Values.filer.logs.type "hostPath" }}
|
{{- if eq .Values.filer.logs.type "hostPath" }}
|
||||||
- name: seaweedfs-filer-log-volume
|
- name: seaweedfs-filer-log-volume
|
||||||
hostPath:
|
hostPath:
|
||||||
path: /storage/logs/seaweedfs/filer
|
path: {{ .Values.filer.logs.hostPathPrefix }}/logs/seaweedfs/filer
|
||||||
type: DirectoryOrCreate
|
type: DirectoryOrCreate
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if eq .Values.filer.data.type "hostPath" }}
|
{{- if eq .Values.filer.data.type "hostPath" }}
|
||||||
- name: data-filer
|
- name: data-filer
|
||||||
hostPath:
|
hostPath:
|
||||||
path: /storage/filer_store
|
path: {{ .Values.filer.data.hostPathPrefix }}/filer_store
|
||||||
type: DirectoryOrCreate
|
type: DirectoryOrCreate
|
||||||
{{- end }}
|
{{- end }}
|
||||||
- name: db-schema-config-volume
|
- name: db-schema-config-volume
|
||||||
|
|
|
@ -196,13 +196,13 @@ spec:
|
||||||
{{- if eq .Values.master.logs.type "hostPath" }}
|
{{- if eq .Values.master.logs.type "hostPath" }}
|
||||||
- name: seaweedfs-master-log-volume
|
- name: seaweedfs-master-log-volume
|
||||||
hostPath:
|
hostPath:
|
||||||
path: /storage/logs/seaweedfs/master
|
path: {{ .Values.master.logs.hostPathPrefix }}/logs/seaweedfs/master
|
||||||
type: DirectoryOrCreate
|
type: DirectoryOrCreate
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if eq .Values.master.data.type "hostPath" }}
|
{{- if eq .Values.master.data.type "hostPath" }}
|
||||||
- name: data-{{ .Release.Namespace }}
|
- name: data-{{ .Release.Namespace }}
|
||||||
hostPath:
|
hostPath:
|
||||||
path: /ssd/seaweed-master/
|
path: {{ .Values.master.data.hostPathPrefix }}/seaweed-master/
|
||||||
type: DirectoryOrCreate
|
type: DirectoryOrCreate
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.global.enableSecurity }}
|
{{- if .Values.global.enableSecurity }}
|
||||||
|
|
|
@ -79,6 +79,7 @@ spec:
|
||||||
-v={{ .Values.global.loggingLevel }} \
|
-v={{ .Values.global.loggingLevel }} \
|
||||||
{{- end }}
|
{{- end }}
|
||||||
s3 \
|
s3 \
|
||||||
|
-ip.bind={{ .Values.s3.bindAddress }} \
|
||||||
-port={{ .Values.s3.port }} \
|
-port={{ .Values.s3.port }} \
|
||||||
{{- if .Values.s3.metricsPort }}
|
{{- if .Values.s3.metricsPort }}
|
||||||
-metricsPort {{ .Values.s3.metricsPort }} \
|
-metricsPort {{ .Values.s3.metricsPort }} \
|
||||||
|
@ -167,7 +168,7 @@ spec:
|
||||||
{{- if eq .Values.s3.logs.type "hostPath" }}
|
{{- if eq .Values.s3.logs.type "hostPath" }}
|
||||||
- name: logs
|
- name: logs
|
||||||
hostPath:
|
hostPath:
|
||||||
path: /storage/logs/seaweedfs/s3
|
path: {{ .Values.s3.logs.hostPathPrefix }}/logs/seaweedfs/s3
|
||||||
type: DirectoryOrCreate
|
type: DirectoryOrCreate
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.global.enableSecurity }}
|
{{- if .Values.global.enableSecurity }}
|
||||||
|
|
|
@ -206,19 +206,19 @@ spec:
|
||||||
{{- if eq .Values.volume.data.type "hostPath" }}
|
{{- if eq .Values.volume.data.type "hostPath" }}
|
||||||
- name: data
|
- name: data
|
||||||
hostPath:
|
hostPath:
|
||||||
path: /storage/object_store/
|
path: {{ .Values.volume.data.hostPathPrefix }}/object_store/
|
||||||
type: DirectoryOrCreate
|
type: DirectoryOrCreate
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if and (eq .Values.volume.idx.type "hostPath") .Values.volume.dir_idx }}
|
{{- if and (eq .Values.volume.idx.type "hostPath") .Values.volume.dir_idx }}
|
||||||
- name: idx
|
- name: idx
|
||||||
hostPath:
|
hostPath:
|
||||||
path: /ssd/seaweedfs-volume-idx/
|
path: {{ .Values.volume.idx.hostPathPrefix }}/seaweedfs-volume-idx/
|
||||||
type: DirectoryOrCreate
|
type: DirectoryOrCreate
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if eq .Values.volume.logs.type "hostPath" }}
|
{{- if eq .Values.volume.logs.type "hostPath" }}
|
||||||
- name: logs
|
- name: logs
|
||||||
hostPath:
|
hostPath:
|
||||||
path: /storage/logs/seaweedfs/volume
|
path: {{ .Values.volume.logs.hostPathPrefix }}/logs/seaweedfs/volume
|
||||||
type: DirectoryOrCreate
|
type: DirectoryOrCreate
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.global.enableSecurity }}
|
{{- if .Values.global.enableSecurity }}
|
||||||
|
|
|
@ -68,11 +68,13 @@ master:
|
||||||
type: "hostPath"
|
type: "hostPath"
|
||||||
size: ""
|
size: ""
|
||||||
storageClass: ""
|
storageClass: ""
|
||||||
|
hostPathPrefix: /ssd
|
||||||
|
|
||||||
logs:
|
logs:
|
||||||
type: "hostPath"
|
type: "hostPath"
|
||||||
size: ""
|
size: ""
|
||||||
storageClass: ""
|
storageClass: ""
|
||||||
|
hostPathPrefix: /storage
|
||||||
|
|
||||||
initContainers: ""
|
initContainers: ""
|
||||||
|
|
||||||
|
@ -176,15 +178,19 @@ volume:
|
||||||
type: "hostPath"
|
type: "hostPath"
|
||||||
size: ""
|
size: ""
|
||||||
storageClass: ""
|
storageClass: ""
|
||||||
|
hostPathPrefix: /storage
|
||||||
|
|
||||||
idx:
|
idx:
|
||||||
type: "hostPath"
|
type: "hostPath"
|
||||||
size: ""
|
size: ""
|
||||||
storageClass: ""
|
storageClass: ""
|
||||||
|
hostPathPrefix: /ssd
|
||||||
|
|
||||||
logs:
|
logs:
|
||||||
type: "hostPath"
|
type: "hostPath"
|
||||||
size: ""
|
size: ""
|
||||||
storageClass: ""
|
storageClass: ""
|
||||||
|
hostPathPrefix: /storage
|
||||||
|
|
||||||
# limit background compaction or copying speed in mega bytes per second
|
# limit background compaction or copying speed in mega bytes per second
|
||||||
compactionMBps: "50"
|
compactionMBps: "50"
|
||||||
|
@ -308,11 +314,13 @@ filer:
|
||||||
type: "hostPath"
|
type: "hostPath"
|
||||||
size: ""
|
size: ""
|
||||||
storageClass: ""
|
storageClass: ""
|
||||||
|
hostPathPrefix: /storage
|
||||||
|
|
||||||
logs:
|
logs:
|
||||||
type: "hostPath"
|
type: "hostPath"
|
||||||
size: ""
|
size: ""
|
||||||
storageClass: ""
|
storageClass: ""
|
||||||
|
hostPathPrefix: /storage
|
||||||
|
|
||||||
initContainers: ""
|
initContainers: ""
|
||||||
|
|
||||||
|
@ -418,6 +426,7 @@ s3:
|
||||||
imageTag: null
|
imageTag: null
|
||||||
restartPolicy: null
|
restartPolicy: null
|
||||||
replicas: 1
|
replicas: 1
|
||||||
|
bindAddress: 0.0.0.0
|
||||||
port: 8333
|
port: 8333
|
||||||
metricsPort: 9327
|
metricsPort: 9327
|
||||||
loggingOverrideLevel: null
|
loggingOverrideLevel: null
|
||||||
|
@ -463,7 +472,7 @@ s3:
|
||||||
type: "hostPath"
|
type: "hostPath"
|
||||||
size: ""
|
size: ""
|
||||||
storageClass: ""
|
storageClass: ""
|
||||||
|
hostPathPrefix: /storage
|
||||||
|
|
||||||
certificates:
|
certificates:
|
||||||
commonName: "SeaweedFS CA"
|
commonName: "SeaweedFS CA"
|
||||||
|
|
Loading…
Reference in a new issue