fix: use server-side apply in RU e2e tests#504
Merged
enoodle merged 1 commit intoApr 9, 2026
Conversation
059273a to
e0dba56
Compare
danbar2
previously approved these changes
Mar 31, 2026
e0dba56 to
b83968c
Compare
Ronkahn21
reviewed
Apr 4, 2026
Ronkahn21
left a comment
Contributor
There was a problem hiding this comment.
Good suggestion using SSA, Had a few questions and some personal style
Ronkahn21
reviewed
Apr 5, 2026
Ronkahn21
left a comment
Contributor
There was a problem hiding this comment.
Make sure not to merge from the repo only to rebase
223d791 to
0ef4a13
Compare
Contributor
Author
|
@Ronkahn21 Why is rebase preferred to merge commits? from code perspective the result is similar - The tests run on the same code. |
…ndition triggerPodCliqueUpdate and patchPCSWithSIGTERMIgnoringCommand use RetryOnConflict + DynamicClient.Update to modify the PCS. Under CI DinD CPU throttling, the grove controller reconciles concurrently and changes the resourceVersion between GET and UPDATE, exhausting the retry window. Switch to server-side apply (CRClient.Patch with client.Apply) which does not check resourceVersion. Also add +listType=map +listMapKey=name to PodCliqueSetTemplateSpec.Cliques so SSA merges by clique name rather than treating the array as atomic. Closes ai-dynamo#503 Signed-off-by: Erez Freiberger <enoodle@gmail.com> Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
0ef4a13 to
5ff5ddd
Compare
danbar2
approved these changes
Apr 7, 2026
Ronkahn21
approved these changes
Apr 9, 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
3 participants
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
/kind api
What this PR does / why we need it:
Use server-side apply in rolling updates e2e to fix flaky tests
Which issue(s) this PR fixes:
Fixes #503
Special notes for your reviewer:
Does this PR introduce a API change?
This updates the API of PCS to the field PodCliqueSetTemplateSpec.Cliques a map interpretation. It had no list-type annotation (defaults to atomic — the whole array is replaced on merge). Added +listType=map
+listMapKey=name to match how containers and env are already annotated. Non-breaking for existing clients.