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.

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

Revert "reduce_logs_for_kubelet_use_crio" #3565

Merged
merged 1 commit into from
Jul 13, 2024

Conversation

uablrek
Copy link
Contributor

@uablrek uablrek commented Jul 11, 2024

This reverts commit b407dcd.

Fixes #3538

There may be a better way by detecting if cgroups are managed by systemd, but I have not enough knowledge of cadvisor, and not much time. So, the easy way out is to revert the commit causing the problem.

Further, I don't even know how to test it. I use K8s with cri-o, but cadvisor is vendored in K8s, so I don't know how to make K8s use this branch (I know howto build and test K8s from master though)

Copy link

google-cla bot commented Jul 11, 2024

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@k8s-ci-robot
Copy link
Collaborator

Hi @uablrek. Thanks for your PR.

I'm waiting for a google 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-sigs/prow repository.

@dims
Copy link
Collaborator

dims commented Jul 11, 2024

xref: #3457

@dims
Copy link
Collaborator

dims commented Jul 11, 2024

/ok-to-test

@dims
Copy link
Collaborator

dims commented Jul 11, 2024

/approve
/lgtm

@uablrek
Copy link
Contributor Author

uablrek commented Jul 12, 2024

I have verified that the revert fixes the problem by copying cadvisor/container/crio/factory.go from this PR to K8s vendor/github.com/google/cadvisor/container/crio/factory.go.

Server Version: v1.31.0-alpha.3.185+2d4514e1690dc5-dirty
crio version 1.29.2

My metrics test works. They fail for crio without this PR (but works with containerd)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

K8s/cri-o broken for cgroup-driver != systemd
4 participants