Make ToSystemAffinity deterministic by sorting MatchLabels keys#9898
Closed
Copilot wants to merge 3 commits into
Closed
Make ToSystemAffinity deterministic by sorting MatchLabels keys#9898Copilot wants to merge 3 commits into
Copilot wants to merge 3 commits into
Conversation
✅ Deploy Preview for velero canceled.
|
Copilot
AI
changed the title
[WIP] Fix nondeterministic affinity ordering in ToSystemAffinity
Make ToSystemAffinity deterministic by sorting MatchLabels keys
Jun 9, 2026
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
Lyndon-Li
reviewed
Jun 10, 2026
| func ToSystemAffinity(loadAffinity *LoadAffinity, volumeTopology *corev1api.NodeSelector) *corev1api.Affinity { | ||
| requirements := []corev1api.NodeSelectorRequirement{} | ||
| if loadAffinity != nil { | ||
| for k, v := range loadAffinity.NodeSelector.MatchLabels { |
Contributor
There was a problem hiding this comment.
I think you could instead sort the final requirements, which looks more clear in the code
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Thank you for contributing to Velero!
Please add a summary of your change
ToSystemAffinity()iteratedLoadAffinity.NodeSelector.MatchLabelsdirectly. Since it's a Go map, iteration order is nondeterministic, so the generatedNodeSelectorRequirementslice could come out in different orders across calls. When the resulting affinity is embedded into continuously reconciled objects (e.g. node-agent DaemonSet pod templates), an order-only diff is treated as a spec change and triggers spurious rollouts/restarts.Changes:
MatchLabelskeys,sort.Stringsthem, then build requirements in sorted order.MatchExpressionsordering is already caller-defined.TestToSystemAffinitycase with multiple match labels asserting sorted-by-key output.pkg/exposer/{generic_restore,csi_snapshot,pod_volume}.goandpkg/repository/maintenance/maintenance.goonly assign the result into a Pod/Job spec; none depend on ordering.Does your change fix a particular issue?
Please indicate you've done the following:
make new-changelog) or comment/kind changelog-not-requiredon this PR.site/content/docs/main.