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

Merge pull request #10219 from openshift-cherrypick-robot/cherry-pick-10214-to-release-4.20

Browse Source 
[release-4.20] OCPBUGS-73785: ensure deterministic zone ordering for control plane machines
This commit is contained in:
openshift-merge-bot[bot]
2026-01-16 20:07:46 +00:00
committed by GitHub
parent db608c3e6a c2c951661c
commit 289d01646f
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

@@ -157,6 +157,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

@@ -252,6 +252,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