From 75645aff98fe8adfa1c7f1c058abc8e07f82ac94 Mon Sep 17 00:00:00 2001 From: adam jones Date: Tue, 2 Sep 2025 18:46:11 +0100 Subject: [PATCH] deploy: feat: set Grafana root_url to make oauth flow smoother (#344) ## Motivation and Context Ensures that the redirect url is set properly when logging in with Google ## How Has This Been Tested? In staging ## Breaking Changes None ## Types of changes - [ ] Bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change) - [ ] Documentation update --- deploy/pkg/k8s/monitoring.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/deploy/pkg/k8s/monitoring.go b/deploy/pkg/k8s/monitoring.go index d4b2efd..190b7cf 100644 --- a/deploy/pkg/k8s/monitoring.go +++ b/deploy/pkg/k8s/monitoring.go @@ -178,6 +178,7 @@ func deployGrafana(ctx *pulumi.Context, cluster *providers.ProviderInfo, ns *cor } // Deploy Grafana + grafanaHost := "grafana." + environment + ".registry.modelcontextprotocol.io" _, err = helm.NewChart(ctx, "grafana", helm.ChartArgs{ Chart: pulumi.String("grafana"), Version: pulumi.String("9.4.4"), @@ -195,6 +196,9 @@ func deployGrafana(ctx *pulumi.Context, cluster *providers.ProviderInfo, ns *cor }, }, "grafana.ini": pulumi.Map{ + "server": pulumi.Map{ + "root_url": pulumi.String("https://" + grafanaHost), + }, "auth": pulumi.Map{ "disable_login_form": pulumi.Bool(true), }, @@ -276,8 +280,6 @@ func deployGrafana(ctx *pulumi.Context, cluster *providers.ProviderInfo, ns *cor } // Create ingress for external access - grafanaHost := "grafana." + environment + ".registry.modelcontextprotocol.io" - _, err = networkingv1.NewIngress(ctx, "grafana-ingress", &networkingv1.IngressArgs{ Metadata: &metav1.ObjectMetaArgs{ Name: pulumi.String("grafana-ingress"),