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

v1.14 Backports 2024-12-02 #36290

Closed
wants to merge 3 commits into from

Conversation

jschwinger233
Copy link
Member

Once this PR is merged, a GitHub action will update the labels of these PRs:

 36089

[ upstream commit a7e9f0e ]

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>
Signed-off-by: gray <greyschwinger@gmail.com>
[ upstream commit 7d1a25a ]
[ backporter's note: minor conflict when deleting "if
agentK8s.WaitForNodeInformation()" block. ]

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>
Signed-off-by: gray <gray.liang@isovalent.com>
[ upstream commit 20ef157 ]

shutdowner.Shutdown takes a variadic number of parameters, hence let's
just omit it.

Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
Signed-off-by: gray <greyschwinger@gmail.com>
@jschwinger233 jschwinger233 added kind/backports This PR provides functionality previously merged into master. backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. labels Dec 2, 2024
@jschwinger233
Copy link
Member Author

/test-backport-1.14

@jschwinger233 jschwinger233 marked this pull request as ready for review December 2, 2024 06:32
@jschwinger233 jschwinger233 requested a review from a team as a code owner December 2, 2024 06:32
@julianwiedmann
Copy link
Member

Note that the previous round of backports is still in-flight: #36284.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants