@@ -38,27 +38,25 @@ variable "kubernetes_versions" {
38
38
description = " Create upgrade test clusters with these k8s versions in these regions"
39
39
type = map (list (string ))
40
40
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" ]
43
43
" 1.31" = [" us-east1" , " RAPID" ]
44
44
// 1.32" = ["us-west1", "RAPID"]
45
45
//
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.
49
48
//
50
49
// After merge: After the Kubernetes update PR merges, and all active PRs are updated:
51
50
//
52
51
// * Move the 1.{N-3} line to the bottom and comment it out
53
52
// * Change the (commented out) 1.{N-3} to 1.{N+1}
54
53
// * You should now have 3 versions uncommented (versions 1.{N-2} .. 1.{N}),
55
54
// 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}.
58
56
//
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.
62
60
}
63
61
}
64
62
0 commit comments