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.
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
[1.24] cgmgr: create cgroups for systemd cgroup driver for dropped infra pods #6949
[1.24] cgmgr: create cgroups for systemd cgroup driver for dropped infra pods #6949
Conversation
The history here is a bit convoluted. Originally, runc created the cgroup for the infra container. cAdvisor was built to assume the cgroup for the infra container would be created, and it uses this to find the network metrics for the pod. When we dropped the infra container, cri-o needed to make this cgroup so cAdvisor could still find the network metrics. However, systemd didn't like the way we did it, and would remove the cgroup mid pod creation, which was fixed in cri-o#6196. This actually caused the cgroup to not be created at all, which then caused the networking metrics to not be gathered at all. Thus, we do need to create a cgroup underneath the systemd cgroup. Attempt to use a slice for this, as systemd won't require a process be underneath it. Signed-off-by: Peter Hunt <pehunt@redhat.com>
- skip test for cgroupfs - remove skip for runc 1.0.0-rc11 (very old now) - drop removal of cgroup parent (not required) Signed-off-by: Peter Hunt <pehunt@redhat.com>
/hold to allow testing against 1.25 |
Signed-off-by: Peter Hunt <pehunt@redhat.com>
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## release-1.24 #6949 +/- ##
================================================
- Coverage 42.89% 42.78% -0.11%
================================================
Files 124 124
Lines 12749 12784 +35
================================================
+ Hits 5469 5470 +1
- Misses 6754 6788 +34
Partials 526 526 |
testing CI in #6969 |
similar CI state as a README change, this is ready @cri-o/cri-o-maintainers PTAL /hold cancel |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: haircommander, sohankunkerkar 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 |
1 similar comment
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: haircommander, sohankunkerkar 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 |
8bf967b
into
cri-o:release-1.24
/cherry-pick release-1.23 |
@haircommander: #6949 failed to apply on top of branch "release-1.23":
In response to this:
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. |
What type of PR is this?
/kind bug
What this PR does / why we need it:
reverts #6196
fixes #6657
Which issue(s) this PR fixes:
Special notes for your reviewer:
partial cherry-pick of #6856, ignoring the last commit because it's not relevant for 1.24
Does this PR introduce a user-facing change?