Skip to content

[1.21] vendor: bump runc to 1.0.1#103746

Closed
kolyshkin wants to merge 2 commits intokubernetes:release-1.21from
kolyshkin:1.21-runc-1.0.1
Closed

[1.21] vendor: bump runc to 1.0.1#103746
kolyshkin wants to merge 2 commits intokubernetes:release-1.21from
kolyshkin:1.21-runc-1.0.1

Conversation

@kolyshkin
Copy link
Copy Markdown
Contributor

@kolyshkin kolyshkin commented Jul 16, 2021 •
edited
Loading

What type of PR is this?

/kind bug

What this PR does / why we need it:

Bumping runc dependency to 1.0.1, fixing a few issues.

For runc release notes, see

This is a backport of #103743 to release-1.21 branch, replacing #103392.

Which issue(s) this PR fixes:

Fixes: #102676

Special notes for your reviewer:

I am not backporting the second commit from PR #103743 as it's not important (a cleanup).

Does this PR introduce a user-facing change?

NONE

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

none

liggitt and others added 2 commits July 16, 2021 13:14
@liggitt @kolyshkin
Switch to non-deprecated timestamppb.Now()
8ed7937 
(cherry picked from commit ff2c614)

[kolyshkin: run ./hack/update-vendor.sh]
Signed-off-by: Kir Kolyshkin <[email protected]>
@kolyshkin
vendor: bump runc to 1.0.1
28e2476 
The commands used were:

	hack/pin-dependency.sh github.com/opencontainers/runc v1.0.1
	hack/lint-dependencies.sh
	# Follow its recommendations.
	hack/pin-dependency.sh github.com/cilium/ebpf v0.6.2
	hack/pin-dependency.sh github.com/coreos/go-systemd/v22 v22.3.2
	hack/pin-dependency.sh github.com/opencontainers/selinux v1.8.2
	hack/pin-dependency.sh github.com/sirupsen/logrus v1.8.1
	# Repeat.
	hack/lint-dependencies.sh
	hack/pin-dependency.sh google.golang.org/protobuf v1.26.0
	GO111MODULE=on go mod edit -dropreplace github.com/willf/bitset
	# Update vendor.
	hack/update-vendor.sh
	git add vendor
	git add LICENSES/
	git status
	# Repeat.
	hack/lint-dependencies.sh
	hack/pin-dependency.sh github.com/golang/protobuf v1.5.0
	hack/pin-dependency.sh github.com/google/go-cmp v0.5.5
	hack/update-vendor.sh
	git status
	git add vendor/
	git status
	# Recheck.
	hack/lint-dependencies.sh
	hack/update-internal-modules.sh
	git status

Signed-off-by: Kir Kolyshkin <[email protected]>
@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Jul 16, 2021
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Jul 16, 2021
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Jul 16, 2021

@kolyshkin: This cherry pick PR is for a release branch and has not yet been approved by Release Managers.
Adding the do-not-merge/cherry-pick-not-approved label.

To merge this cherry pick, it must first be approved (/lgtm + /approve) by the relevant OWNERS.

AFTER it has been approved by code owners, please ping the kubernetes/release-managers team in a comment to request a cherry pick review.

(For details on the patch release process and schedule, see the Patch Releases page.)

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.

@k8s-ci-robot k8s-ci-robot added 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. labels Jul 16, 2021
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Jul 16, 2021

Hi @kolyshkin. Thanks for your PR.

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

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. area/apiserver area/cloudprovider area/code-generation area/dependency Issues or PRs related to dependency changes area/kubectl area/test sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. 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. sig/testing Categorizes an issue or PR as relevant to SIG Testing. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jul 16, 2021
@k8s-ci-robot k8s-ci-robot requested a review from andrewsykim July 16, 2021 20:29
@kolyshkin
Copy link
Copy Markdown
Contributor Author

kolyshkin commented Jul 28, 2021

