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

Skip to content

Conversation

@littlejawa
Copy link
Contributor

@littlejawa littlejawa commented Jun 9, 2022

What type of PR is this?

/kind dependency-change

What this PR does / why we need it:

Update containerd golang dependency

Which issue(s) this PR fixes:

None

Special notes for your reviewer:

This PR completes the work done on #5917

Does this PR introduce a user-facing change?

None

@openshift-ci openshift-ci bot added the dco-signoff: yes Indicates the PR's author has DCO signed all their commits. label Jun 9, 2022
@openshift-ci openshift-ci bot requested review from QiWang19 and wgahnagl June 9, 2022 12:28
@openshift-ci openshift-ci bot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. kind/dependency-change Categorizes issue or PR as related to changing dependencies needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 9, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 9, 2022

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

@littlejawa
Copy link
Contributor Author

@saschagrunert can you have a look?

@fidencio
Copy link
Contributor

fidencio commented Jun 9, 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 Jun 9, 2022
@fidencio
Copy link
Contributor

fidencio commented Jun 9, 2022

@littlejawa, the code itself seems reasonable, but I really would like to have as much info as possible in the commit message describing why we need this change.

You've done an amazing investigative work to figure out which commit, on containerd side, requires us to do such a change; and we'd be better having that as part of the commit message.

WDYT?

@littlejawa
Copy link
Contributor Author

@littlejawa, the code itself seems reasonable, but I really would like to have as much info as possible in the commit message describing why we need this change.
[...]
WDYT?

Sure, I will add that :-)

@littlejawa littlejawa force-pushed the update_containerd_vendor branch from 687ad9b to ff59068 Compare June 9, 2022 13:00
@littlejawa
Copy link
Contributor Author

updated the commit message. No code change

@saschagrunert
Copy link
Member

Thank you for the PR! The vendor CI check seems to fail, please run go mod tidy && go mod vendor to fix that up :)

Updating containerd to 1.6.4.
Had to modify the way we call the Command() function from containerd:
- use of the CommandConfig structure as parameter
- use the actual binary name
  (no more converting to containerd binary naming pattern)

This later change was needed as in Containerd 1.6, the validation of the given
binary path is not done in Command() anymore - the path is used as is, allowing
custom runtime paths.
(see containerd/containerd@6870f3b1)

Signed-off-by: Julien Ropé <[email protected]>
@littlejawa littlejawa force-pushed the update_containerd_vendor branch from ff59068 to 67c1810 Compare June 9, 2022 14:18
Copy link
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

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

/lgtm
/release-note-none

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

openshift-ci bot commented Jun 9, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: littlejawa, saschagrunert

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 Jun 9, 2022
@saschagrunert
Copy link
Member

/release-note-none

@openshift-ci openshift-ci bot added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Jun 9, 2022
@fidencio
Copy link
Contributor

fidencio commented Jun 9, 2022

@littlejawa, could you add the following comment to the commit that's actually doing that?

Had to modify the way we call the Command() function from containerd:
- use of the CommandConfig structure as parameter
- use the actual binary name
  (no more converting to containerd binary naming pattern)

This later change was needed as in Containerd 1.6, the validation of the given
binary path is not done in Command() anymore - the path is used as is, allowing
custom runtime paths.
(see https://github.com/containerd/containerd/commit/6870f3b1)

@littlejawa
Copy link
Contributor Author

littlejawa commented Jun 9, 2022

could you add the following comment to the commit that's actually doing that?

@fidencio - I did (I think?). The commit with this comment is updating containerd AND modifying runtim_vm.go to make it compatible with the new API. That what is described here.

The other commit is cleanup, that remove the function that is no longer called (because of the change in the first commit).

Am I missing something? Or should I rephrase it somehow?

@fidencio
Copy link
Contributor

fidencio commented Jun 9, 2022

could you add the following comment to the commit that's actually doing that?

@fidencio - I did (I think?). The commit with this comment is updating containerd AND modifying runtim_vm.go to make it compatible with the new API. That what is described here.

The other commit is cleanup, that remove the function that is no longer called (because of the change in the first commit).

Am I missing something? Or should I rephrase it somehow?

Oh, no, we're fine. I missed one bit here on my side. :-)

@fidencio
Copy link
Contributor

fidencio commented Jun 9, 2022

LGTM!

@openshift-bot
Copy link

/retest-required

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

1 similar comment
@openshift-bot
Copy link

/retest-required

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

@saschagrunert
Copy link
Member

/test integration_crun

1 similar comment
@saschagrunert
Copy link
Member

/test integration_crun

@openshift-bot
Copy link

/retest-required

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

@openshift-bot
Copy link

/retest-required

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

2 similar comments
@openshift-bot
Copy link

/retest-required

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

@openshift-bot
Copy link

/retest-required

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

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 9, 2022

@littlejawa: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/openshift-jenkins/integration_crun_cgroupv2 67c1810 link false /test integration_cgroupv2

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@openshift-bot
Copy link

/retest-required

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

@saschagrunert
Copy link
Member

/override ci/openshift-jenkins/integration_crun

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 9, 2022

@saschagrunert: Overrode contexts on behalf of saschagrunert: ci/openshift-jenkins/integration_crun

Details

In response to this:

/override ci/openshift-jenkins/integration_crun

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-merge-robot openshift-merge-robot merged commit 9a6db1a into cri-o:main Jun 9, 2022
@littlejawa littlejawa deleted the update_containerd_vendor branch June 10, 2022 06:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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

Development

Successfully merging this pull request may close these issues.

5 participants