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

kubelet: add tests for cgroup v2 conversions #89567

Merged
merged 1 commit into from Apr 2, 2020
Merged

kubelet: add tests for cgroup v2 conversions #89567

merged 1 commit into from Apr 2, 2020

Conversation

giuseppe
Copy link
Member

follow-up for #85218

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

What type of PR is this?
/kind cleanup

What this PR does / why we need it:
Add missing unit tests for cgroup v2 conversions

Which issue(s) this PR 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/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 27, 2020
@k8s-ci-robot
Copy link
Contributor

Hi @giuseppe. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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 giuseppe mentioned this pull request Mar 27, 2020
Merged
@k8s-ci-robot k8s-ci-robot added area/kubelet sig/node Categorizes an issue or PR as relevant to SIG Node. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Mar 27, 2020
AkihiroSuda
AkihiroSuda reviewed Mar 27, 2020
View reviewed changes
pkg/kubelet/cm/container_manager_linux_test.go Outdated

quota := int64(50000)
period := uint64(200000)
assert.Equal(t, getCpuMax(&quota, &period), "50000 200000")
Copy link
Member

Choose a reason for hiding this comment

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

The order of args is Equal(t, expected, got)

Copy link
Member

Choose a reason for hiding this comment

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

https://godoc.org/github.com/stretchr/testify/assert#Equal

odinuge
odinuge approved these changes Mar 27, 2020
View reviewed changes
Copy link
Member

@odinuge odinuge left a comment

Choose a reason for hiding this comment

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

Other than the small nits, this looks good to me.

Also, these helper funcs are exported in libcontainer, so we can use them instead. They are not present in the version in k/k tho, so that would require a dependency bump, so this is ok for now.

See: https://github.com/opencontainers/runc/pull/2248/files

/lgtm

pkg/kubelet/cm/container_manager_linux_test.go Outdated Show resolved Hide resolved
pkg/kubelet/cm/cgroup_manager_linux.go Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 27, 2020
@odinuge
Copy link
Member

odinuge commented Mar 27, 2020

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 27, 2020
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 27, 2020
@giuseppe giuseppe mentioned this pull request Mar 27, 2020
Closed
@giuseppe giuseppe force-pushed the cgroupv2-unit-test branch 2 times, most recently from 936ab71 to 85c67dd Compare March 27, 2020 09:51
@odinuge
Copy link
Member

odinuge commented Mar 27, 2020

Thanks for fixing it this quick! 😄

/lgtm
/priority backlog
/assign derekwaynecarr

@k8s-ci-robot k8s-ci-robot added the priority/backlog Higher priority than priority/awaiting-more-evidence. label Mar 27, 2020
@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Mar 27, 2020
@giuseppe
Copy link
Member Author

/retest

@giuseppe
kubelet: add tests for cgroup v2 conversions
c4429d8 
follow-up for kubernetes#85218

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 27, 2020
@giuseppe
Copy link
Member Author

/retest

@odinuge
Copy link
Member

odinuge commented Mar 27, 2020

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 27, 2020
@giuseppe
Copy link
Member Author

@derekwaynecarr are you fine with these tests?

@KentaTada KentaTada mentioned this pull request Apr 1, 2020
Merged
@derekwaynecarr
Copy link
Member

thanks for the follow-up from the first pr.

there are node e2e tests that also look at the pod cgroup values, maybe tackle those next?

/approve
/lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: derekwaynecarr, giuseppe

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 2, 2020
@k8s-ci-robot k8s-ci-robot merged commit 4e6a122 into kubernetes:master Apr 2, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.19 milestone Apr 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@odinuge odinuge odinuge approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda left review comments

@mtaufen mtaufen Awaiting requested review from mtaufen

@resouer resouer Awaiting requested review from resouer

Assignees

@odinuge odinuge

@derekwaynecarr derekwaynecarr

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. priority/backlog Higher priority than priority/awaiting-more-evidence. 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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.19
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@giuseppe @k8s-ci-robot @odinuge @derekwaynecarr @AkihiroSuda