Skip to content

Automated cherry pick of #103743: vendor: bump runc to 1.0.1#103882

Merged
k8s-ci-robot merged 2 commits intokubernetes:release-1.22from
rphillips:automated-cherry-pick-of-#103743-upstream-release-1.22
Jul 26, 2021
Merged

Automated cherry pick of #103743: vendor: bump runc to 1.0.1#103882
k8s-ci-robot merged 2 commits intokubernetes:release-1.22from
rphillips:automated-cherry-pick-of-#103743-upstream-release-1.22

Conversation

@rphillips
Copy link
Copy Markdown
Member

@rphillips rphillips commented Jul 23, 2021 •
edited
Loading

Cherry pick of #103743 on release-1.22.

#103743: vendor: bump runc to 1.0.1

For details on the cherry pick process, see the cherry pick requests page.

Release Note:

Bump runc to 1.0.1

kolyshkin added 2 commits July 23, 2021 13:54
@kolyshkin @rphillips
vendor: bump runc to 1.0.1
981b7fc 
The commands used were (roughly):

	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/opencontainers/selinux v1.8.2
	hack/pin-dependency.sh github.com/sirupsen/logrus v1.8.1
	# Recheck.
	hack/lint-dependencies.sh
	GO111MODULE=on go mod edit -dropreplace github.com/willf/bitset
	hack/update-vendor.sh
	# Recheck.
	hack/lint-dependencies.sh
	hack/update-internal-modules.sh
	# Recheck.
	hack/lint-dependencies.sh

Signed-off-by: Kir Kolyshkin <[email protected]>
@kolyshkin @rphillips
kubelet/cm: don't set Devices
83de5b1 
Since runc 1.0.0 it is now sufficient to have SkipDevices: true.

Signed-off-by: Kir Kolyshkin <[email protected]>
@k8s-ci-robot k8s-ci-robot added this to the v1.22 milestone Jul 23, 2021
@k8s-ci-robot k8s-ci-robot added do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. 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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. area/apiserver area/cloudprovider area/dependency Issues or PRs related to dependency changes area/kubelet labels Jul 23, 2021
@k8s-ci-robot k8s-ci-robot requested review from a team, andrewsykim and dchen1107 July 23, 2021 18:55
@k8s-ci-robot k8s-ci-robot added sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/auth Categorizes an issue or PR as relevant to SIG Auth. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. 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 Jul 23, 2021
@rphillips
Copy link
Copy Markdown
Member Author

rphillips commented Jul 23, 2021

/kind bug
/sig node
/priority critical-urgent

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. 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. and removed do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. 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 Jul 23, 2021
@ehashman
Copy link
Copy Markdown
Member

ehashman commented Jul 23, 2021

@rphillips can you please add a release note? runc version bump is user facing

ehashman
ehashman reviewed Jul 23, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@ehashman ehashman left a comment

Choose a reason for hiding this comment

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

/triage accepted
/lgtm

confirmed patch matches previous PR exactly

@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 Jul 23, 2021
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 23, 2021
@ehashman
Copy link
Copy Markdown
Member

ehashman commented Jul 23, 2021

/hold

for release note and for master PR to merge

@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 Jul 23, 2021
@dims
Copy link
Copy Markdown
Member

dims commented Jul 23, 2021

/approve
/lgtm
/assign @liggitt

@kolyshkin kolyshkin mentioned this pull request Jul 23, 2021
Closed
@k8s-ci-robot k8s-ci-robot 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 Jul 23, 2021
@liggitt
Copy link
Copy Markdown
Member

liggitt commented Jul 26, 2021

/approve

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 26, 2021
saschagrunert
saschagrunert approved these changes Jul 26, 2021
View reviewed changes
Copy link
Copy Markdown
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.

Approving for SIG release
/lgtm

@saschagrunert saschagrunert added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Jul 26, 2021
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Jul 26, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dims, liggitt, rphillips, 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

@liggitt
Copy link
Copy Markdown
Member

liggitt commented Jul 26, 2021

/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 Jul 26, 2021
@k8s-ci-robot k8s-ci-robot merged commit f9ff525 into kubernetes:release-1.22 Jul 26, 2021
@liggitt liggitt added the kind/regression Categorizes issue or PR as related to a regression from a prior release. label Apr 27, 2022
@liggitt liggitt removed the kind/regression Categorizes issue or PR as related to a regression from a prior release. label Sep 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@saschagrunert saschagrunert saschagrunert approved these changes

@andrewsykim andrewsykim Awaiting requested review from andrewsykim

@dchen1107 dchen1107 Awaiting requested review from dchen1107

+1 more reviewer

@ehashman ehashman ehashman left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@dims dims

@saschagrunert saschagrunert

@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/dependency Issues or PRs related to dependency changes area/kubelet 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/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. 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/auth Categorizes an issue or PR as relevant to SIG Auth. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/node Categorizes an issue or PR as relevant to SIG Node. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.

Projects

SIG Auth
Archived in project

Milestone

v1.22

Development

Successfully merging this pull request may close these issues.

7 participants

@rphillips @ehashman @dims @liggitt @k8s-ci-robot @saschagrunert @kolyshkin