Skip to content

🐛 fakeclient: retry GenerateName on AlreadyExists collisions#3498

Merged
k8s-ci-robot merged 1 commit into
kubernetes-sigs:mainfrom
vieux:fix-fake-client-generatename-retry
Apr 18, 2026
Merged

🐛 fakeclient: retry GenerateName on AlreadyExists collisions#3498
k8s-ci-robot merged 1 commit into
kubernetes-sigs:mainfrom
vieux:fix-fake-client-generatename-retry

Conversation

@vieux

@vieux vieux commented Apr 10, 2026

Copy link
Copy Markdown
Contributor

The real API server retries GenerateName collisions up to 7 times (RetryGenerateName feature gate, GA in K8s 1.32). The fake client now does the same, preventing flaky tests caused by birthday-paradox collisions when many objects share the same GenerateName prefix.

Closes #3497

@linux-foundation-easycla

linux-foundation-easycla Bot commented Apr 10, 2026

Copy link
Copy Markdown

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: vieux / name: Victor Vieux (80bc294)

@k8s-ci-robot k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Apr 10, 2026
@k8s-ci-robot

Copy link
Copy Markdown
Contributor

Welcome @vieux!

It looks like this is your first PR to kubernetes-sigs/controller-runtime 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/controller-runtime has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Apr 10, 2026
@k8s-ci-robot

Copy link
Copy Markdown
Contributor

Hi @vieux. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Apr 10, 2026
@alvaroaleman

Copy link
Copy Markdown
Member

@vieux please sign the CLA so we can accept the contribution

@vieux

vieux commented Apr 10, 2026

Copy link
Copy Markdown
Contributor Author

@alvaroaleman 👍 I'm on it, waiting for my employer to approve

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Apr 15, 2026
@vieux

vieux commented Apr 15, 2026

Copy link
Copy Markdown
Contributor Author

@alvaroaleman cla is signed 👍

@alvaroaleman alvaroaleman left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/ok-to-test

Comment thread pkg/client/fake/client.go Outdated
Comment thread pkg/client/fake/client_test.go Outdated
@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 16, 2026
@vieux vieux force-pushed the fix-fake-client-generatename-retry branch 2 times, most recently from 33bca1a to 8a3b20a Compare April 16, 2026 22:04
@vieux vieux requested a review from alvaroaleman April 16, 2026 23:19
Comment thread pkg/client/fake/client.go Outdated
var createErr error
for range maxRetries {
if usingGenerateName {
base := accessor.GetGenerateName()

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is still wrong, it will include the suffix on the second attempt. You need to store it outside the loop

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the suffix is added below on the set name and base is recreated, so I don't think it would include the suffix on the second attempt, but I agree, no need to get the full value + trim each time since it never changes.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please leave it up to the author of a comment to decide when to resolve it, as resolving comments hides them

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alvaroaleman noted, will do next time 👍

Comment thread pkg/client/fake/client_test.go Outdated
@vieux vieux force-pushed the fix-fake-client-generatename-retry branch from 8a3b20a to d76850e Compare April 17, 2026 21:13
… 1.32 behavior)

The real API server retries GenerateName collisions up to 7 times
(RetryGenerateName feature gate, GA in K8s 1.32). The fake client now
does the same, preventing flaky tests caused by birthday-paradox
collisions when many objects share the same GenerateName prefix.

Signed-off-by: Victor Vieux <vieux@repl.it>
@vieux vieux force-pushed the fix-fake-client-generatename-retry branch from d76850e to 80bc294 Compare April 17, 2026 21:19
@alvaroaleman

Copy link
Copy Markdown
Member

/retitle 🐛 fakeclient: retry GenerateName on AlreadyExists collisions

@k8s-ci-robot k8s-ci-robot changed the title 🐛 fakeclient: retry GenerateName on AlreadyExists collisions (match K8s 1.32 behavior) 🐛 fakeclient: retry GenerateName on AlreadyExists collisions Apr 18, 2026

@alvaroaleman alvaroaleman left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks!

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 18, 2026
@k8s-ci-robot

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alvaroaleman, vieux

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot

Copy link
Copy Markdown
Contributor

LGTM label has been added.

DetailsGit tree hash: 866e8db2b28ed29c406c46d9399ae3c5f4795c8a

@alvaroaleman

Copy link
Copy Markdown
Member

xref kubernetes/kubernetes#122887

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 18, 2026
@k8s-ci-robot k8s-ci-robot merged commit 1a31c56 into kubernetes-sigs:main Apr 18, 2026
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Fake client should retry on GenerateName name collisions

3 participants