feat: Narc kan nå bruke kubeconfig pakken

Author: Kyrremann

Diff for: pkg/kubeconfig/filter.go

@@ -7,6 +7,7 @@ type filterOptions struct {
 	includeOnprem     bool
 	overwrite         bool
 	verbose           bool
+	prefixWithTenants bool
 	excludeClusters   []string
 }
 
@@ -18,12 +19,14 @@ func WithFromScratch(enabled bool) FilterOption {
 	}
 }
 
+// WithCiClusters is used by Narc
 func WithCiClusters(include bool) FilterOption {
 	return func(options *filterOptions) {
 		options.includeCi = include
 	}
 }
 
+// WithManagementClusters is used by Narc
 func WithManagementClusters(include bool) FilterOption {
 	return func(options *filterOptions) {
 		options.includeManagement = include
@@ -48,6 +51,13 @@ func WithOverwriteData(enabled bool) FilterOption {
 	}
 }
 
+// WithPrefixedTenants is used by Narc
+func WithPrefixedTenants(prefix bool) FilterOption {
+	return func(options *filterOptions) {
+		options.prefixWithTenants = prefix
+	}
+}
+
 func WithVerboseLogging(enabled bool) FilterOption {
 	return func(options *filterOptions) {
 		options.verbose = enabled

Diff for: pkg/kubeconfig/gcpcluster.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"slices"
+	"strings"
 
 	"google.golang.org/api/compute/v1"
 	"google.golang.org/api/container/v1"
@@ -54,7 +54,7 @@ func getClusters(ctx context.Context, projects []project, options filterOptions)
 		case kindOnprem:
 			cluster, err = getOnpremClusters(ctx, project)
 		default:
-			cluster, err = getGCPClusters(ctx, project)
+			cluster, err = getGCPClusters(ctx, project, options)
 		}
 
 		if err != nil {
@@ -66,7 +66,7 @@ func getClusters(ctx context.Context, projects []project, options filterOptions)
 	return clusters, nil
 }
 
-func getGCPClusters(ctx context.Context, project project) ([]k8sCluster, error) {
+func getGCPClusters(ctx context.Context, project project, options filterOptions) ([]k8sCluster, error) {
 	svc, err := container.NewService(ctx)
 	if err != nil {
 		return nil, err
@@ -82,12 +82,21 @@ func getGCPClusters(ctx context.Context, project project) ([]k8sCluster, error)
 	for _, cluster := range response.Clusters {
 		name := cluster.Name
 
-		if project.Tenant == "nav" && cluster.Name == "nais-dev" {
-			name = "dev-gcp"
+		if project.Tenant == "nav" {
+			switch cluster.Name {
+			case "nais-dev":
+				name = "dev-gcp"
+			case "nais-prod":
+				name = "prod-gcp"
+			}
 		}
 
-		if project.Tenant == "nav" && cluster.Name == "nais-prod" {
-			name = "prod-gcp"
+		if options.prefixWithTenants {
+			name = project.Tenant + "-" + strings.ReplaceAll(cluster.Name, "nais-", "")
+
+			if cluster.Name == "nais-io" {
+				name = "nais-io" // ReplaceAll vil fjerne 'nais-' fra 'nais-io'
+			}
 		}
 
 		clusters = append(clusters, k8sCluster{

Diff for: pkg/kubeconfig/gcpproject.go

@@ -54,6 +54,13 @@ func getProjects(ctx context.Context, options filterOptions) ([]project, error)
 		}
 
 		for _, p := range response.Projects {
+			if p.State != "ACTIVE" {
+				// Only check active projects. When a project is deleted,
+				// it is marked as DELETING for a while before it is removed.
+				// This results in a 403 when trying to list clusters.
+				continue
+			}
+
 			projects = append(projects, project{
 				ID:     p.ProjectId,
 				Tenant: p.Labels["tenant"],