Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unbreak the cilium-dbg preflight migrate-identity command #36089

Merged
merged 3 commits into from
Nov 22, 2024

Conversation

giorio94
Copy link
Member

Please review commit by commit, and refer to the individual messages for additional details.

Currently, the etcd client is initialized with a context that gets
immediately closed once the initialization completed, in turn causing
the etcd client to be stopped. Let's fix this by using the parent
context, which gets closed only once the migration terminates.

Additionally, let's explicitly wait for the client to connect, so
that we can return an explicit error in case of problems, rather
than failing at a later stage.

Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
The retrieval of node information is not required during the migration
of identities, and the current implementation leads to a panic given
that the local node store is not initialized. Hence, let's just drop
it altogether.

Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
shutdowner.Shutdown takes a variadic number of parameters, hence let's
just omit it.

Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
@giorio94 giorio94 added kind/bug This is a bug in the Cilium logic. area/cli Impacts the command line interface of any command in the repository. labels Nov 21, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot added dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Nov 21, 2024
@giorio94 giorio94 added the release-note/bug This PR fixes an issue in a previous release of Cilium. label Nov 21, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Nov 21, 2024
@giorio94 giorio94 added needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch needs-backport/1.15 This PR / issue needs backporting to the v1.15 branch needs-backport/1.16 This PR / issue needs backporting to the v1.16 branch labels Nov 21, 2024
@giorio94
Copy link
Member Author

/test

Copy link
Contributor

@derailed derailed left a comment

Choose a reason for hiding this comment

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

@giorio94 Nice work Marco!

@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 Nov 21, 2024
@tklauser tklauser added this pull request to the merge queue Nov 22, 2024
Merged via the queue into cilium:main with commit 20ef157 Nov 22, 2024
70 checks passed
@nbusseneau nbusseneau added backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. and removed needs-backport/1.15 This PR / issue needs backporting to the v1.15 branch labels Dec 1, 2024
@nbusseneau nbusseneau mentioned this pull request Dec 1, 2024
8 tasks
@nbusseneau nbusseneau added backport-pending/1.16 The backport for Cilium 1.16.x for this PR is in progress. and removed needs-backport/1.16 This PR / issue needs backporting to the v1.16 branch labels Dec 1, 2024
@jschwinger233 jschwinger233 mentioned this pull request Dec 2, 2024
1 task
@jschwinger233 jschwinger233 added backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. and removed needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch labels Dec 2, 2024
@github-actions github-actions bot added backport-done/1.15 The backport for Cilium 1.15.x for this PR is done. backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. backport-done/1.16 The backport for Cilium 1.16.x for this PR is done. and removed backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. backport-pending/1.16 The backport for Cilium 1.16.x for this PR is in progress. labels Dec 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/cli Impacts the command line interface of any command in the repository. backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. backport-done/1.15 The backport for Cilium 1.15.x for this PR is done. backport-done/1.16 The backport for Cilium 1.16.x for this PR is done. kind/bug This is a bug in the Cilium logic. 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.

5 participants