-
Notifications
You must be signed in to change notification settings - Fork 416
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
Refactor Grafana
reconcile loop
#1880
Open
Baarsgaard
wants to merge
8
commits into
grafana:master
Choose a base branch
from
Baarsgaard:refactor_grafana_reconcile_loop
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Refactor Grafana
reconcile loop
#1880
Baarsgaard
wants to merge
8
commits into
grafana:master
from
Baarsgaard:refactor_grafana_reconcile_loop
+144
−159
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
weisdd
requested changes
Mar 6, 2025
Use status struct directly remove updateStatus funct defer status updates Removed duplicate version checks
AdminUrl is now handled as part of the completeReconciler External grafanas are now marked as failed when version cannot be fetched
chore: Clean up getVersion error messages
68c8576
to
f096403
Compare
f096403
to
640ac23
Compare
weisdd
requested changes
Mar 9, 2025
@@ -87,9 +87,11 @@ func GetScopedMatchingInstances(ctx context.Context, k8sClient client.Client, cr | |||
if !selected { | |||
continue | |||
} | |||
|
|||
doReadyCheck := instance.Annotations["grafana/skip-ready-check"] == "" |
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.
Let's add the comment explaining usage of readiness checks here.
Also, let's rename it from readyCheck to readinessCheck.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ApplyFailed
condition tests to still work by adding agrafana/skip-ready-check
annotation to instances.GrafanaStatus
structLocally unused args are prefixed with
_
for clarityr.getVersion
fromGrafanaReconciler
toCompleteReconciler
External and internal instances now use the same reconciliation logic.
Failing to fetch the version now marks the instance unready
status.stageStatus=failed
with astatus.lastMessage
This allows sorting out External instances as unready by
GetScopedMatchingInstances
.stage=complete stageStatus=failed
on instances.New namespace metric label: