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

neonvm: revert crictl patches #1054

Merged
merged 6 commits into from
Oct 7, 2024
Merged

neonvm: revert crictl patches #1054

merged 6 commits into from
Oct 7, 2024

Conversation

Omrigan
Copy link
Contributor

@Omrigan Omrigan commented Aug 29, 2024

We decided to go another route, and disable outer cgroup altogether in favor of something better.

Closes https://github.com/neondatabase/cloud/issues/13266.

@Omrigan Omrigan force-pushed the oleg/revert-crictl branch 3 times, most recently from 728ab37 to fcc5f64 Compare August 29, 2024 14:24
@Omrigan Omrigan requested a review from sharnoff September 19, 2024 13:48
Copy link
Member

@sharnoff sharnoff left a comment

Choose a reason for hiding this comment

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

Some questions; overall looks good.

(also, can you prepend "neonvm: " to the PR title?)

Comment on lines -16 to -17
- type: Degraded
status: "True"
Copy link
Member

Choose a reason for hiding this comment

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

Why this change?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hmm... I am not actually sure. For some reason, when I apply 3e6da9c, status conditions stop updating. Any idea why it might be the case?

Copy link
Member

Choose a reason for hiding this comment

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

from discussion: plan is to fix our usage of status conditions in a separate PR

@@ -33,12 +22,10 @@ RUN apk add --no-cache \
e2fsprogs \
qemu-system-x86_64 \
qemu-img \
cgroup-tools \
cgroup-tools \
Copy link
Member

Choose a reason for hiding this comment

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

unintended diff? (replaces spaces with a tab; unlike the rest of the block)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's unrelated, but intended. Do you want me to split it off?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Actually, it is part of the original patch: 5a82cd8

Copy link
Member

Choose a reason for hiding this comment

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

Oof, thanks for digging into it. No preference either way here. Ideally we should have CI check for this in the future.

neonvm/controllers/vm_controller.go Outdated Show resolved Hide resolved
@Omrigan Omrigan changed the title Revert crictl patches neonvm: revert crictl patches Sep 26, 2024
In many local environments, cgroups v1 no longer works, that's why we
had --enable-container-mgr. Now, with crictl patches reverted, we have
to --disable-runner-cgroup by default, otherwise local environment
doesn't work.

Signed-off-by: Oleg Vasilev <[email protected]>
Copy link
Member

@sharnoff sharnoff left a comment

Choose a reason for hiding this comment

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

Looks good. Feel free to merge when the status conditions thing is fixed

Copy link

github-actions bot commented Oct 7, 2024

Merging this branch will decrease overall coverage

Impacted Packages Coverage Δ 🤖
github.com/neondatabase/autoscaling/neonvm 0.00% (ø)
github.com/neondatabase/autoscaling/neonvm/apis/neonvm/v1 0.56% (ø)
github.com/neondatabase/autoscaling/neonvm/controllers 11.51% (-0.59%) 👎
github.com/neondatabase/autoscaling/neonvm/controllers/functests 0.00% (ø)
github.com/neondatabase/autoscaling/neonvm/runner 0.00% (ø)
github.com/neondatabase/autoscaling/neonvm/runner/container-mgr 0.00% (ø)

Coverage by file

Changed files (no unit tests)

Changed File Coverage Δ Total Covered Missed 🤖
github.com/neondatabase/autoscaling/neonvm/apis/neonvm/v1/virtualmachine_webhook.go 0.00% (ø) 51 0 51
github.com/neondatabase/autoscaling/neonvm/controllers/config.go 0.00% (-66.67%) 0 (-3) 0 (-2) 0 (-1) 💀 💀 💀 💀 💀
github.com/neondatabase/autoscaling/neonvm/controllers/vm_controller.go 25.23% (-0.58%) 662 (-24) 167 (-10) 495 (-14) 👎
github.com/neondatabase/autoscaling/neonvm/main.go 0.00% (ø) 130 (-21) 0 130 (-21)
github.com/neondatabase/autoscaling/neonvm/runner/container-mgr/crictl.go 0.00% (ø) 0 (-31) 0 0 (-31)
github.com/neondatabase/autoscaling/neonvm/runner/container-mgr/main.go 0.00% (ø) 0 (-122) 0 0 (-122)
github.com/neondatabase/autoscaling/neonvm/runner/main.go 0.00% (ø) 787 0 787

Please note that the "Total", "Covered", and "Missed" counts above refer to code statements instead of lines of code. The value in brackets refers to the test coverage of that file in the old version of the code.

Changed unit test files

  • github.com/neondatabase/autoscaling/neonvm/controllers/functests/vm_controller_test.go
  • github.com/neondatabase/autoscaling/neonvm/controllers/vm_controller_unit_test.go

HTML Report

Click to open

@Omrigan Omrigan merged commit 0f3917a into main Oct 7, 2024
22 checks passed
@Omrigan Omrigan deleted the oleg/revert-crictl branch October 7, 2024 22:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants