Skip to content

Conversation

JacobHenner
Copy link
Contributor

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!

Ignore CiliumIdentity delete conflicts during the gc run (by skipping deletion and emitting a warning), allowing gc to continue if a subset of identities are conflicted. Prior to this change conflicts would cause gc to error, which could lead to an unexpected accumulation of stale CiliumIdentity objects.

Fixes: #33142

Ignore CiliumIdentity delete conflicts during the gc run (by skipping deletion and emitting a warning), allowing gc to continue if a subset of identities are conflicted. Prior to this change conflicts would cause gc to error, which could lead to an unexpected accumulation of stale CiliumIdentity objects.

@JacobHenner JacobHenner requested a review from a team as a code owner June 13, 2024 16:47
@JacobHenner JacobHenner requested a review from joamaki June 13, 2024 16:47
@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Jun 13, 2024
@JacobHenner
Copy link
Contributor Author

I would consider this kind/bug.

@github-actions github-actions bot added the kind/community-contribution This was a contribution made by a community member. label Jun 13, 2024
@aanm aanm added kind/bug This is a bug in the Cilium logic. release-note/bug This PR fixes an issue in a previous release of Cilium. labels Jun 15, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot removed dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Jun 15, 2024
@aanm
Copy link
Member

aanm commented Jun 15, 2024

/test

@aanm aanm enabled auto-merge June 15, 2024 08:59
@aanm aanm added affects/v1.14 This issue affects v1.14 branch affects/v1.15 This issue affects v1.15 branch labels Jun 15, 2024
Ignore CiliumIdentity delete conflicts during the gc run (by skipping
deletion and emitting a warning), allowing gc to continue if a subset of
identities are conflicted. Prior to this change conflicts would cause gc
to error, which could lead to an unexpected accumulation of stale
CiliumIdentity objects.

Signed-off-by: Jacob Henner <henner@arcesium.com>
@aanm aanm force-pushed the fix/ignore-gc-delete-conflicts branch from a15a682 to abdfbf5 Compare June 17, 2024 08:31
@aanm
Copy link
Member

aanm commented Jun 17, 2024

/test

@aanm aanm added this pull request to the merge queue Jun 17, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jun 17, 2024
Merged via the queue into cilium:main with commit 304b7fd Jun 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
affects/v1.14 This issue affects v1.14 branch affects/v1.15 This issue affects v1.15 branch kind/bug This is a bug in the Cilium logic. kind/community-contribution This was a contribution made by a community member. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/bug This PR fixes an issue in a previous release of Cilium.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cilium abandons identity garbage collection if a CiliumIdentity deletion is conflicted
3 participants