-
Notifications
You must be signed in to change notification settings - Fork 399
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
Chore(Internal): Add new shared reconciliation functions and migrate GrafanaFolder
#1770
Chore(Internal): Add new shared reconciliation functions and migrate GrafanaFolder
#1770
Conversation
Since the folder E2E test works, this is unlikely to have introduced any regressions. |
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.
The overall approach looks good, I just have a few comments regarding code style!
3692ecf
to
b112b69
Compare
I've applied your suggestions as well as added some test cases for the new list functions for Grafana instances. |
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.
Could you rebase your branch? (merged your PR that introduced common fields)
b112b69
to
c66b5e1
Compare
GrafanaFolder
ca83723
to
598c1c6
Compare
598c1c6
to
1f715ff
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.
1f715ff
to
52fed3e
Compare
Can we expect this PR be merged this week? so I can continue to work on #1775. Thanks all! |
@chenlujjj at the moment, we're waiting for @pb82 to take a look at the changes. We do not expect to see any significant changes, it's more about double-check we're not breaking anything here. |
This PR aims to improve how reconciliation functions are written going forward, starting with the folder controller.
The goal is to reduce duplicated code by moving more logic into matching Grafana instances.
This is achieved by namespacing the client to limit the scope of the search when resources do not specify
allowCrossNamespaceImport: true
Additional functions have been added for simplifying building conditions when no matching instances are found.
Lastly, it aligns the existing folder reconcile error logging with other resources