@chrischdi I took a look at the commit in this PR and it does the fix to the problem we were having (the fix is opencontainers/runc#2997).

From what I see, this seems like a problem with cherry-picking, or building, or something similar -- but if runc/libcontainer/cgroups/systemd is used to create a slice, it never returns "unit already exist" error.

@chrischdi
Copy link
Copy Markdown
Member

chrischdi commented Jul 29, 2021

@chrischdi I took a look at the commit in this PR and it does the fix to the problem we were having (the fix is opencontainers/runc#2997).

From what I see, this seems like a problem with cherry-picking, or building, or something similar -- but if runc/libcontainer/cgroups/systemd is used to create a slice, it never returns "unit already exist" error.

@kolyshkin thanks for taking a look again and sorry for the above message. You are totally right, I made a mistake building the cherry-picked variant (typo in our build pipeline :-( so the patch was there but did not get applied)

This was referenced Aug 9, 2021
Closed
Closed
Closed
Closed
@manugupt1
Copy link
Copy Markdown
Contributor

manugupt1 commented Aug 9, 2021

Looks good to me. thanks
/lgtm

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Aug 9, 2021

@manugupt1: changing LGTM is restricted to collaborators

Details

In response to this:

Looks good to me. thanks
/lgtm

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.

@liggitt
Copy link
Copy Markdown
Member

liggitt commented Aug 9, 2021

what is the status on this? does it resolve the reported regressions in 1.21, or is there still work to do?

@kolyshkin
Copy link
Copy Markdown
Contributor Author

kolyshkin commented Aug 9, 2021

what is the status on this? does it resolve the reported regressions in 1.21, or is there still work to do?

@liggitt from my perspective, it does.

@chrischdi chrischdi mentioned this pull request Aug 10, 2021
Closed
@dims
Copy link
Copy Markdown
Member

dims commented Aug 10, 2021

@kolyshkin you mean this one #102676 right? are there others?

@dims
Copy link
Copy Markdown
Member

dims commented Aug 10, 2021

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 10, 2021
@karuppiah7890
Copy link
Copy Markdown

karuppiah7890 commented Aug 10, 2021

/assign @liggitt

@liggitt
Copy link
Copy Markdown
Member

liggitt commented Aug 10, 2021

dependency mechanics lgtm

needs node approval

@derekwaynecarr
Copy link
Copy Markdown
Member

derekwaynecarr commented Aug 10, 2021

/approve

1 similar comment
@liggitt
Copy link
Copy Markdown
Member

liggitt commented Aug 10, 2021

/approve

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Aug 10, 2021

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 10, 2021
@ehashman
Copy link
Copy Markdown
Member

ehashman commented Aug 10, 2021

/lgtm
(late, but we need this to fix #102676 on 1.21 which is a critical regression)

@liggitt
Copy link
Copy Markdown
Member

liggitt commented Aug 10, 2021

cc @kubernetes/release-managers for branch approval

@odinuge
Copy link
Copy Markdown
Member

odinuge commented Aug 10, 2021

Sorry for being late, as I have had some time of/AFK after delivering my thesis.

The issues are still present here ref. #103743 (comment). Should we merge this, or should we hold off until properly fixed? The new "bug" is even harder to spot, and "impossible" to debug... :/

This is too late for 1.21.4 anyways, so we still need to wait for 1.21.5 either way.. :/

@liggitt
Copy link
Copy Markdown
Member

liggitt commented Aug 10, 2021

/hold for node approver ack of #103746 (comment)

@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 Aug 10, 2021
@kolyshkin kolyshkin closed this Aug 23, 2021
@kolyshkin kolyshkin mentioned this pull request Aug 23, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@andrewsykim andrewsykim Awaiting requested review from andrewsykim

@bowei bowei Awaiting requested review from bowei

1 more reviewer

@ehashman ehashman ehashman left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@dims dims

@liggitt liggitt

@ehashman ehashman

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 area/test cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. 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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note-none Denotes a PR that doesn't merit a release note. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. 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. sig/testing Categorizes an issue or PR as relevant to SIG Testing. 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 Node CI/Test Board
Archived in project
SIG Node: code and documentation PRs
Archived in project

Milestone

v1.21

Development

Successfully merging this pull request may close these issues.