Bug 1953102: UPSTREAM: 102147: vendor: bump runc to rc95 by ehashman · Pull Request #761 · openshift/kubernetes

ehashman · 2021-05-21T19:41:48Z

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1953102

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

dbus 5.0.4 adds StoreProperty method which needs to be implemented for the mock. Fixes the errors like > pkg/kubelet/nodeshutdown/systemd/inhibit_linux_test.go:88:9: cannot use f.fakeDBusObject (variable of type *fakeDBusObject) as dbus.BusObject value in return statement: missing method StoreProperty Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

openshift-ci · 2021-05-21T19:41:55Z

@ehashman: This pull request references Bugzilla bug 1953102, which is valid. The bug has been moved to the POST state. 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.8.0) matches configured target release for branch (4.8.0)
bug is in the state ASSIGNED, 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.

Details

In response to this:

Bug 1953102: UPSTREAM: 102147: vendor: bump runc to rc95

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 · 2021-05-21T19:41:57Z

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

The following commits are valid:

5900e5d|UPSTREAM: 102147: kubelet: Set cgroups via opencontainer: the upstream PR kubernetes/kubernetes#102147 has merged
618af3f|UPSTREAM: 102147: pkg/kubelet/nodeshutdown/systemd: fix for dbus 5.0.4: the upstream PR kubernetes/kubernetes#102147 has merged
d1ec768|UPSTREAM: 102147: kubelet: reuse manager: the upstream PR kubernetes/kubernetes#102147 has merged

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

fd89eb7|UPSTREAM: : bump(runc): does not specify an upstream backport in the commit message

staging/src/k8s.io/api/go.mod

staging/src/k8s.io/apiextensions-apiserver/go.mod

runc rc95 contains a fix for CVE-2021-30465. runc rc94 provides fixes and improvements. One notable change is cgroup manager's Set now accept Resources rather than Cgroup (see opencontainers/runc#2906). Modify the code accordingly. Also update runc dependencies (as hinted by hack/lint-depdendencies.sh): github.com/cilium/ebpf v0.5.0 github.com/containerd/console v1.0.2 github.com/coreos/go-systemd/v22 v22.3.1 github.com/godbus/dbus/v5 v5.0.4 github.com/moby/sys/mountinfo v0.4.1 golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 github.com/google/go-cmp v0.5.4 github.com/kr/pretty v0.2.1 github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 Co-Authored-By: Kir Kolyshkin <kolyshkin@gmail.com>

This sets cgroup config via libcontainer to make sure we apply the correct values to the systemd slices and scopes. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

openshift-ci-robot · 2021-05-21T21:42:01Z

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

The following commits are valid:

5d4bcfb|UPSTREAM: 102147: kubelet: Set cgroups via opencontainer: the upstream PR kubernetes/kubernetes#102147 has merged
618af3f|UPSTREAM: 102147: pkg/kubelet/nodeshutdown/systemd: fix for dbus 5.0.4: the upstream PR kubernetes/kubernetes#102147 has merged
d1ec768|UPSTREAM: 102147: kubelet: reuse manager: the upstream PR kubernetes/kubernetes#102147 has merged

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

2721255|UPSTREAM: : bump(runc): does not specify an upstream backport in the commit message

ehashman · 2021-05-21T21:42:14Z

Builds locally, hopefully should work now 🤞

ehashman · 2021-05-21T21:43:55Z

go.mod

 	github.com/cespare/xxhash/v2 => github.com/cespare/xxhash/v2 v2.1.1
 	github.com/chai2010/gettext-go => github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5
 	github.com/checkpoint-restore/go-criu/v4 => github.com/checkpoint-restore/go-criu/v4 v4.1.0
+	github.com/checkpoint-restore/go-criu/v5 => github.com/checkpoint-restore/go-criu/v5 v5.0.0


Hmm, should v4 have disappeared?

It might still be used by some other dependency, so ...

kolyshkin

LGTM

ehashman · 2021-05-22T00:50:26Z

