openshift/installer
1
0
Fork 0
mirror of https://github.com/openshift/installer.git synced 2026-02-05 06:46:36 +01:00
Code Issues Releases Activity

Merge pull request #10214 from openshift-cherrypick-robot/cherry-pick-10188-to-release-4.21

Browse Source 
[release-4.21] OCPBUGS-73773: ensure deterministic zone ordering for control plane machines
This commit is contained in:
openshift-merge-bot[bot]
2026-01-14 04:48:25 +00:00
committed by GitHub
parent 1c2444827f 25ff517a54
commit a6c94ff283
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/asset/machines/clusterapi.go
View File

@@ -159,6 +159,9 @@ func (c *ClusterAPI) Generate(ctx context.Context, dependencies asset.Parents) e
if err != nil {
logrus.Warn(errors.Wrap(err, "failed to filter zone list"))
}
// Sort the zones by lexical order to ensure CAPI and MAPI machines
// are distributed to zones in the same order.
slices.Sort(mpool.Zones)
}
tags, err := aws.CapaTagsFromUserTags(clusterID.InfraID, installConfig.Config.Platform.AWS.UserTags)

3
pkg/asset/machines/master.go
View File

@@ -253,6 +253,9 @@ func (m *Master) Generate(ctx context.Context, dependencies asset.Parents) error
if err != nil {
logrus.Warn(errors.Wrap(err, "failed to filter zone list"))
}
// Sort the zones by lexical order to ensure CAPI and MAPI machines
// are distributed to zones in the same order.
slices.Sort(mpool.Zones)
}
pool.Platform.AWS = &mpool