Merge pull request #1475 from grafana/fix-client-timeout

fix: time multiplier was not applied if the timeout was in the spec
grafana · Mar 26, 2024 · be90a24 · be90a24
2 parents c189d2d + b9b2ea6
commit be90a24
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/controllers/client/grafana_client.go b/controllers/client/grafana_client.go
@@ -177,7 +177,7 @@ func NewGeneratedGrafanaClient(ctx context.Context, c client.Client, grafana *v1
 			timeout = 0
 		}
 	} else {
-		timeout = time.Second * 10
+		timeout = 10
 	}
 
 	credentials, err := getAdminCredentials(ctx, c, grafana)
@@ -194,7 +194,7 @@ func NewGeneratedGrafanaClient(ctx context.Context, c client.Client, grafana *v1
 
 	client := &http.Client{
 		Transport: transport,
-		Timeout:   timeout,
+		Timeout:   timeout * time.Second,
 	}
 
 	cfg := &genapi.TransportConfig{