Skip to content

Commit

Permalink
Merge pull request #1527 from grafana/fix/early-url-discovery-for-ver…
Browse files Browse the repository at this point in the history
…sion

fix: use the external url for fetching version if set
  • Loading branch information
theSuess committed May 10, 2024
2 parents a34f427 + 98a2483 commit 404e5ef
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions controllers/grafana_controller.go
Expand Up @@ -149,8 +149,11 @@ func (r *GrafanaReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct

func (r *GrafanaReconciler) getVersion(cr *grafanav1beta1.Grafana) (string, error) {
cl := client2.NewHTTPClient(cr)

resp, err := cl.Get(cr.Status.AdminUrl + grafana.GrafanaHealthEndpoint)
instanceUrl := cr.Status.AdminUrl
if instanceUrl == "" && cr.Spec.External != nil {
instanceUrl = cr.Spec.External.URL
}
resp, err := cl.Get(instanceUrl + grafana.GrafanaHealthEndpoint)
if err != nil {
return "", fmt.Errorf("fetching version: %w", err)
}
Expand Down

0 comments on commit 404e5ef

Please sign in to comment.