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

Bug 1993980: UPSTREAM: 104529: [1.22] vendor: bump runc to 1.0.2 #910

Merged
merged 4 commits into from Aug 27, 2021
Merged

Bug 1993980: UPSTREAM: 104529: [1.22] vendor: bump runc to 1.0.2 #910

merged 4 commits into from Aug 27, 2021

Conversation

kolyshkin
Copy link

@kolyshkin kolyshkin commented Aug 26, 2021 •
edited

Manual backport of upstream PRs kubernetes#103743 and kubernetes#103743 to fix freeze-related issues.

@kolyshkin
UPSTREAM: 103743: vendor: bump runc to 1.0.1
3da8732 
Manual port of upstream commit 981b7fc. This is how I did it
(roughly):

	# 1. Check what part of lint-dependencies to ignore.
	hack/lint-dependencies.sh
	# Ignored this:
	#   hack/pin-dependency.sh github.com/google/cadvisor v0.39.2
	#   hack/pin-dependency.sh github.com/imdario/mergo v0.3.7
	#   hack/pin-dependency.sh github.com/mattn/go-colorable v0.1.2
	#   GO111MODULE=on go mod edit -dropreplace github.com/nxadm/tail

	# 2. Update deps as per upstream commit 981b7fc.
	hack/pin-dependency.sh github.com/opencontainers/runc v1.0.1
	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
	GO111MODULE=on go mod edit -dropreplace github.com/willf/bitset
	# Update vendor.
	hack/update-vendor.sh
	# Recheck everything.
	hack/lint-dependencies.sh
	hack/update-internal-modules.sh
	# Add everything.
	git add vendor staging

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@openshift-ci-robot openshift-ci-robot added the backports/validated-commits Indicates that all commits come to merged upstream PRs. label Aug 26, 2021
@openshift-ci
Copy link

openshift-ci bot commented Aug 26, 2021

@kolyshkin: This pull request references Bugzilla bug 1993980, which is invalid:

  • expected Bugzilla bug 1993980 to depend on a bug targeting a release in 4.10.0 and in one of the following states: MODIFIED, ON_QA, VERIFIED, but no dependents were found

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1993980: UPSTREAM: 104529: [1.22] vendor: bump runc to 1.0.2

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.

@openshift-ci openshift-ci bot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Aug 26, 2021
@openshift-ci-robot
Copy link

@kolyshkin: the contents of this pull request could be automatically validated.

The following commits are valid:

@openshift-ci openshift-ci bot requested review from marun and soltysh August 26, 2021 19:32
@openshift-ci openshift-ci bot added the vendor-update Touching vendor dir or related files label Aug 26, 2021
@kolyshkin kolyshkin mentioned this pull request Aug 26, 2021
Closed
@openshift-ci
Copy link

openshift-ci bot commented Aug 26, 2021

@kolyshkin: This pull request references Bugzilla bug 1993980, which is invalid:

  • expected Bugzilla bug 1993980 to depend on a bug targeting a release in 4.10.0 and in one of the following states: MODIFIED, ON_QA, VERIFIED, but no dependents were found

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1993980: UPSTREAM: 104529: [1.22] vendor: bump runc to 1.0.2

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.

@openshift-ci-robot openshift-ci-robot added the backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. label Aug 26, 2021
@openshift-ci-robot
Copy link

@kolyshkin: the contents of this pull request could not be automatically validated.

The following commits are valid:

The following commits could not be validated and must be approved by a top-level approver:

@openshift-ci-robot openshift-ci-robot removed the backports/validated-commits Indicates that all commits come to merged upstream PRs. label Aug 26, 2021
@kolyshkin
UPSTREAM: 103743: kubelet/cm: don't set Devices
f6f0643 
Since runc 1.0.0 it is now sufficient to have SkipDevices: true.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@kolyshkin
UPSTREAM: 104529: [1.22] vendor: bump runc to 1.0.2
3451655 
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@kolyshkin
UPSTREAM: 104529: pkg/kubelet/cm: use SkipFreezeOnSet
debeaeb 
This is a knob added by runc 1.0.2 specifically for kubernetes,
which tells runc/libcontainer/cgroups/systemd v1 manager to not
freeze the cgroup in Set().

