fix: always set advertised peer URLs

smira · shanduur · commit b2a83d12a600 · 2026-02-06T08:51:34.000+01: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> (cherry picked from commit 4944924)
diff --git a/internal/app/machined/pkg/system/services/etcd.go b/internal/app/machined/pkg/system/services/etcd.go
@@ -515,12 +515,6 @@ func (e *Etcd) argsForControlPlane(ctx context.Context, r runtime.Runtime, spec
 
 			denyListArgs.Set("initial-cluster", initialCluster)
 		}
-
-		if !extraArgs.Contains("initial-advertise-peer-urls") {
-			denyListArgs.Set("initial-advertise-peer-urls",
-				formatEtcdURLs(spec.AdvertisedAddresses, constants.EtcdPeerPort),
-			)
-		}
 	}
 
 	if !extraArgs.Contains("advertise-client-urls") {
@@ -529,6 +523,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",
+			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
`@@ -515,12 +515,6 @@ func (e *Etcd) argsForControlPlane(ctx context.Context, r runtime.Runtime, spec`
`515`	`515`
`516`	`516`	`denyListArgs.Set("initial-cluster", initialCluster)`
`517`	`517`	`}`
`518`		`-`
`519`		`- if !extraArgs.Contains("initial-advertise-peer-urls") {`
`520`		`- denyListArgs.Set("initial-advertise-peer-urls",`
`521`		`- formatEtcdURLs(spec.AdvertisedAddresses, constants.EtcdPeerPort),`
`522`		`- )`
`523`		`- }`
`524`	`518`	`}`
`525`	`519`
`526`	`520`	`if !extraArgs.Contains("advertise-client-urls") {`
`@@ -529,6 +523,12 @@ func (e *Etcd) argsForControlPlane(ctx context.Context, r runtime.Runtime, spec`
`529`	`523`	`)`
`530`	`524`	`}`
`531`	`525`
	`526`	`+ if !extraArgs.Contains("initial-advertise-peer-urls") {`
	`527`	`+ denyListArgs.Set("initial-advertise-peer-urls",`
	`528`	`+ formatEtcdURLs(spec.AdvertisedAddresses, constants.EtcdPeerPort),`
	`529`	`+ )`
	`530`	`+ }`
	`531`	`+`
`532`	`532`	`if err = denyListArgs.Merge(extraArgs, denyList); err != nil {`
`533`	`533`	`return err`
`534`	`534`	`}`