Skip to content

Fix #42922#43127

Merged
squeed merged 1 commit intocilium:mainfrom
derailed:fix-42922
Dec 12, 2025
Merged

Fix #42922#43127
squeed merged 1 commit intocilium:mainfrom
derailed:fix-42922

Conversation

@derailed
Copy link
Copy Markdown
Contributor

@derailed derailed commented Dec 3, 2025

Please ensure your pull request adheres to the following guidelines:

  • For first time contributors, read Submitting a pull request
  • All code is covered by unit and/or runtime tests where feasible.
  • All commits contain a well written commit description including a title,
    description and a Fixes: #XXX line if the commit addresses a particular
    GitHub issue.
  • If your commit description contains a Fixes: <commit-id> tag, then
    please add the commit author[s] as reviewer[s] to this issue.
  • All commits are signed off. See the section Developer’s Certificate of Origin
  • Provide a title or release-note blurb suitable for the release notes.
  • Are you a user of Cilium? Please add yourself to the Users doc
  • Thanks for contributing!

Fixes: #42922
Reverts: #42282

@maintainer-s-little-helper
Copy link
Copy Markdown

Commits baea0e8, 13b49c9 do not match "(?m)^Signed-off-by:".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

@maintainer-s-little-helper maintainer-s-little-helper bot added dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Dec 3, 2025
@github-actions github-actions bot added the sig/policy Impacts whether traffic is allowed or denied based on user-defined policies. label Dec 3, 2025
@maintainer-s-little-helper
Copy link
Copy Markdown

Commit db58f9b does not match "(?m)^Signed-off-by:".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

@derailed
Copy link
Copy Markdown
Contributor Author

derailed commented Dec 3, 2025

/test

@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. label Dec 4, 2025
@derailed derailed changed the title Fix 42922 Fix #42922 Dec 4, 2025
@derailed
Copy link
Copy Markdown
Contributor Author

derailed commented Dec 4, 2025

/test

@derailed derailed requested a review from squeed December 4, 2025 20:38
@derailed derailed marked this pull request as ready for review December 4, 2025 20:38
@derailed derailed requested a review from a team as a code owner December 4, 2025 20:38
@squeed
Copy link
Copy Markdown
Contributor

squeed commented Dec 4, 2025

Can you do a git revert? The PR should look something like #42780.

This PR introduced a retry jitter that seems to cause a disconnect for global
identities and the kvstore and yielding tests failures when identities
are in the cache but not present in the kvstore.

We've opted to revert this change and bypass blocking the allocator prior
to resolving the identities

Signed-off-by: Fernand Galiana <fernand.galiana@isovalent.com>
@derailed
Copy link
Copy Markdown
Contributor Author

derailed commented Dec 5, 2025

/test

Copy link
Copy Markdown
Contributor

@squeed squeed left a comment

Choose a reason for hiding this comment

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

Looks good. In the future, can you put the ID of the reverted commit in the message? That makes it easier to trace the history. Since this commit never shipped, it's not meaningful.

@squeed squeed added the release-note/misc This PR makes changes that have no direct user impact. label Dec 8, 2025
@maintainer-s-little-helper maintainer-s-little-helper bot added ready-to-merge This PR has passed all tests and received consensus from code owners to merge. and removed dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Dec 8, 2025
Copy link
Copy Markdown
Member

@odinuge odinuge left a comment

Choose a reason for hiding this comment

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

Thanks! This is causing a lot of test flakes, so great to get it stabilized.

@squeed squeed added this pull request to the merge queue Dec 12, 2025
Merged via the queue into cilium:main with commit 1748dc4 Dec 12, 2025
74 of 75 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact. sig/policy Impacts whether traffic is allowed or denied based on user-defined policies.

Projects

No open projects
Status: Released

Development

Successfully merging this pull request may close these issues.

CI: connectivity test - allocator error: unable to create secondary key

4 participants