Skip to content

Commit 048d0dd

Browse files
authored
Changes upgrades clusters to use only us based regions (googleforgames#4046)
1 parent ae07c81 commit 048d0dd

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

build/terraform/upgrade/module.tf

+8-10
Original file line numberDiff line numberDiff line change
@@ -38,27 +38,25 @@ variable "kubernetes_versions" {
3838
description = "Create upgrade test clusters with these k8s versions in these regions"
3939
type = map(list(string))
4040
default = {
41-
"1.29" = ["europe-west1", "RAPID"]
42-
"1.30" = ["asia-east1", "RAPID"]
41+
"1.29" = ["us-west1", "RAPID"]
42+
"1.30" = ["us-central1", "RAPID"]
4343
"1.31" = ["us-east1", "RAPID"]
4444
//1.32" = ["us-west1", "RAPID"]
4545
//
46-
// Before merge: When adding Kubernetes version 1.{N}, first uncomment the line above, extending
47-
// the infrastructure to 4 versions temporarily. Come back to these instructions after the
48-
// update PR merges.
46+
// Before merge: When adding Kubernetes version 1.{N}, first uncomment the line above. Come back
47+
// to these instructions after the update PR merges.
4948
//
5049
// After merge: After the Kubernetes update PR merges, and all active PRs are updated:
5150
//
5251
// * Move the 1.{N-3} line to the bottom and comment it out
5352
// * Change the (commented out) 1.{N-3} to 1.{N+1}
5453
// * You should now have 3 versions uncommented (versions 1.{N-2} .. 1.{N}),
5554
// and 1.{N+1} commented out for the next update. The new, commented out 1.{N+1}
56-
// should be using the region of the previous 1.{N-3} - this region will become
57-
// unused.
55+
// should be using the region of the current 1.{N-3}.
5856
//
59-
// Rationale: We cycle the regions us-east1 -> us-west1 -> europe-west1 -> asia-east1 -> us-east1
60-
// as versions are added, using 4 regions so that the PR adding 1.{N} is in a unique region to
61-
// 1.{N-3} .. 1.{N-1}, meaning versions never need to share a region in CI.
57+
// Rationale: We cycle the regions us-east1 -> us-west1 -> us-central1 -> us-east1 as versions
58+
// are added, using 3 regions so that the PR adding 1.{N} is in a unique region to
59+
// 1.{N-2} .. 1.{N-1}, meaning versions never need to share a region in CI.
6260
}
6361
}
6462

0 commit comments

Comments
 (0)