fix: use ETCD3_HOSTS not ETCD_HOSTS — confirmed against spilo source that etcd/etcd3 are distinct DCS backends (v2 vs v3 API). Our etcd 3.5.9 containers have v2 API disabled, causing 404s with the old var name.
ci/woodpecker/push/deploy Pipeline was successful

This commit is contained in:
2026-07-28 21:10:13 -07:00
parent 83480aa23b
commit 1dcb5ec467
+10 -2
View File
@@ -17,6 +17,14 @@
# interpolation parses $( as an attempted ${VAR} reference and fails with # interpolation parses $( as an attempted ${VAR} reference and fails with
# "invalid interpolation format" / "you may need to escape any $ with # "invalid interpolation format" / "you may need to escape any $ with
# another $". $$ escapes to a literal $ for the shell at runtime. # another $". $$ escapes to a literal $ for the shell at runtime.
#
# NOTE: ETCD3_HOSTS not ETCD_HOSTS — confirmed against zalando/spilo
# configure_spilo.py: PATRONI_DCS includes both "etcd" (legacy v2 API,
# python-etcd client) and "etcd3" (v3 API, python-etcd3 client) as
# distinct DCS backends selected by env var prefix. Our etcd containers
# (v3.5.9) have the v2 API disabled by default, so ETCD_HOSTS causes
# Patroni to hit /v2 endpoints that 404. ETCD3_HOSTS selects the correct
# v3-API client.
# ───────────────────────────────────────────────────────────────────────── # ─────────────────────────────────────────────────────────────────────────
version: "3.6" version: "3.6"
@@ -128,7 +136,7 @@ services:
environment: environment:
SCOPE: pgha-test SCOPE: pgha-test
PATRONI_NAME: patroni-0 PATRONI_NAME: patroni-0
ETCD_HOSTS: '"etcd-1:2379","etcd-2:2379","etcd-3:2379"' ETCD3_HOSTS: '"etcd-1:2379","etcd-2:2379","etcd-3:2379"'
PGUSER_SUPERUSER: PGadmin PGUSER_SUPERUSER: PGadmin
PGUSER_STANDBY: standby PGUSER_STANDBY: standby
PATRONI_RESTAPI_USERNAME: patroni PATRONI_RESTAPI_USERNAME: patroni
@@ -166,7 +174,7 @@ services:
environment: environment:
SCOPE: pgha-test SCOPE: pgha-test
PATRONI_NAME: patroni-1 PATRONI_NAME: patroni-1
ETCD_HOSTS: '"etcd-1:2379","etcd-2:2379","etcd-3:2379"' ETCD3_HOSTS: '"etcd-1:2379","etcd-2:2379","etcd-3:2379"'
PGUSER_SUPERUSER: PGadmin PGUSER_SUPERUSER: PGadmin
PGUSER_STANDBY: standby PGUSER_STANDBY: standby
PATRONI_RESTAPI_USERNAME: patroni PATRONI_RESTAPI_USERNAME: patroni