Change cgroups library import

[RadekManak]

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

This PR updates downstream patch to use libcontainercgroupmanager "github.com/opencontainers/cgroups/ instead of "github.com/opencontainers/runc/libcontainer/cgroups" that has been removed in new library version.

This is causing build failures on projects that depend both on kubernetes and openshift/api which transitively pulled incompatible filepath-securejoin v0.6.0.

Building github.com/openshift/machine-api-operator/cmd/machine-api-tests-ext (v0.1.0-2322-g12251abf-dirty)
# github.com/opencontainers/runc/libcontainer/utils
vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go:334:20: undefined: securejoin.MkdirAllHandle
make: *** [Makefile:92: machine-api-tests-ext] Error 1

Which issue(s) this PR is related to:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

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

[openshift-ci-robot]

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

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

• 3725a31|UPSTREAM: : hack/update-vendor.sh: does not specify an upstream backport in the commit message
• afc1036|UPSTREAM: : change cgroups library import: does not specify an upstream backport in the commit message

Comment /validate-backports to re-evaluate validity of the upstream PRs, for example when they are merged upstream.

[openshift-ci]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: RadekManak
Once this PR has been reviewed and has the lgtm label, please assign p0lyn0mial for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

[damdo]

@RadekManak was this cgroups import originally a carry itself? What does upstream do?

[RadekManak]

This is an update to a carry patch. Both the code change and import are downstream only. Upstream uses the libcontainercgroups "github.com/opencontainers/cgroups" import which is the same but moved to new location.
202ce77

[RadekManak]

/retest

[damdo]

/assign @bertinatto @p0lyn0mial @jacobsee

[damdo]

/test k8s-e2e-gcp-ovn

[bertinatto]

I see this patch in the 1.35 bump PR, which addresses the issue this PR is addressing:

7b07570b

However, master has a similar, but slightly different patch that uses cgroups sintead of libcontainerscgroups.

@haircommander @jacobsee PTAL and advise ifo you prefer to merge this PR or backport the other one.

[haircommander]

hm this PR is targeting master right? the cgroups version is there also. or are we planning on pulling this further back? in which case, backporting the cgroups version (instead of runc) works for me

[openshift-ci]

@RadekManak: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-aws-ovn-techpreview-serial-1of2	3725a31	link	false	/test e2e-aws-ovn-techpreview-serial-1of2
ci/prow/e2e-aws-ovn-techpreview	3725a31	link	false	/test e2e-aws-ovn-techpreview
ci/prow/k8s-e2e-gcp-ovn	3725a31	link	true	/test k8s-e2e-gcp-ovn
ci/prow/e2e-metal-ipi-ovn-ipv6	3725a31	link	true	/test e2e-metal-ipi-ovn-ipv6
ci/prow/e2e-aws-ovn-runc	3725a31	link	true	/test e2e-aws-ovn-runc

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