-
Notifications
You must be signed in to change notification settings - Fork 81
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
Move lasso SQL cache in Steve #452
base: main
Are you sure you want to change the base?
Conversation
@moio Not yet ready, CI failing for a multitude of reasons like linting errors, stuff not compiling, etc. But should give an idea. |
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.
All content moved from lasso differs only in paths which is exactly the expectation, so this LGTM overall!
Checked with
kdiff3 pkg/sqlcache ../lasso/pkg/cache/sql
(from a checkout of this PR and lasso main respectively)
There is only one difference I cannot explain as noted in the comment.
Apart from that, this is already good to merge FMPOV!
Added a couple of commits to make stuff compile, tests pass, and lint stop complaining. |
@moio Not yet ready, CI failing for a multitude of reasons like linting errors, stuff not compiling, etc. But should give an idea.
It appears I did not in fact base this PR on lasso https://github.com/rancher/lasso/tree/9e2b68739ccc04fe6c080fc0489391970d77dd29 but instead a local fork with an attempt at a fix for rancher/rancher#48453 (which I worked on until I realized it wasn't a blocker for 2.11, woops. Let me ensure I'm using the right commit this time without local changes. Will force-push shortly. |
Should be good now: $ diff -bur pkg/sqlcache ../lasso/pkg/cache/sql
$ |
…om/rancher/steve/pkg/sqlcache
Signed-off-by: Silvio Moioli <silvio@moioli.net>
Signed-off-by: Silvio Moioli <silvio@moioli.net>
9065bc3
to
5213f7f
Compare
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.
Looks fine. Diffs against existing lasso code are superficial
The first commit pulls all under lasso's
pkg/cache/sql
and moves it topkg/sqlcache
from lasso's commit 9e2b68739ccc04fe6c080fc0489391970d77dd29.**Note: ** This (and backports) need to be merged before rancher/lasso#123.