/skip

Ready for review

mrunalp · 2021-05-24T14:55:38Z

/approve
/lgtm

openshift-ci · 2021-05-24T16:52:32Z

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: ehashman, kolyshkin, mrunalp

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:

DOWNSTREAM_OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-bot · 2021-05-24T17:14:37Z

/retest

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

openshift-bot · 2021-05-24T18:02:37Z

/retest

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

openshift-bot · 2021-05-24T18:38:42Z

/retest

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

openshift-bot · 2021-05-24T19:14:38Z

/retest

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

openshift-bot · 2021-05-24T21:14:38Z

/retest

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

openshift-bot · 2021-05-24T21:38:37Z

/retest

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

kolyshkin · 2021-05-24T22:05:08Z

This should also fix
https://bugzilla.redhat.com/show_bug.cgi?id=1941456

ehashman · 2021-05-24T22:11:54Z

=== FAIL: vendor/k8s.io/kube-aggregator/pkg/apiserver TestProxyCertReload (0.11s)
2021-05-24 21:50:48.343956 I | http: TLS handshake error from 127.0.0.1:48756: tls: failed to verify client certificate: x509: certificate signed by unknown authority
2021-05-24 21:50:48.411808 I | http: TLS handshake error from 127.0.0.1:48760: tls: failed to verify client certificate: x509: certificate has expired or is not yet valid: current time 2021-05-24T21:50:48Z is after 2021-05-22T08:10:51Z
    handler_proxy_test.go:712: Expected status code 200 but got 503

surely the unit test failure is not this PR...

openshift-bot · 2021-05-24T22:15:38Z

/retest

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

openshift-bot · 2021-05-24T22:28:38Z

/retest

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

openshift-bot · 2021-05-24T22:52:38Z

/retest

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

openshift-bot · 2021-05-25T00:04:38Z

/retest

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

kolyshkin · 2021-05-25T00:06:19Z

The failure in ci/prow/unit appears to be unrelated (and seems to be caused in time not being set correctly for some test VMs I guess):

=== Failed
=== FAIL: vendor/k8s.io/kube-aggregator/pkg/apiserver TestProxyCertReload (0.18s)
2021-05-24 23:15:41.872689 I | http: TLS handshake error from 127.0.0.1:56800: tls: failed to verify client certificate: x509: certificate signed by unknown authority
2021-05-24 23:15:41.992379 I | http: TLS handshake error from 127.0.0.1:56804: tls: failed to verify client certificate: x509: certificate has expired or is not yet valid: current time 2021-05-24T23:15:41Z is after 2021-05-22T08:10:51Z
    handler_proxy_test.go:712: Expected status code 200 but got 503

openshift-bot · 2021-05-25T00:52:38Z

/retest

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

openshift-bot · 2021-05-25T01:04:38Z

/retest

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

ehashman · 2021-05-25T01:08:36Z

/hold
until failing unit test is addressed

nee1esh · 2021-05-25T14:44:14Z

/retest

ehashman · 2021-05-25T15:58:40Z

/hold cancel

Fixed the flake in #767

ehashman · 2021-05-25T19:34:53Z

/test e2e-gcp-upgrade
/test k8s-e2e-conformance-aws

ehashman · 2021-05-25T22:13:21Z

/test e2e-gcp-upgrade

openshift-bot · 2021-05-26T04:07:56Z

/retest

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

openshift-ci · 2021-05-26T06:00:20Z

@ehashman: The following test failed, say /retest to rerun all failed tests:

Test name	Commit	Details	Rerun command
ci/prow/e2e-aws-csi	`5d4bcfb`	link	`/test e2e-aws-csi`

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

openshift-bot · 2021-05-26T09:41:11Z

/retest

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

openshift-bot · 2021-05-26T10:17:55Z

/retest

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

openshift-ci · 2021-05-26T11:32:20Z

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

openshift/kubernetes#761

Bugzilla bug 1953102 has been moved to the MODIFIED state.

Details

In response to this:

