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

Skip to content

deps: bump runc/libcontainer 1.0.3 -> 1.1.2 #5506

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
Closed
kolyshkin wants to merge 3 commits into from
Closed

deps: bump runc/libcontainer 1.0.3 -> 1.1.2 #5506

kolyshkin wants to merge 3 commits into from

Conversation

@kolyshkin
Copy link
Collaborator

@kolyshkin kolyshkin commented Dec 14, 2021 •
edited
Loading

What type of PR is this?

/kind dependency-change

What this PR does / why we need it:

Bump runc from 1.0.3 to 1.1.2. For release notes, see https://github.com/opencontainers/runc/releases

Modify internal/config/cgmgr/cgroupfs.go to use a new (better, simpler)
way of getting a cgroup manager.

Which issue(s) this PR fixes:

None

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Update runc/libcontainer dependency to v1.1.2

@openshift-ci openshift-ci bot added release-note-none Denotes a PR that doesn't merit a release note. kind/dependency-change Categorizes issue or PR as related to changing dependencies dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Dec 14, 2021
@openshift-ci openshift-ci bot requested review from sboeuf and vrothberg December 14, 2021 21:36
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 14, 2021
@codecov
Copy link

codecov bot commented Dec 14, 2021 •
edited
Loading

Codecov Report

Merging #5506 (61745a4) into main (77718dc) will decrease coverage by 0.11%.
The diff coverage is 0.00%.

❗ Current head 61745a4 differs from pull request most recent head ad370ab. Consider uploading reports for the commit ad370ab to get more accurate results

@@            Coverage Diff             @@
##             main    #5506      +/-   ##
==========================================
- Coverage   43.36%   43.24%   -0.12%     
==========================================
  Files         123      120       -3     
  Lines       12296    12005     -291     
==========================================
- Hits         5332     5192     -140     
+ Misses       6450     6318     -132     
+ Partials      514      495      -19

haircommander
haircommander reviewed Dec 14, 2021
View reviewed changes
@haircommander
Copy link
Member

haircommander commented Dec 14, 2021

one nit, otherwise LGTM

@haircommander
Copy link
Member

haircommander commented Dec 14, 2021

also this needs an update to dependencies.yaml https://github.com/cri-o/cri-o/runs/4526579891?check_suite_focus=true

@haircommander haircommander mentioned this pull request Dec 14, 2021
Merged
@kolyshkin kolyshkin force-pushed the runc-1.1-rc branch 2 times, most recently from 0525ebd to 09487dc Compare December 15, 2021 00:28
@kolyshkin kolyshkin mentioned this pull request Dec 15, 2021
Closed
@kolyshkin
Copy link
Collaborator Author

kolyshkin commented Dec 15, 2021

/retest

saschagrunert
saschagrunert approved these changes Dec 15, 2021
View reviewed changes
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.

/retest-required

@adrianreber
Copy link
Member

adrianreber commented Dec 15, 2021

Would it also make sense to update scripts/versions to use the latest runc in CI. (Just asking because I need some of the 1.1.0 features).

@kolyshkin
Copy link
Collaborator Author

kolyshkin commented Dec 18, 2021

Would it also make sense to update scripts/versions to use the latest runc in CI. (Just asking because I need some of the 1.1.0 features).

I think I did that already

@haircommander
Copy link
Member

haircommander commented Dec 20, 2021

/retest
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 20, 2021
@openshift-bot
Copy link

openshift-bot commented Dec 20, 2021

/retest-required

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

5 similar comments
@openshift-bot
Copy link

openshift-bot commented Dec 20, 2021

/retest-required

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

@openshift-bot
Copy link

openshift-bot commented Dec 20, 2021

/retest-required

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

@openshift-bot
Copy link

openshift-bot commented Dec 20, 2021

/retest-required

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

@openshift-bot
Copy link

openshift-bot commented Dec 20, 2021

/retest-required

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

@openshift-bot
Copy link

openshift-bot commented Dec 20, 2021

/retest-required

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

@kolyshkin
Copy link
Collaborator Author

kolyshkin commented Feb 17, 2022

Some of the errors are caused by network glitches:

the build rpms failed after 3m26s with reason DockerBuildFailed: Dockerfile build strategy has failed.

