fix: always set advertised peer URLs

smira · smira · commit 494492489b29 · 2026-01-23T18:21:28.000+04:00
It seems that etcd might derive them incorrectly on IPv6-only system. This change is confusing, as it sets the `--initial-` prefixed flag even after join, but it seems that on etcd side, the configuration value is used always despite the flag name. Fixes #12646 (see the issue for more details) Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
diff --git a/internal/app/machined/pkg/system/services/etcd.go b/internal/app/machined/pkg/system/services/etcd.go
@@ -528,12 +528,6 @@ func (e *Etcd) argsForControlPlane(ctx context.Context, r runtime.Runtime, spec
 
 			denyListArgs.Set("initial-cluster", argsbuilder.Value{initialCluster})
 		}
-
-		if !extraArgs.Contains("initial-advertise-peer-urls") {
-			denyListArgs.Set("initial-advertise-peer-urls",
-				argsbuilder.Value{formatEtcdURLs(spec.AdvertisedAddresses, constants.EtcdPeerPort)},
-			)
-		}
 	}
 
 	if !extraArgs.Contains("advertise-client-urls") {
@@ -542,6 +536,12 @@ func (e *Etcd) argsForControlPlane(ctx context.Context, r runtime.Runtime, spec
 		)
 	}
 
+	if !extraArgs.Contains("initial-advertise-peer-urls") {
+		denyListArgs.Set("initial-advertise-peer-urls",
+			argsbuilder.Value{formatEtcdURLs(spec.AdvertisedAddresses, constants.EtcdPeerPort)},
+		)
+	}
+
 	if err = denyListArgs.Merge(extraArgs, denyList); err != nil {
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -528,12 +528,6 @@ func (e *Etcd) argsForControlPlane(ctx context.Context, r runtime.Runtime, spec`
`528`	`528`
`529`	`529`	`denyListArgs.Set("initial-cluster", argsbuilder.Value{initialCluster})`
`530`	`530`	`}`
`531`		`-`
`532`		`- if !extraArgs.Contains("initial-advertise-peer-urls") {`
`533`		`- denyListArgs.Set("initial-advertise-peer-urls",`
`534`		`- argsbuilder.Value{formatEtcdURLs(spec.AdvertisedAddresses, constants.EtcdPeerPort)},`
`535`		`- )`
`536`		`- }`
`537`	`531`	`}`
`538`	`532`
`539`	`533`	`if !extraArgs.Contains("advertise-client-urls") {`
`@@ -542,6 +536,12 @@ func (e *Etcd) argsForControlPlane(ctx context.Context, r runtime.Runtime, spec`
`542`	`536`	`)`
`543`	`537`	`}`
`544`	`538`
	`539`	`+ if !extraArgs.Contains("initial-advertise-peer-urls") {`
	`540`	`+ denyListArgs.Set("initial-advertise-peer-urls",`
	`541`	`+ argsbuilder.Value{formatEtcdURLs(spec.AdvertisedAddresses, constants.EtcdPeerPort)},`
	`542`	`+ )`
	`543`	`+ }`
	`544`	`+`
`545`	`545`	`if err = denyListArgs.Merge(extraArgs, denyList); err != nil {`
`546`	`546`	`return err`
`547`	`547`	`}`