Skip to content
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

[1.25] vendor: bump runc to 1.1.6 #117682

Merged
merged 1 commit into from May 5, 2023
Merged

[1.25] vendor: bump runc to 1.1.6 #117682

merged 1 commit into from May 5, 2023

Conversation

kolyshkin
Copy link
Contributor

What type of PR is this?

/kind bug

What this PR does / why we need it:

Bump runc/libcontainer to v1.1.6.

Which issue(s) this PR fixes:

Modifies: #117647

Special notes for your reviewer:

Does this PR introduce a user-facing change?

* CVE-2023-27561 CVE-2023-25809 CVE-2023-28642: Bump fix runc v1.1.4 -> v1.1.5
* Fixes a problem of cgroup removal when using runc binary >= 1.1.6 (#117647)

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@kolyshkin
[1.25] vendor: bump runc to 1.1.6
cc3bdb6 
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@k8s-ci-robot k8s-ci-robot added this to the v1.25 milestone Apr 29, 2023
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. kind/bug Categorizes issue or PR as related to a bug. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Apr 29, 2023
@kolyshkin
Copy link
Contributor Author

/sig node
/priority important-soon

@k8s-ci-robot k8s-ci-robot added sig/node Categorizes an issue or PR as relevant to SIG Node. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Apr 29, 2023
@k8s-ci-robot k8s-ci-robot added area/apiserver area/cloudprovider area/code-generation area/dependency Issues or PRs related to dependency changes area/kubectl sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/architecture Categorizes an issue or PR as relevant to SIG Architecture. sig/auth Categorizes an issue or PR as relevant to SIG Auth. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. labels Apr 29, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 527553ddf3e4d1c98afb239050cd4efc151bec5b

@dims
Copy link
Member

dims commented Apr 29, 2023

/assign @mrunalp @SergeyKanzhelev @liggitt

@bart0sh bart0sh added this to Triage in SIG Node PR Triage Apr 30, 2023
@bart0sh
Copy link
Contributor

bart0sh commented Apr 30, 2023

/triage accepted
/priority important-soon
/cc

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Apr 30, 2023
@bart0sh bart0sh moved this from Triage to Needs Approver in SIG Node PR Triage Apr 30, 2023
@liggitt
Copy link
Member

liggitt commented May 1, 2023

same comment/question as #117691 (comment)

dep mechanics lgtm (and unit/integration compatibility tests show we still pass tests with original minor version go release, which is good)

My understanding is that #117647 is caused by mismatched versions of the libcontainer library between kube and the runc binary used. Do the changes in this PR cause any issues with mismatched versions in the opposite direction if a runc binary older than 1.1.6 is used?

also, is there a test demonstrating #117647 is fixed with this change, and doesn't regress the currently working cgroupv2 combinations?

@kolyshkin kolyshkin mentioned this pull request May 2, 2023
Closed
@SergeyKanzhelev
Copy link
Member

/lgtm

samuelkarp
samuelkarp approved these changes May 3, 2023
View reviewed changes
Copy link
Contributor

@samuelkarp samuelkarp left a comment

Choose a reason for hiding this comment

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

LGTM

@liggitt
Copy link
Member

liggitt commented May 3, 2023

/approve
per #117691 (comment) and node lgtm

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 3, 2023
@liggitt
Copy link
Member

liggitt commented May 3, 2023

/hold just to double-check my understanding in #117691 (comment) is correct

@kolyshkin?

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 3, 2023
@liggitt
Copy link
Member

liggitt commented May 3, 2023

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 3, 2023
@kolyshkin
Copy link
Contributor Author

/hold just to double-check my understanding in #117691 (comment) is correct

@kolyshkin?

Yes, to my best knowledge, vendoring newer runc and using older runc binary is totally fine.

xmudrii
xmudrii approved these changes May 5, 2023
View reviewed changes
Copy link
Member

@xmudrii xmudrii left a comment

Choose a reason for hiding this comment

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

This is also cherry-picked to 1.26 in #117691
For RelEng:
/lgtm
/approve

@xmudrii xmudrii added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label May 5, 2023
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label May 5, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dims, kolyshkin, liggitt, samuelkarp, xmudrii

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

The pull request process is described here

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

@k8s-ci-robot k8s-ci-robot merged commit c51f7ed into kubernetes:release-1.25 May 5, 2023
17 checks passed
SIG Node PR Triage automation moved this from Needs Approver to Done May 5, 2023
@kolyshkin kolyshkin mentioned this pull request May 11, 2023
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

@xmudrii xmudrii xmudrii approved these changes

@andrewsykim andrewsykim Awaiting requested review from andrewsykim

@caesarxuchao caesarxuchao Awaiting requested review from caesarxuchao

@bart0sh bart0sh Awaiting requested review from bart0sh

Assignees

@dims dims

@mrunalp mrunalp

@liggitt liggitt

@SergeyKanzhelev SergeyKanzhelev

@xmudrii xmudrii

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver area/cloudprovider area/code-generation area/dependency Issues or PRs related to dependency changes area/kubectl cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/architecture Categorizes an issue or PR as relevant to SIG Architecture. sig/auth Categorizes an issue or PR as relevant to SIG Auth. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/storage Categorizes an issue or PR as relevant to SIG Storage. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Auth
Archived in project
SIG Node PR Triage
Done
Milestone
v1.25
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@kolyshkin @dims @k8s-ci-robot @bart0sh @liggitt @SergeyKanzhelev @samuelkarp @xmudrii @mrunalp