fix: use patch for topology label repplay on replaced nodes#384
Merged
Ronkahn21 merged 1 commit intoFeb 2, 2026
Merged
Conversation
Replace full Update() with Patch() in reapplyNodeLabels() to avoid optimistic lock conflicts when replaying topology labels to replaced nodes. Patch operations don't require matching ResourceVersion. This fixes 409 Conflict errors that occur when nodes are replaced during unavailability recovery and system components modify the node between fetch and update operations. Signed-off-by: Ron Kahn <rkahn@nvidia.com>
shayasoolin
approved these changes
Feb 2, 2026
danbar2
approved these changes
Feb 2, 2026
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.
What type of PR is this?
/kind bug
What this PR does / why we need it:
Fixes optimistic lock conflicts (409 Conflict errors) when replaying topology labels to nodes after they become unavailable and are replaced during e2e testing.
Problem:
reapplyNodeLabels()inoperator/e2e/setup/k8s_clusters.goused fullUpdate()callSolution:
Update()toPatch()withStrategicMergePatchTypeapplyTopologyLabels()Impact:
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
applyTopologyLabels()insetup/topology.goDoes this PR introduce a API change?
Additional documentation e.g., enhancement proposals, usage docs, etc.: