Skip to content

Commit 495bd34

Browse files
committed
add nais-dev -> dev-gcp rename, make sure nobody gets old dev-gcp
1 parent aeb85d9 commit 495bd34

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

flake.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
pname = "nais-cli";
4040
inherit version;
4141
src = ./.;
42-
vendorHash = "sha256-/dwDhskU2f+2y0KaPvmOhwH3VphqtN/PlpjMe7jJqFw=";
42+
vendorHash = "sha256-WE5WSOOAUBEfxF/NAaVjTFBZeMRA3APmOJGbBueKObo=";
4343
postInstall = ''
4444
mv $out/bin/cli $out/bin/nais
4545
'';

pkg/kubeconfig/gcpcluster.go

+10-1
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,22 @@ func getGCPClusters(ctx context.Context, project project) ([]k8sCluster, error)
9393

9494
var clusters []k8sCluster
9595
for _, cluster := range response.Clusters {
96+
// Skip legacy clusters
97+
if project.Tenant == "nav" && slices.Contains([]string{"dev-gcp"}, cluster.Name) {
98+
continue
99+
}
100+
96101
name := cluster.Name
97102
if cluster.Name == "knada-gke" {
98103
name = "knada"
99104
}
100105

106+
if project.Tenant == "nav" && cluster.Name == "nais-dev" {
107+
name = "dev-gcp"
108+
}
109+
101110
kind := project.Kind
102-
if slices.Contains([]string{"dev-gcp", "prod-gcp", "ci-gcp"}, name) {
111+
if slices.Contains([]string{"prod-gcp", "ci-gcp"}, name) {
103112
kind = kindLegacy
104113
}
105114

0 commit comments

Comments
 (0)