migrate prod-gcp to new cluster

sechmann · sechmann · commit d499fcf0554a · 2025-02-28T21:03:21.000+01:00
diff --git a/pkg/kubeconfig/gcpcluster.go b/pkg/kubeconfig/gcpcluster.go
@@ -89,8 +89,12 @@ func getGCPClusters(ctx context.Context, project project) ([]k8sCluster, error)
 			name = "dev-gcp"
 		}
 
+		if project.Tenant == "nav" && cluster.Name == "nais-prod" {
+			name = "prod-gcp"
+		}
+
 		kind := project.Kind
-		if slices.Contains([]string{"prod-gcp", "ci-gcp"}, name) {
+		if slices.Contains([]string{"ci-gcp"}, name) {
 			kind = kindLegacy
 		}
 
diff --git a/pkg/kubeconfig/labels.go b/pkg/kubeconfig/labels.go
@@ -32,8 +32,6 @@ func parseKind(in string) Kind {
 
 func getClusterServerForLegacyGCP(name string) string {
 	switch name {
-	case "prod-gcp":
-		return "https://10.255.240.6"
 	case "ci-gcp":
 		return "https://10.255.240.7"
 	default:

Original file line number	Diff line number	Diff line change
`@@ -89,8 +89,12 @@ func getGCPClusters(ctx context.Context, project project) ([]k8sCluster, error)`
`89`	`89`	`name = "dev-gcp"`
`90`	`90`	`}`
`91`	`91`
	`92`	`+ if project.Tenant == "nav" && cluster.Name == "nais-prod" {`
	`93`	`+ name = "prod-gcp"`
	`94`	`+ }`
	`95`	`+`
`92`	`96`	`kind := project.Kind`
`93`		`- if slices.Contains([]string{"prod-gcp", "ci-gcp"}, name) {`
	`97`	`+ if slices.Contains([]string{"ci-gcp"}, name) {`
`94`	`98`	`kind = kindLegacy`
`95`	`99`	`}`
`96`	`100`