Skip to content

[release/1.6] Setup pod network after creating the sandbox container#7456

Merged
samuelkarp merged 2 commits intocontainerd:release/1.6from
qiutongs:backport-ip-leakage-1.6
Oct 2, 2022
Merged

[release/1.6] Setup pod network after creating the sandbox container#7456
samuelkarp merged 2 commits intocontainerd:release/1.6from
qiutongs:backport-ip-leakage-1.6

Conversation

@qiutongs
Copy link
Copy Markdown
Contributor

@qiutongs qiutongs commented Sep 30, 2022 •
edited
Loading

This is backporting #5904 to 1.6. It is on top of failpoint control backport in #7455

Testing

$ script/setup/install-failpoint-binaries
$ CONTAINERD_RUNTIME=runc FOCUS=TestRunPodSandboxWithShimStartAndTeardownCNIFailure make cri-integration
$ CONTAINERD_RUNTIME=runc FOCUS=TestRunPodSandboxWithShimDeleteFailure make cri-integration

@k8s-ci-robot
Copy link
Copy Markdown

k8s-ci-robot commented Sep 30, 2022

Hi @qiutongs. 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.

@qiutongs
Copy link
Copy Markdown
Contributor Author

qiutongs commented Sep 30, 2022

/cc @fuweid @samuelkarp @dmcgowan

@qiutongs
Copy link
Copy Markdown
Contributor Author

qiutongs commented Sep 30, 2022

CI linux integration test failed due to

./script/test/cri-integration.sh: line 49: ENABLE_CRI_SANDBOXES: unbound variable

I mitigated this problem locally by having ENABLE_CRI_SANDBOXES=""

@samuelkarp
Copy link
Copy Markdown
Member

samuelkarp commented Sep 30, 2022

You can drop 5e83a71; the release/1.6 branch doesn't have ENABLE_CRI_SANDBOXES since there is no Sandbox API or sbserver in this version.

@qiutongs qiutongs force-pushed the backport-ip-leakage-1.6 branch 2 times, most recently from 77ef90e to 995f35a Compare September 30, 2022 12:02
@samuelkarp
Copy link
Copy Markdown
Member

samuelkarp commented Sep 30, 2022

/ok-to-test

@samuelkarp samuelkarp added this to the 1.6.9 milestone Sep 30, 2022
@samuelkarp samuelkarp added impact/changelog area/cri Container Runtime Interface (CRI) labels Sep 30, 2022
@qiutongs
Persist container and sandbox if resource cleanup fails, like teardow…
1f29fac 
…nPodNetwork

Signed-off-by: Qiutong Song <[email protected]>
(cherry picked from commit 4f4aad0)
Signed-off-by: Qiutong Song <[email protected]>
@qiutongs
Add integration tests with failpoint
b9a35c6 
Signed-off-by: Qiutong Song <[email protected]>
(cherry picked from commit 4196fad)
Signed-off-by: Qiutong Song <[email protected]>
@qiutongs qiutongs changed the title [Draft] Backport ip leakage fix to 1.6 [release/1.6] Setup pod network after creating the sandbox container Sep 30, 2022
@qiutongs qiutongs force-pushed the backport-ip-leakage-1.6 branch from 995f35a to b9a35c6 Compare September 30, 2022 21:22
@samuelkarp samuelkarp merged commit a91dd67 into containerd:release/1.6 Oct 2, 2022
@qiutongs qiutongs deleted the backport-ip-leakage-1.6 branch October 2, 2022 22:15
@qiutongs qiutongs mentioned this pull request Oct 3, 2022
Merged
@dcantah dcantah mentioned this pull request Dec 20, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@samuelkarp samuelkarp samuelkarp approved these changes

@fuweid fuweid fuweid approved these changes

@dmcgowan dmcgowan Awaiting requested review from dmcgowan

Assignees

No one assigned

Labels

area/cri Container Runtime Interface (CRI) impact/changelog ok-to-test

Projects

None yet

Milestone

1.6.9

Development

Successfully merging this pull request may close these issues.

4 participants

@qiutongs @k8s-ci-robot @samuelkarp @fuweid