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

Make operator exportable by removing grafonnet-lib git submodule #1280

Merged
merged 4 commits into from
Nov 2, 2023

Conversation

jaehnri
Copy link
Contributor

@jaehnri jaehnri commented Oct 20, 2023

Fixes #1279

This PR removes the grafonnet-lib git submodule and appends the entire repo as part of the grafana-operator. Although it is not the most elegant solution, it makes this operator exportable.

I'm glad to work on a better alternative if it exists.

@jaehnri jaehnri changed the title Fix grafonnet lib Make operator exportable by removing grafonnet-lib git submodule Oct 20, 2023
@pb82
Copy link
Collaborator

pb82 commented Oct 24, 2023

@jaehnri this looks good, let's just fix the lint issues (we can exclude the directory) and then we can merge this.

@jaehnri
Copy link
Contributor Author

jaehnri commented Oct 26, 2023

@pb82, can you retrigger the tests, please? They should pass now.

@pb82
Copy link
Collaborator

pb82 commented Oct 31, 2023

@jaehnri this test is failing now: TestGetJsonProjectBuildRoundName

@jaehnri
Copy link
Contributor Author

jaehnri commented Oct 31, 2023

@jaehnri this test is failing now: TestGetJsonProjectBuildRoundName

@pb82 this is odd, I couldn't reproduce it locally, all tests pass. I rebased to see if it passes, but I can't see why the pipeline would find "4" blocks instead of "3". Do you have any clue?

@pb82
Copy link
Collaborator

pb82 commented Nov 2, 2023

@jaehnri it's passing now, must have been a fluke. Anyway, I'll try to get this merged today, thanks!

@pb82 pb82 merged commit c0a2c2b into grafana:master Nov 2, 2023
9 checks passed
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.

[Bug]: grafonnet-lib git submodule makes the whole Operator package broken
2 participants