Skip to content

[release/1.5] cherry pick #5569 to release 1.5 - Fix cleanup context of teardownPodNetwork #5593

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.

Sign up for GitHub

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

Jump to bottom
Merged
estesp merged 1 commit into from
Jun 11, 2021
Merged

[release/1.5] cherry pick #5569 to release 1.5 - Fix cleanup context of teardownPodNetwork #5593

estesp merged 1 commit into from
Jun 11, 2021

Conversation

@tnqn
Copy link
Contributor

@tnqn tnqn commented Jun 10, 2021

Similar to other deferred cleanup operations, teardownPodNetwork should
use a different context as the original context may have expired,
otherwise CNI wouldn't been invoked, leading to leak of network
resources, e.g. IP addresses.

Signed-off-by: Quan Tian qtian@vmware.com
(cherry picked from commit 728743e)

Cherry pick of #5569

@k8s-ci-robot
Copy link

k8s-ci-robot commented Jun 10, 2021

Hi @tnqn. Thanks for your PR.

I'm waiting for a containerd 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/test-infra repository.

@dims dims requested a review from fuweid June 10, 2021 10:38
@dims dims requested a review from estesp June 10, 2021 10:38
dims
dims approved these changes Jun 10, 2021
View reviewed changes
Copy link
Member

@dims dims left a comment

Choose a reason for hiding this comment

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

LGTM

@theopenlab-ci
Copy link

theopenlab-ci bot commented Jun 10, 2021

Build succeeded.

estesp
estesp approved these changes Jun 10, 2021
View reviewed changes
Copy link
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@estesp
Copy link
Member

estesp commented Jun 10, 2021

This PR will need to rebase on #5594 once we cherry pick it to release/1.5 due to a change in GitHub's virtual env for Ubuntu 18.04 that includes a new Go point release.

@tnqn
Copy link
Contributor Author

tnqn commented Jun 10, 2021

Sure, will do.

@tnqn
Fix cleanup context of teardownPodNetwork
31ecdf7 
Similar to other deferred cleanup operations, teardownPodNetwork should
use a different context as the original context may have expired,
otherwise CNI wouldn't been invoked, leading to leak of network
resources, e.g. IP addresses.

Signed-off-by: Quan Tian <qtian@vmware.com>
(cherry picked from commit 728743e)
@tnqn
Copy link
Contributor Author

tnqn commented Jun 11, 2021

@estesp rebased, thanks.

@theopenlab-ci
Copy link

theopenlab-ci bot commented Jun 11, 2021

Build succeeded.

@AkihiroSuda
Copy link
Member

AkihiroSuda commented Jun 11, 2021

/ok-to-test

@tnqn
Copy link
Contributor Author

tnqn commented Jun 11, 2021

/retest

@tnqn tnqn mentioned this pull request Jun 11, 2021
Closed
@estesp estesp merged commit d8b6682 into containerd:release/1.5 Jun 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dims dims dims approved these changes

@estesp estesp estesp approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

@fuweid fuweid Awaiting requested review from fuweid

Assignees

@dmcgowan dmcgowan

@mikebrow mikebrow

Labels

ok-to-test

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@tnqn @k8s-ci-robot @estesp @AkihiroSuda @dims @dmcgowan @mikebrow