diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2025-12-08 23:21:02 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-08 23:21:02 -0800 |
| commit | d5f21fd8ba6ee20c2504455093a9ceeaa178b826 (patch) | |
| tree | 6caa7b2cac8f47f5c64d40a6d41924de53481e32 /docker | |
| parent | cea12ba3c4df7b54027aa550043ca347bf3f3be4 (diff) | |
| download | seaweedfs-d5f21fd8ba6ee20c2504455093a9ceeaa178b826.tar.xz seaweedfs-d5f21fd8ba6ee20c2504455093a9ceeaa178b826.zip | |
fix: add missing backslash for volume extraArgs in helm chart (#7676)
Fixes #7467
The -mserver argument line in volume-statefulset.yaml was missing a
trailing backslash, which prevented extraArgs from being passed to
the weed volume process.
Also:
- Extracted master server list generation logic into shared helper
templates in _helpers.tpl for better maintainability
- Updated all occurrences of deprecated -mserver flag to -master
across docker-compose files, test files, and documentation
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/admin_integration/docker-compose-ec-test.yml | 12 | ||||
| -rw-r--r-- | docker/compose/e2e-mount.yml | 2 | ||||
| -rw-r--r-- | docker/compose/local-brokers-compose.yml | 6 | ||||
| -rw-r--r-- | docker/compose/local-cluster-compose.yml | 6 | ||||
| -rw-r--r-- | docker/compose/local-dev-compose.yml | 2 | ||||
| -rw-r--r-- | docker/compose/local-hashicorp-raft-compose.yml | 6 | ||||
| -rw-r--r-- | docker/compose/local-k8s-compose.yml | 2 | ||||
| -rw-r--r-- | docker/compose/local-minio-gateway-compose.yml | 2 | ||||
| -rw-r--r-- | docker/compose/local-mount-compose.yml | 2 | ||||
| -rw-r--r-- | docker/compose/local-mount-profile-compose.yml | 2 | ||||
| -rw-r--r-- | docker/compose/local-nextcloud-compose.yml | 2 | ||||
| -rw-r--r-- | docker/compose/local-registry-compose.yml | 2 | ||||
| -rw-r--r-- | docker/compose/local-replicate-compose.yml | 2 | ||||
| -rw-r--r-- | docker/compose/local-s3tests-compose.yml | 2 | ||||
| -rw-r--r-- | docker/compose/swarm-etcd.yml | 2 | ||||
| -rw-r--r-- | docker/compose/test-etcd-filer.yml | 2 | ||||
| -rw-r--r-- | docker/seaweedfs-compose.yml | 2 | ||||
| -rw-r--r-- | docker/seaweedfs-dev-compose.yml | 2 |
18 files changed, 29 insertions, 29 deletions
diff --git a/docker/admin_integration/docker-compose-ec-test.yml b/docker/admin_integration/docker-compose-ec-test.yml index 73d0ee0ff..1726e61fa 100644 --- a/docker/admin_integration/docker-compose-ec-test.yml +++ b/docker/admin_integration/docker-compose-ec-test.yml @@ -25,7 +25,7 @@ services: ports: - "8080:8080" - "18080:18080" - command: "volume -mserver=master:9333 -ip=volume1 -dir=/data -max=10" + command: "volume -master=master:9333 -ip=volume1 -dir=/data -max=10" depends_on: - master volumes: @@ -38,7 +38,7 @@ services: ports: - "8081:8080" - "18081:18080" - command: "volume -mserver=master:9333 -ip=volume2 -dir=/data -max=10" + command: "volume -master=master:9333 -ip=volume2 -dir=/data -max=10" depends_on: - master volumes: @@ -51,7 +51,7 @@ services: ports: - "8082:8080" - "18082:18080" - command: "volume -mserver=master:9333 -ip=volume3 -dir=/data -max=10" + command: "volume -master=master:9333 -ip=volume3 -dir=/data -max=10" depends_on: - master volumes: @@ -64,7 +64,7 @@ services: ports: - "8083:8080" - "18083:18080" - command: "volume -mserver=master:9333 -ip=volume4 -dir=/data -max=10" + command: "volume -master=master:9333 -ip=volume4 -dir=/data -max=10" depends_on: - master volumes: @@ -77,7 +77,7 @@ services: ports: - "8084:8080" - "18084:18080" - command: "volume -mserver=master:9333 -ip=volume5 -dir=/data -max=10" + command: "volume -master=master:9333 -ip=volume5 -dir=/data -max=10" depends_on: - master volumes: @@ -90,7 +90,7 @@ services: ports: - "8085:8080" - "18085:18080" - command: "volume -mserver=master:9333 -ip=volume6 -dir=/data -max=10" + command: "volume -master=master:9333 -ip=volume6 -dir=/data -max=10" depends_on: - master volumes: diff --git a/docker/compose/e2e-mount.yml b/docker/compose/e2e-mount.yml index 5571bf003..eb4631f04 100644 --- a/docker/compose/e2e-mount.yml +++ b/docker/compose/e2e-mount.yml @@ -13,7 +13,7 @@ services: volume: image: chrislusf/seaweedfs:e2e - command: "-v=4 volume -mserver=master:9333 -ip=volume -ip.bind=0.0.0.0 -preStopSeconds=1" + command: "-v=4 volume -master=master:9333 -ip=volume -ip.bind=0.0.0.0 -preStopSeconds=1" healthcheck: test: [ "CMD", "curl", "--fail", "-I", "http://localhost:8080/healthz" ] interval: 2s diff --git a/docker/compose/local-brokers-compose.yml b/docker/compose/local-brokers-compose.yml index 62ec94995..c97becb83 100644 --- a/docker/compose/local-brokers-compose.yml +++ b/docker/compose/local-brokers-compose.yml @@ -36,7 +36,7 @@ services: ports: - 8080:8080 - 18080:18080 - command: 'volume -dataCenter=dc1 -rack=v1 -mserver="master0:9333,master1:9334,master2:9335" -port=8080 -ip=volume1 -publicUrl=localhost:8080 -preStopSeconds=1' + command: 'volume -dataCenter=dc1 -rack=v1 -master="master0:9333,master1:9334,master2:9335" -port=8080 -ip=volume1 -publicUrl=localhost:8080 -preStopSeconds=1' depends_on: - master0 - master1 @@ -46,7 +46,7 @@ services: ports: - 8082:8082 - 18082:18082 - command: 'volume -dataCenter=dc2 -rack=v2 -mserver="master0:9333,master1:9334,master2:9335" -port=8082 -ip=volume2 -publicUrl=localhost:8082 -preStopSeconds=1' + command: 'volume -dataCenter=dc2 -rack=v2 -master="master0:9333,master1:9334,master2:9335" -port=8082 -ip=volume2 -publicUrl=localhost:8082 -preStopSeconds=1' depends_on: - master0 - master1 @@ -56,7 +56,7 @@ services: ports: - 8083:8083 - 18083:18083 - command: 'volume -dataCenter=dc3 -rack=v3 -mserver="master0:9333,master1:9334,master2:9335" -port=8083 -ip=volume3 -publicUrl=localhost:8083 -preStopSeconds=1' + command: 'volume -dataCenter=dc3 -rack=v3 -master="master0:9333,master1:9334,master2:9335" -port=8083 -ip=volume3 -publicUrl=localhost:8083 -preStopSeconds=1' depends_on: - master0 - master1 diff --git a/docker/compose/local-cluster-compose.yml b/docker/compose/local-cluster-compose.yml index 13cbcb861..cde87a41b 100644 --- a/docker/compose/local-cluster-compose.yml +++ b/docker/compose/local-cluster-compose.yml @@ -36,7 +36,7 @@ services: ports: - 8080:8080 - 18080:18080 - command: 'volume -dataCenter=dc1 -rack=v1 -mserver="master0:9333,master1:9334,master2:9335" -port=8080 -ip=volume1 -publicUrl=localhost:8080 -preStopSeconds=1' + command: 'volume -dataCenter=dc1 -rack=v1 -master="master0:9333,master1:9334,master2:9335" -port=8080 -ip=volume1 -publicUrl=localhost:8080 -preStopSeconds=1' depends_on: - master0 - master1 @@ -46,7 +46,7 @@ services: ports: - 8082:8082 - 18082:18082 - command: 'volume -dataCenter=dc2 -rack=v2 -mserver="master0:9333,master1:9334,master2:9335" -port=8082 -ip=volume2 -publicUrl=localhost:8082 -preStopSeconds=1' + command: 'volume -dataCenter=dc2 -rack=v2 -master="master0:9333,master1:9334,master2:9335" -port=8082 -ip=volume2 -publicUrl=localhost:8082 -preStopSeconds=1' depends_on: - master0 - master1 @@ -56,7 +56,7 @@ services: ports: - 8083:8083 - 18083:18083 - command: 'volume -dataCenter=dc3 -rack=v3 -mserver="master0:9333,master1:9334,master2:9335" -port=8083 -ip=volume3 -publicUrl=localhost:8083 -preStopSeconds=1' + command: 'volume -dataCenter=dc3 -rack=v3 -master="master0:9333,master1:9334,master2:9335" -port=8083 -ip=volume3 -publicUrl=localhost:8083 -preStopSeconds=1' depends_on: - master0 - master1 diff --git a/docker/compose/local-dev-compose.yml b/docker/compose/local-dev-compose.yml index 6f0d0fb29..e6167cb1c 100644 --- a/docker/compose/local-dev-compose.yml +++ b/docker/compose/local-dev-compose.yml @@ -16,7 +16,7 @@ services: ports: - 8080:8080 - 18080:18080 - command: "-v=1 volume -mserver=master:9333 -port=8080 -ip=volume -preStopSeconds=1 -max=10000" + command: "-v=1 volume -master=master:9333 -port=8080 -ip=volume -preStopSeconds=1 -max=10000" depends_on: - master volumes: diff --git a/docker/compose/local-hashicorp-raft-compose.yml b/docker/compose/local-hashicorp-raft-compose.yml index 4b9814d92..7a5291cc8 100644 --- a/docker/compose/local-hashicorp-raft-compose.yml +++ b/docker/compose/local-hashicorp-raft-compose.yml @@ -42,7 +42,7 @@ services: ports: - 8080:8080 - 18080:18080 - command: 'volume -dataCenter=dc1 -rack=v1 -mserver="master0:9333,master1:9334,master2:9335" -port=8080 -ip=volume1 -publicUrl=localhost:8080 -preStopSeconds=1' + command: 'volume -dataCenter=dc1 -rack=v1 -master="master0:9333,master1:9334,master2:9335" -port=8080 -ip=volume1 -publicUrl=localhost:8080 -preStopSeconds=1' depends_on: - master0 - master1 @@ -51,7 +51,7 @@ services: ports: - 8082:8082 - 18082:18082 - command: 'volume -dataCenter=dc2 -rack=v2 -mserver="master0:9333,master1:9334,master2:9335" -port=8082 -ip=volume2 -publicUrl=localhost:8082 -preStopSeconds=1' + command: 'volume -dataCenter=dc2 -rack=v2 -master="master0:9333,master1:9334,master2:9335" -port=8082 -ip=volume2 -publicUrl=localhost:8082 -preStopSeconds=1' depends_on: - master0 - master1 @@ -60,7 +60,7 @@ services: ports: - 8083:8083 - 18083:18083 - command: 'volume -dataCenter=dc3 -rack=v3 -mserver="master0:9333,master1:9334,master2:9335" -port=8083 -ip=volume3 -publicUrl=localhost:8083 -preStopSeconds=1' + command: 'volume -dataCenter=dc3 -rack=v3 -master="master0:9333,master1:9334,master2:9335" -port=8083 -ip=volume3 -publicUrl=localhost:8083 -preStopSeconds=1' depends_on: - master0 - master1 diff --git a/docker/compose/local-k8s-compose.yml b/docker/compose/local-k8s-compose.yml index c73103d92..71cf51679 100644 --- a/docker/compose/local-k8s-compose.yml +++ b/docker/compose/local-k8s-compose.yml @@ -12,7 +12,7 @@ services: ports: - 8080:8080 - 18080:18080 - command: "volume -mserver=master:9333 -port=8080 -ip=volume" + command: "volume -master=master:9333 -port=8080 -ip=volume" depends_on: - master mysql: diff --git a/docker/compose/local-minio-gateway-compose.yml b/docker/compose/local-minio-gateway-compose.yml index 179ea1630..32863afaf 100644 --- a/docker/compose/local-minio-gateway-compose.yml +++ b/docker/compose/local-minio-gateway-compose.yml @@ -12,7 +12,7 @@ services: ports: - 8080:8080 - 18080:18080 - command: "volume -mserver=master:9333 -port=8080 -ip=volume -max=0 -preStopSeconds=1" + command: "volume -master=master:9333 -port=8080 -ip=volume -max=0 -preStopSeconds=1" depends_on: - master s3: diff --git a/docker/compose/local-mount-compose.yml b/docker/compose/local-mount-compose.yml index 6f8847050..1baf125fc 100644 --- a/docker/compose/local-mount-compose.yml +++ b/docker/compose/local-mount-compose.yml @@ -12,7 +12,7 @@ services: ports: - 7455:8080 - 9325:9325 - command: 'volume -mserver="master:9333" -port=8080 -metricsPort=9325 -preStopSeconds=1 -publicUrl=localhost:7455' + command: 'volume -master="master:9333" -port=8080 -metricsPort=9325 -preStopSeconds=1 -publicUrl=localhost:7455' depends_on: - master filer: diff --git a/docker/compose/local-mount-profile-compose.yml b/docker/compose/local-mount-profile-compose.yml index 65308bd96..ef04d4620 100644 --- a/docker/compose/local-mount-profile-compose.yml +++ b/docker/compose/local-mount-profile-compose.yml @@ -14,7 +14,7 @@ services: - 9325:9325 volumes: - /Volumes/mobile_disk/99:/data - command: 'volume -mserver="master:9333" -port=8080 -metricsPort=9325 -preStopSeconds=1 -publicUrl=localhost:7455' + command: 'volume -master="master:9333" -port=8080 -metricsPort=9325 -preStopSeconds=1 -publicUrl=localhost:7455' depends_on: - master filer: diff --git a/docker/compose/local-nextcloud-compose.yml b/docker/compose/local-nextcloud-compose.yml index 288ae06e5..52dfb5368 100644 --- a/docker/compose/local-nextcloud-compose.yml +++ b/docker/compose/local-nextcloud-compose.yml @@ -12,7 +12,7 @@ services: ports: - 8080:8080 - 18080:18080 - command: "volume -mserver=master:9333 -port=8080 -ip=volume" + command: "volume -master=master:9333 -port=8080 -ip=volume" depends_on: - master s3: diff --git a/docker/compose/local-registry-compose.yml b/docker/compose/local-registry-compose.yml index 3aa056a90..0a176c1af 100644 --- a/docker/compose/local-registry-compose.yml +++ b/docker/compose/local-registry-compose.yml @@ -12,7 +12,7 @@ services: ports: - 8080:8080 - 18080:18080 - command: "volume -mserver=master:9333 -port=8080 -ip=volume -max=0 -preStopSeconds=1" + command: "volume -master=master:9333 -port=8080 -ip=volume -max=0 -preStopSeconds=1" depends_on: - master s3: diff --git a/docker/compose/local-replicate-compose.yml b/docker/compose/local-replicate-compose.yml index d88a54101..2bf392a35 100644 --- a/docker/compose/local-replicate-compose.yml +++ b/docker/compose/local-replicate-compose.yml @@ -12,7 +12,7 @@ services: ports: - 8080:8080 - 18080:18080 - command: "volume -mserver=master:9333 -port=8080 -ip=volume -preStopSeconds=1" + command: "volume -master=master:9333 -port=8080 -ip=volume -preStopSeconds=1" depends_on: - master filer: diff --git a/docker/compose/local-s3tests-compose.yml b/docker/compose/local-s3tests-compose.yml index f89261ec7..2a65138c5 100644 --- a/docker/compose/local-s3tests-compose.yml +++ b/docker/compose/local-s3tests-compose.yml @@ -15,7 +15,7 @@ services: ports: - 8080:8080 - 18080:18080 - command: "volume -mserver=master:9333 -port=8080 -ip=volume -preStopSeconds=1" + command: "volume -master=master:9333 -port=8080 -ip=volume -preStopSeconds=1" depends_on: - master s3: diff --git a/docker/compose/swarm-etcd.yml b/docker/compose/swarm-etcd.yml index bc9510ad0..ba496995a 100644 --- a/docker/compose/swarm-etcd.yml +++ b/docker/compose/swarm-etcd.yml @@ -71,7 +71,7 @@ services: - net command: - 'volume' - - '-mserver=master:9333' + - '-master=master:9333' - '-port=8080' deploy: mode: global diff --git a/docker/compose/test-etcd-filer.yml b/docker/compose/test-etcd-filer.yml index c6f24c559..6d37ae546 100644 --- a/docker/compose/test-etcd-filer.yml +++ b/docker/compose/test-etcd-filer.yml @@ -17,7 +17,7 @@ services: ports: - 8080:8080 - 18080:18080 - command: "volume -mserver=master:9333 -port=8080 -ip=volume -max=0 -preStopSeconds=1" + command: "volume -master=master:9333 -port=8080 -ip=volume -max=0 -preStopSeconds=1" depends_on: - master s3: diff --git a/docker/seaweedfs-compose.yml b/docker/seaweedfs-compose.yml index d85179769..1a186b2f6 100644 --- a/docker/seaweedfs-compose.yml +++ b/docker/seaweedfs-compose.yml @@ -14,7 +14,7 @@ services: - 8080:8080 - 18080:18080 - 9325:9325 - command: 'volume -ip=volume -mserver="master:9333" -ip.bind=0.0.0.0 -port=8080 -metricsPort=9325' + command: 'volume -ip=volume -master="master:9333" -ip.bind=0.0.0.0 -port=8080 -metricsPort=9325' depends_on: - master filer: diff --git a/docker/seaweedfs-dev-compose.yml b/docker/seaweedfs-dev-compose.yml index 60c139f02..fa4a51926 100644 --- a/docker/seaweedfs-dev-compose.yml +++ b/docker/seaweedfs-dev-compose.yml @@ -12,7 +12,7 @@ services: ports: - 8080:8080 - 18080:18080 - command: 'volume -ip=volume -mserver="master:9333" -ip.bind=0.0.0.0 -port=8080' + command: 'volume -ip=volume -master="master:9333" -ip.bind=0.0.0.0 -port=8080' depends_on: - master filer: |