Bug 1953102: UPSTREAM: 102147: vendor: bump runc to rc95

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.

giuseppe and others added 2 commits May 21, 2021 12:35

UPSTREAM: 102147: kubelet: reuse manager

d1ec768

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

openshift-ci bot requested review from kolyshkin and mrunalp May 21, 2021 19:41

openshift-ci-robot added the backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. label May 21, 2021

openshift-ci bot added 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. labels May 21, 2021

openshift-ci bot added the vendor-update Touching vendor dir or related files label May 21, 2021

kolyshkin reviewed May 21, 2021

View reviewed changes

staging/src/k8s.io/api/go.mod Outdated Show resolved Hide resolved

kolyshkin reviewed May 21, 2021

View reviewed changes

staging/src/k8s.io/apiextensions-apiserver/go.mod Outdated Show resolved Hide resolved

ehashman and others added 2 commits May 21, 2021 14:39

UPSTREAM: 102147: kubelet: Set cgroups via opencontainer

5d4bcfb

This sets cgroup config via libcontainer to make sure we apply the correct values to the systemd slices and scopes. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

ehashman force-pushed the bump-runc95 branch from 5900e5d to 5d4bcfb Compare May 21, 2021 21:41

ehashman commented May 21, 2021

View reviewed changes

kolyshkin approved these changes May 21, 2021

View reviewed changes

openshift-ci bot assigned mrunalp May 24, 2021

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 24, 2021

mrunalp added approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. labels May 24, 2021

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 25, 2021

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 25, 2021

openshift-merge-robot merged commit bb94839 into openshift:master May 26, 2021

soltysh mentioned this pull request Jun 21, 2021

Bug 1968520: update to k8s 1.21.2 #819

Closed

Conversation

ehashman commented May 21, 2021

Uh oh!

openshift-ci bot commented May 21, 2021

Uh oh!

openshift-ci-robot commented May 21, 2021

Uh oh!

Uh oh!

Uh oh!

openshift-ci-robot commented May 21, 2021

Uh oh!

ehashman commented May 21, 2021

Uh oh!

ehashman May 21, 2021

Choose a reason for hiding this comment

Uh oh!

kolyshkin May 21, 2021

Choose a reason for hiding this comment

Uh oh!

kolyshkin left a comment

Choose a reason for hiding this comment

Uh oh!

ehashman commented May 22, 2021

Uh oh!

mrunalp commented May 24, 2021

Uh oh!

openshift-ci bot commented May 24, 2021

Uh oh!

openshift-bot commented May 24, 2021

Uh oh!

openshift-bot commented May 24, 2021

Uh oh!

openshift-bot commented May 24, 2021

Uh oh!

openshift-bot commented May 24, 2021

Uh oh!

openshift-bot commented May 24, 2021

Uh oh!

openshift-bot commented May 24, 2021

Uh oh!

kolyshkin commented May 24, 2021

Uh oh!

ehashman commented May 24, 2021

Uh oh!

openshift-bot commented May 24, 2021

Uh oh!

openshift-bot commented May 24, 2021

Uh oh!

openshift-bot commented May 24, 2021

Uh oh!

openshift-bot commented May 25, 2021

Uh oh!

kolyshkin commented May 25, 2021

Uh oh!

openshift-bot commented May 25, 2021

Uh oh!

openshift-bot commented May 25, 2021

Uh oh!

ehashman commented May 25, 2021

Uh oh!

nee1esh commented May 25, 2021

Uh oh!

ehashman commented May 25, 2021

Uh oh!

ehashman commented May 25, 2021

Uh oh!

ehashman commented May 25, 2021

Uh oh!

openshift-bot commented May 26, 2021

Uh oh!

openshift-ci bot commented May 26, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-bot commented May 26, 2021

Uh oh!

openshift-bot commented May 26, 2021

Uh oh!

openshift-ci bot commented May 26, 2021

Uh oh!

Reviewers

openshift-ci bot commented May 26, 2021 •

edited

Loading