Skip to content

Conversation

@dims
Copy link
Member

@dims dims commented Oct 31, 2024

Related to discussion in #128157 - Let's ensure we use ONLY one cgroups library.

Here in this PR we can keep a temporary copy until we get a longer term solution in runc's cgroup library, see opencontainers/runc#4497

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

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


@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. 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 Oct 31, 2024
@k8s-ci-robot
Copy link
Contributor

This issue is currently awaiting triage.

If a SIG or subproject determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

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.

@k8s-ci-robot k8s-ci-robot added the needs-priority Indicates a PR lacks a `priority/foo` label and requires one. label Oct 31, 2024
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. area/dependency Issues or PRs related to dependency changes area/kubelet 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 Oct 31, 2024
@@ -0,0 +1,50 @@
/*
Copyright The containerd Authors.
Copy link
Member Author

Choose a reason for hiding this comment

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

copied the entire file, so keeping their copyright

@@ -0,0 +1,64 @@
/*
Copyright 2024 The Kubernetes Authors.
Copy link
Member Author

Choose a reason for hiding this comment

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

copied just a couple of methods into a new file, so just adding ours.

@dims
Copy link
Member Author

dims commented Oct 31, 2024

/assign @SergeyKanzhelev @mrunalp @tzneal

@dims
Copy link
Member Author

dims commented Oct 31, 2024

/priority important-soon

@k8s-ci-robot k8s-ci-robot added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Oct 31, 2024
@dims dims force-pushed the copy-ParseCgroupFileUnified-and-drop-rest-of-containerd-cgroups branch from e388fe6 to d1ed74d Compare October 31, 2024 16:31
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dims

The full list of commands accepted by this bot can be found here.

The pull request process is described here

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

@haircommander
Copy link
Contributor

/lgtm
/hold

thanks for picking this up! holding to let CI run and anyone else chime in

@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 Oct 31, 2024
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 31, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 1058bfa345839bb50750c2a67c87f7c8643b7116

@dims
Copy link
Member Author

dims commented Oct 31, 2024

Weird that i can't repro the failure locally. could it be a mac vs linux issue? digging deeper

+++ working dir: /home/prow/go/src/k8s.io/kubernetes
+++ command: bash "hack/verify-testing-import.sh"
Testing package imported in:
	/home/prow/go/src/k8s.io/kubernetes/cmd/kubelet
+++ exit code: 1
+++ error: 1

@dims dims force-pushed the copy-ParseCgroupFileUnified-and-drop-rest-of-containerd-cgroups branch from d1ed74d to c9deb43 Compare October 31, 2024 17:36
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Oct 31, 2024
@dims
Copy link
Member Author

dims commented Oct 31, 2024

could it be a mac vs linux issue? digging deeper

yep. i see the failure on linux... will think about how to do this better in my long TODO later :)

for now, i had the wrong file name for the tests!

@dims dims force-pushed the copy-ParseCgroupFileUnified-and-drop-rest-of-containerd-cgroups branch from c9deb43 to b3a891d Compare October 31, 2024 17:39
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 31, 2024
@dims dims force-pushed the copy-ParseCgroupFileUnified-and-drop-rest-of-containerd-cgroups branch from b3a891d to dd9e1fb Compare October 31, 2024 17:41
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
@dims dims force-pushed the copy-ParseCgroupFileUnified-and-drop-rest-of-containerd-cgroups branch from dd9e1fb to e86d02b Compare October 31, 2024 17:42
@dims
Copy link
Member Author

dims commented Oct 31, 2024

/retest

@haircommander
Copy link
Contributor

/lgtm
/unhold

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Oct 31, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 220f90d1a75692e105b1c8074b24e4f97499d120

@k8s-ci-robot k8s-ci-robot merged commit 74b9204 into kubernetes:master Oct 31, 2024
15 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.32 milestone Oct 31, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. area/dependency Issues or PRs related to dependency changes area/kubelet cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note-none Denotes a PR that doesn't merit a release note. sig/node Categorizes an issue or PR as relevant to SIG Node. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

Development

Successfully merging this pull request may close these issues.

6 participants