Skip to content

Commit bb69573

Browse files
[CI] Move GKE cluster to new quota
This patch moves the GKE cluster to us-central1-a as that is where we have quota to run the necessary machines. Additionally change the machine type to n2, where we actually have CPU quota.
1 parent 8776ab7 commit bb69573

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

premerge/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
.terraform*
2+
*.tfstate*

premerge/main.tf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ data "google_client_config" "current" {}
4545

4646
resource "google_container_cluster" "llvm_premerge" {
4747
name = var.cluster_name
48-
location = "europe-west3-a"
48+
location = "us-central1-a"
4949

5050
# We can't create a cluster with no node pool defined, but we want to only use
5151
# separately managed node pools. So we create the smallest possible default
@@ -61,7 +61,7 @@ resource "google_container_cluster" "llvm_premerge" {
6161

6262
resource "google_container_node_pool" "llvm_premerge_linux_service" {
6363
name = "llvm-premerge-linux-service"
64-
location = "europe-west3-a"
64+
location = "us-central1-a"
6565
cluster = google_container_cluster.llvm_premerge.name
6666
node_count = 2
6767

@@ -72,7 +72,7 @@ resource "google_container_node_pool" "llvm_premerge_linux_service" {
7272

7373
resource "google_container_node_pool" "llvm_premerge_linux" {
7474
name = "llvm-premerge-linux"
75-
location = "europe-west3-a"
75+
location = "us-central1-a"
7676
cluster = google_container_cluster.llvm_premerge.name
7777
initial_node_count = 0
7878

@@ -82,7 +82,7 @@ resource "google_container_node_pool" "llvm_premerge_linux" {
8282
}
8383

8484
node_config {
85-
machine_type = "c2d-highcpu-56"
85+
machine_type = "n2-highcpu-32"
8686
taint = [{
8787
key = "premerge-platform"
8888
value = "linux"
@@ -96,7 +96,7 @@ resource "google_container_node_pool" "llvm_premerge_linux" {
9696

9797
resource "google_container_node_pool" "llvm_premerge_windows" {
9898
name = "llvm-premerge-windows"
99-
location = "europe-west3-a"
99+
location = "us-central1-a"
100100
cluster = google_container_cluster.llvm_premerge.name
101101
initial_node_count = 0
102102

@@ -108,7 +108,7 @@ resource "google_container_node_pool" "llvm_premerge_windows" {
108108
# We do not set a taint for the windows nodes as kubernetes by default sets
109109
# a node.kubernetes.io/os taint for windows nodes.
110110
node_config {
111-
machine_type = "c2d-highcpu-56"
111+
machine_type = "n2-highcpu-32"
112112
labels = {
113113
"premerge-platform" : "windows"
114114
}

0 commit comments

Comments
 (0)