Thanks to visit codestin.com
Credit goes to github.com

Skip to content

runtime_vm: use containerd deps for container io directly #5806

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
openshift-merge-robot merged 2 commits into from
Apr 27, 2022
Merged

runtime_vm: use containerd deps for container io directly #5806

openshift-merge-robot merged 2 commits into from
Apr 27, 2022

Conversation

@sleepymole
Copy link
Contributor

@sleepymole sleepymole commented Apr 17, 2022 •
edited
Loading

What type of PR is this?

/kind dependency-change

What this PR does / why we need it:

Historically, a long time ago, a bunch of containerd code was brought into CRI-O to avoid vendoring. However, those code cannot receive bug fixes from containerd.

See #5574 (comment) for more details.

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

None

@openshift-ci openshift-ci bot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. kind/dependency-change Categorizes issue or PR as related to changing dependencies dco-signoff: no Indicates the PR's author has not DCO signed all their commits. labels Apr 17, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 17, 2022

Hi @gozssky. Thanks for your PR.

I'm waiting for a cri-o 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.

@openshift-ci openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Apr 17, 2022
@openshift-ci openshift-ci bot requested review from QiWang19 and klihub April 17, 2022 09:18
@openshift-ci openshift-ci bot added dco-signoff: yes Indicates the PR's author has DCO signed all their commits. and removed dco-signoff: no Indicates the PR's author has not DCO signed all their commits. labels Apr 17, 2022
@sleepymole sleepymole marked this pull request as ready for review April 17, 2022 09:29
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 17, 2022
@openshift-ci openshift-ci bot requested a review from fgiudici April 17, 2022 09:29
@fidencio
Copy link
Contributor

fidencio commented Apr 20, 2022

I will go through this PR Tomorrow. It's on my TODO list.

@fidencio
Copy link
Contributor

fidencio commented Apr 20, 2022

/ok-to-test

@openshift-ci openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 20, 2022
@haircommander
Copy link
Member

haircommander commented Apr 21, 2022

/approve

@gozssky thanks for the PR! can you rebase to get test fixes

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 21, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gozssky, haircommander

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 21, 2022
@sleepymole
Copy link
Contributor Author

sleepymole commented Apr 25, 2022

/retest

@sleepymole
Copy link
Contributor Author

sleepymole commented Apr 25, 2022

@haircommander It seems all tests have passed.

@haircommander
Copy link
Member

haircommander commented Apr 25, 2022

ping @fidencio @fgiudici for final lgtm

fgiudici
fgiudici reviewed Apr 26, 2022
View reviewed changes
Copy link
Contributor

@fgiudici fgiudici left a comment

Choose a reason for hiding this comment

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

LGTM, thanks @gozssky :-)

internal/oci/runtime_vm.go

return cInfo.cio.Attach(opts)
cInfo.cio.Attach(opts)
return nil
Copy link
Contributor

@fgiudici fgiudici Apr 26, 2022

Choose a reason for hiding this comment

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

just a note for reviewers: we previously generated an error only if utils.GenerateID() failed (just the generation of a unique ID).
Also if we encountered an error while performing the Attach(), we logged it but returned nil.
So, looks fine to me always returning nil (as containerd's Attach() doesn't return any error).

@fidencio
Copy link
Contributor

fidencio commented Apr 26, 2022

/lgtm

Thanks @gozssky for following up on this one, and sorry it took longer than expected for a review from my side.

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 26, 2022
@openshift-bot
Copy link

openshift-bot commented Apr 26, 2022

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@fidencio
Copy link
Contributor

fidencio commented Apr 26, 2022

/test e2e_fedora

@openshift-bot
Copy link

openshift-bot commented Apr 26, 2022

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@sleepymole
Copy link
Contributor Author

sleepymole commented Apr 26, 2022

/retest-required

@openshift-bot
Copy link

openshift-bot commented Apr 26, 2022

/retest-required

Please review the full test history for this PR and help us cut down flakes.

2 similar comments
@openshift-bot
Copy link

openshift-bot commented Apr 26, 2022

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

openshift-bot commented Apr 26, 2022

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@haircommander haircommander added this to the 1.24 milestone Apr 26, 2022
@openshift-bot
Copy link

openshift-bot commented Apr 26, 2022

/retest-required

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link

openshift-bot commented Apr 27, 2022

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@sleepymole
Copy link
Contributor Author

sleepymole commented Apr 27, 2022

/test integration_fedora

@openshift-merge-robot openshift-merge-robot merged commit af4c8ed into cri-o:main Apr 27, 2022
@sleepymole sleepymole deleted the patch-cio branch April 27, 2022 05:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@klihub klihub Awaiting requested review from klihub

@QiWang19 QiWang19 Awaiting requested review from QiWang19

@fidencio fidencio Awaiting requested review from fidencio fidencio is a code owner

@mrunalp mrunalp Awaiting requested review from mrunalp mrunalp is a code owner

@runcom runcom Awaiting requested review from runcom

1 more reviewer

@fgiudici fgiudici fgiudici left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@fidencio fidencio

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/dependency-change Categorizes issue or PR as related to changing dependencies lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note-none Denotes a PR that doesn't merit a release note.

Projects

None yet

Milestone

1.24

Development

Successfully merging this pull request may close these issues.

6 participants

@sleepymole @fidencio @haircommander @openshift-bot @fgiudici @openshift-merge-robot