From 9c3136f6db91807f06ccf6253d5f33b2929362a8 Mon Sep 17 00:00:00 2001 From: frodesundby Date: Thu, 15 Jan 2026 14:42:33 +0100 Subject: [PATCH] Use ClusterName when getting k8s client by environment name Co-authored-by: Johnny Horvi --- internal/elevation/queries.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/internal/elevation/queries.go b/internal/elevation/queries.go index 8ab3640a7..94b4962c3 100644 --- a/internal/elevation/queries.go +++ b/internal/elevation/queries.go @@ -9,6 +9,7 @@ import ( "github.com/nais/api/internal/activitylog" "github.com/nais/api/internal/auth/authz" "github.com/nais/api/internal/database" + "github.com/nais/api/internal/environmentmapper" "github.com/nais/api/internal/slug" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -45,7 +46,7 @@ func Create(ctx context.Context, input *CreateElevationInput, actor *authz.Actor } clients := fromContext(ctx) - k8sClient, exists := clients.GetClient(input.EnvironmentName) + k8sClient, exists := clients.GetClient(environmentmapper.ClusterName(input.EnvironmentName)) if !exists { return nil, ErrEnvironmentNotFound } @@ -256,7 +257,7 @@ func logElevationCreated(ctx context.Context, elevationID, namespace string, inp func Get(ctx context.Context, teamSlug slug.Slug, environmentName, elevationID string) (*Elevation, error) { clients := fromContext(ctx) - k8sClient, exists := clients.GetClient(environmentName) + k8sClient, exists := clients.GetClient(environmentmapper.ClusterName(environmentName)) if !exists { return nil, ErrEnvironmentNotFound } @@ -281,7 +282,7 @@ func Get(ctx context.Context, teamSlug slug.Slug, environmentName, elevationID s func List(ctx context.Context, input *ElevationInput, userEmail string) ([]*Elevation, error) { clients := fromContext(ctx) - k8sClient, exists := clients.GetClient(input.EnvironmentName) + k8sClient, exists := clients.GetClient(environmentmapper.ClusterName(input.EnvironmentName)) if !exists { return []*Elevation{}, nil // Environment not found, return empty list }