fix(grafana): use relative dashboard path (#874)

cryostatio · Jun 7, 2024 · adf13ce · adf13ce
1 parent 97860ec
commit adf13ce
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/internal/controllers/common/resource_definitions/resource_definitions.go b/internal/controllers/common/resource_definitions/resource_definitions.go
@@ -1133,7 +1133,7 @@ func NewCoreContainer(cr *model.CryostatInstance, specs *ServiceSpecs, imageTag
 		grafanaVars = append(grafanaVars,
 			corev1.EnvVar{
 				Name:  "GRAFANA_DASHBOARD_EXT_URL",
-				Value: fmt.Sprintf("%s/grafana/", specs.AuthProxyURL.String()),
+				Value: "/grafana/",
 			},
 			corev1.EnvVar{
 				Name:  "GRAFANA_DASHBOARD_URL",

diff --git a/internal/test/resources.go b/internal/test/resources.go
@@ -1338,19 +1338,10 @@ func (r *TestResources) newNetworkEnvironmentVariables() []corev1.EnvVar {
 			Name:  "GRAFANA_DASHBOARD_URL",
 			Value: "http://localhost:3000",
 		},
-	}
-	if r.ExternalTLS {
-		envs = append(envs,
-			corev1.EnvVar{
-				Name:  "GRAFANA_DASHBOARD_EXT_URL",
-				Value: fmt.Sprintf("https://%s.example.com/grafana/", r.Name),
-			})
-	} else {
-		envs = append(envs,
-			corev1.EnvVar{
-				Name:  "GRAFANA_DASHBOARD_EXT_URL",
-				Value: fmt.Sprintf("http://%s.example.com/grafana/", r.Name),
-			})
+		{
+			Name:  "GRAFANA_DASHBOARD_EXT_URL",
+			Value: "/grafana/",
+		},
 	}
 	return envs
 }