http://vault.centos.org/centos/7/os/Source/repodata/repomd...:1f13:2e7:2901:d2b0:c3b2:9347:934c: Network is unreachable"
http://vault.centos.org/centos/7/os/Source/repodata/repomd...:1f13:2e7:2901:d2b0:c3b2:9347:934c: Network is unreachable"
http://vault.centos.org/centos/7/os/Source/repodata/repomd...:1f13:2e7:2901:d2b0:c3b2:9347:934c: Network is unreachable"
[ERROR] hack/build-rpms.sh:31: `yum-builddep -y "${OS_RPM_SPECFILE}"` exited with status 1.

@kolyshkin
Copy link
Collaborator Author

kolyshkin commented Feb 17, 2022

/retest

2 similar comments
@kolyshkin
Copy link
Collaborator Author

kolyshkin commented Feb 17, 2022

/retest

@kolyshkin
Copy link
Collaborator Author

kolyshkin commented Feb 17, 2022

/retest

@kolyshkin
Copy link
Collaborator Author

kolyshkin commented Feb 22, 2022

rebased on top of main HEAD

saschagrunert
saschagrunert approved these changes Feb 22, 2022
View reviewed changes
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.

/retest-required
LGTM

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 22, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kolyshkin, 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:
  • OWNERS [kolyshkin,saschagrunert]

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

@TomSweeneyRedHat
Copy link
Contributor

TomSweeneyRedHat commented Feb 23, 2022

LGTM
once tests are happy

@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 24, 2022
@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 2, 2022
@kolyshkin
Copy link
Collaborator Author

kolyshkin commented Jun 2, 2022

Better late than never, let's revive this one.

@openshift-ci openshift-ci bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Jun 2, 2022
kolyshkin added 3 commits June 2, 2022 10:05
@kolyshkin
deps: bump runc 1.0.3 -> 1.1.2
276b201 
Also, adopt internal/config/cgmgr/cgroupfs.go to benefit from a much
simpler way of getting a proper cgroup manager.

Signed-off-by: Kir Kolyshkin <[email protected]>
@kolyshkin
scripts/versions: bump runc 1.1.1 -> 1.1.2
3624347 
Signed-off-by: Kir Kolyshkin <[email protected]>
@kolyshkin
contrib/test/int/build/runc: rm build tags
ad370ab 
 - selinux tag is no longer needed (since runc v1.0.0-rc93);
 - seccomp tag is enabled by default (since about the same time).

Signed-off-by: Kir Kolyshkin <[email protected]>
@kolyshkin
Copy link
Collaborator Author

kolyshkin commented Jun 2, 2022

Rebased to resolve a merge conflict caused by #5906.

@kolyshkin
Copy link
Collaborator Author

kolyshkin commented Jun 2, 2022

/retest

@kolyshkin kolyshkin changed the title deps: bump runc to 1.1.0 deps: bump runc/libcontainer 1.0.3 -> 1.1.2 Jun 2, 2022
@kolyshkin kolyshkin mentioned this pull request Jun 2, 2022
Merged
@kolyshkin
Copy link
Collaborator Author

kolyshkin commented Jun 3, 2022

/retest

1 similar comment
@kolyshkin
Copy link
Collaborator Author

kolyshkin commented Jun 6, 2022

/retest

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 6, 2022

@kolyshkin: The following tests 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 ad370ab link false /test integration_cgroupv2
ci/prow/e2e-gcp ad370ab link true /test e2e-gcp
ci/prow/e2e-agnostic ad370ab link true /test e2e-agnostic

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.

@kolyshkin
Copy link
Collaborator Author

kolyshkin commented Jun 8, 2022

Well, after #5917 is merged I'll redo this one from scratch.

@kolyshkin kolyshkin closed this Jun 8, 2022
@saschagrunert
Copy link
Member

saschagrunert commented Jun 8, 2022

Whoops sorry for that @kolyshkin 🙏

@saschagrunert saschagrunert mentioned this pull request Jun 16, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@haircommander haircommander haircommander left review comments

@saschagrunert saschagrunert saschagrunert approved these changes

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

@runcom runcom Awaiting requested review from runcom

@sboeuf sboeuf Awaiting requested review from sboeuf

@vrothberg vrothberg Awaiting requested review from vrothberg

Assignees

@haircommander haircommander

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. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. kind/dependency-change Categorizes issue or PR as related to changing dependencies release-note Denotes a PR that will be considered when it comes time to generate release notes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@kolyshkin @haircommander @adrianreber @openshift-bot @TomSweeneyRedHat @saschagrunert