From 1dcb5ec467e4c1ed94f904858e8068337a088e0c Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 28 Jul 2026 21:10:13 -0700 Subject: [PATCH] =?UTF-8?q?fix:=20use=20ETCD3=5FHOSTS=20not=20ETCD=5FHOSTS?= =?UTF-8?q?=20=E2=80=94=20confirmed=20against=20spilo=20source=20that=20et?= =?UTF-8?q?cd/etcd3=20are=20distinct=20DCS=20backends=20(v2=20vs=20v3=20AP?= =?UTF-8?q?I).=20Our=20etcd=203.5.9=20containers=20have=20v2=20API=20disab?= =?UTF-8?q?led,=20causing=20404s=20with=20the=20old=20var=20name.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- postgresql/cutover/test/pgha-dryrun.yaml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/postgresql/cutover/test/pgha-dryrun.yaml b/postgresql/cutover/test/pgha-dryrun.yaml index 44f6d5a..008d49a 100644 --- a/postgresql/cutover/test/pgha-dryrun.yaml +++ b/postgresql/cutover/test/pgha-dryrun.yaml @@ -17,6 +17,14 @@ # interpolation parses $( as an attempted ${VAR} reference and fails with # "invalid interpolation format" / "you may need to escape any $ with # 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" @@ -128,7 +136,7 @@ services: environment: SCOPE: pgha-test 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_STANDBY: standby PATRONI_RESTAPI_USERNAME: patroni @@ -166,7 +174,7 @@ services: environment: SCOPE: pgha-test 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_STANDBY: standby PATRONI_RESTAPI_USERNAME: patroni