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

vendor: bump runc to 1.1.6 #117241

Merged
merged 1 commit into from
Apr 24, 2023
Merged

vendor: bump runc to 1.1.6 #117241

merged 1 commit into from
Apr 24, 2023

Conversation

haircommander
Copy link
Contributor

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

bumps runc to 1.1.6, which has a number of fixes, including cleaning up of the Misc controller and retrying systemd cgroup creation when the unit partially exists

Which issue(s) this PR fixes:

Fixes #112124

Special notes for your reviewer:

Does this PR introduce a user-facing change?

none

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

@haircommander
vendor: bump runc to 1.1.6
b4c384e 
Signed-off-by: Peter Hunt <pehunt@redhat.com>
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. 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. area/dependency Issues or PRs related to dependency changes labels Apr 12, 2023
@k8s-ci-robot k8s-ci-robot requested review from derekwaynecarr, logicalhan and a team April 12, 2023 13:23
@haircommander haircommander mentioned this pull request Apr 12, 2023
Merged
@liggitt
Copy link
Member

liggitt commented Apr 12, 2023

/sig node

@k8s-ci-robot k8s-ci-robot added sig/node Categorizes an issue or PR as relevant to SIG Node. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Apr 12, 2023
@bart0sh
Copy link
Contributor

bart0sh commented Apr 13, 2023

/triage accepted
/priority important-longterm
/assign @SergeyKanzhelev @mrunalp

@k8s-ci-robot k8s-ci-robot added the triage/accepted Indicates an issue or PR is ready to be actively worked on. label Apr 13, 2023
@k8s-ci-robot k8s-ci-robot added priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. and removed 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 13, 2023
@rphillips
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 24, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 6640b3b19de2c3ba7d42036911a828df219159be

@rphillips
Copy link
Member

/cherry-pick release-1.27

@rphillips rphillips mentioned this pull request Apr 24, 2023
Closed
liggitt
liggitt reviewed Apr 24, 2023
View reviewed changes
vendor/github.com/opencontainers/runc/libcontainer/cgroups/systemd/common.go
Comment on lines +370 to +373
// TODO: remove this hack.
// This is kubelet making sure a slice exists (see
// https://github.com/opencontainers/runc/pull/1124).
return nil
Copy link
Member

Choose a reason for hiding this comment

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

is there an issue tracking this TODO? the linked issue is from 2016 and is closed... it's not clear what remaining work is needed in runc or in the kubelet

Copy link
Contributor

Choose a reason for hiding this comment

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

@kolyshkin Did we have to update any kubelet calls to include the boolean here?

Copy link
Contributor

Choose a reason for hiding this comment

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

There is no issue created; I am intending to look at it but hasn't yet. For now, nothing needs to be changed, as the old behavior is preserved for kubelet.

TL;DR: systemd driver was modified in opencontainers/runc#1124 to ignore UnitExists error, which is totally wrong (see opencontainers/runc#3780), but since kubelet relies on this behavior, runc 1.1.6 keeps it.

The TODO item needs to be addressed in kubelet first, when runc. There's no rush to do so.

@liggitt
Copy link
Member

liggitt commented Apr 24, 2023

/approve
for dependency update

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 24, 2023
@mrunalp
Copy link
Contributor

mrunalp commented Apr 24, 2023

/lgtm

kolyshkin
kolyshkin approved these changes Apr 24, 2023
View reviewed changes
Copy link
Contributor

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

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

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, kolyshkin, liggitt

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 a876116 into kubernetes:master Apr 24, 2023
@k8s-ci-robot k8s-ci-robot added this to the v1.28 milestone Apr 24, 2023
@kolyshkin kolyshkin mentioned this pull request Apr 29, 2023
Closed
@humblec humblec mentioned this pull request Apr 29, 2023
Merged
2 tasks
@dims
Copy link
Member

dims commented Apr 29, 2023

xref: #117647

This was referenced May 9, 2023
Merged
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@liggitt liggitt liggitt left review comments

@mrunalp mrunalp mrunalp left review comments

@kolyshkin kolyshkin kolyshkin approved these changes

@derekwaynecarr derekwaynecarr Awaiting requested review from derekwaynecarr

@logicalhan logicalhan Awaiting requested review from logicalhan

Assignees

@rphillips rphillips

@mrunalp mrunalp

@SergeyKanzhelev SergeyKanzhelev

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/dependency Issues or PRs related to dependency changes cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. release-note-none Denotes a PR that doesn't merit a release note. sig/node Categorizes an issue or PR as relevant to SIG Node. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Node: code and documentation PRs
Archived in project
Milestone
v1.28
9 participants
@haircommander @liggitt @bart0sh @rphillips @k8s-ci-robot @mrunalp @dims @kolyshkin @SergeyKanzhelev