We set this knob here because this code is only used for pods
(rather than containers) management, and in this place we create or
update the pod cgroup with no device limits set, so we can skip the
freeze.

If this knob is not set, libcontainer's cgroup v1 manager tries to
figure out whether the freeze is needed or not, but it's a somewhat
expensive check to perform, thus the knob is a shortcut.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit c06a851)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@openshift-ci-robot openshift-ci-robot added backports/validated-commits Indicates that all commits come to merged upstream PRs. and removed backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. labels Aug 26, 2021
@openshift-ci-robot
Copy link

@kolyshkin: the contents of this pull request could be automatically validated.

The following commits are valid:

@kolyshkin kolyshkin mentioned this pull request Aug 26, 2021
Merged
@kolyshkin kolyshkin changed the base branch from release-4.9 to master August 26, 2021 21:27
@openshift-ci openshift-ci bot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Aug 26, 2021
@openshift-ci
Copy link

openshift-ci bot commented Aug 26, 2021

@kolyshkin: This pull request references Bugzilla bug 1993980, which is valid. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.9.0) matches configured target release for branch (4.9.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (schoudha@redhat.com), skipping review request.

In response to this:

Bug 1993980: UPSTREAM: 104529: [1.22] vendor: bump runc to 1.0.2

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.

@openshift-ci openshift-ci bot removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Aug 26, 2021
@rphillips
Copy link

/lgtm

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

/retest-required

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

4 similar comments
@openshift-bot
Copy link

/retest-required

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

@openshift-bot
Copy link

/retest-required

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

@openshift-bot
Copy link

/retest-required

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

@openshift-bot
Copy link

/retest-required

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

@openshift-ci
Copy link

openshift-ci bot commented Aug 27, 2021 •
edited

@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 Rerun command
ci/prow/e2e-openstack-csi-manila debeaeb link /test e2e-openstack-csi-manila
ci/prow/e2e-openstack-csi-cinder debeaeb link /test e2e-openstack-csi-cinder
ci/prow/e2e-agnostic-cmd debeaeb link /test e2e-agnostic-cmd

Full PR test history. Your PR dashboard.

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.

@openshift-bot
Copy link

/retest-required

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

21 similar comments
@openshift-bot
Copy link

/retest-required

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

@openshift-bot
Copy link

/retest-required

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

@openshift-bot
Copy link

/retest-required

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

@openshift-bot
Copy link

/retest-required

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

@openshift-bot
Copy link

/retest-required

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

@openshift-bot
Copy link

/retest-required

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

@openshift-bot
Copy link

/retest-required

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

@openshift-bot
Copy link

/retest-required

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

@openshift-bot
Copy link

/retest-required

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

@openshift-bot
Copy link

/retest-required

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

@openshift-bot
Copy link

/retest-required

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

@openshift-bot
Copy link

/retest-required

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

@openshift-bot
Copy link

/retest-required

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

@openshift-bot
Copy link

/retest-required

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

@openshift-bot
Copy link

/retest-required

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

@openshift-bot
Copy link

/retest-required

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

@openshift-bot
Copy link

/retest-required

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

@openshift-bot
Copy link

/retest-required

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

@openshift-bot
Copy link

/retest-required

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

@openshift-bot
Copy link

/retest-required

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

@openshift-bot
Copy link

/retest-required

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

@openshift-merge-robot openshift-merge-robot merged commit b708912 into openshift:master Aug 27, 2021
@openshift-ci
Copy link

openshift-ci bot commented Aug 27, 2021

@kolyshkin: All pull requests linked via external trackers have merged:

Bugzilla bug 1993980 has been moved to the MODIFIED state.

In response to this:

Bug 1993980: UPSTREAM: 104529: [1.22] vendor: bump runc to 1.0.2

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marun marun Awaiting requested review from marun

@soltysh soltysh Awaiting requested review from soltysh

Assignees

@rphillips rphillips

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backports/validated-commits Indicates that all commits come to merged upstream PRs. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged. vendor-update Touching vendor dir or related files
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@kolyshkin @openshift-ci-robot @rphillips @openshift-bot @nee1esh @mrunalp @openshift-merge-robot