Skip to content

Commit

Permalink
[CI] Move GKE cluster to new quota
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
boomanaiden154 committed Dec 11, 2024
1 parent 8776ab7 commit bb69573
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions premerge/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.terraform*
*.tfstate*
12 changes: 6 additions & 6 deletions premerge/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ data "google_client_config" "current" {}

resource "google_container_cluster" "llvm_premerge" {
name = var.cluster_name
location = "europe-west3-a"
location = "us-central1-a"

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

resource "google_container_node_pool" "llvm_premerge_linux_service" {
name = "llvm-premerge-linux-service"
location = "europe-west3-a"
location = "us-central1-a"
cluster = google_container_cluster.llvm_premerge.name
node_count = 2

Expand All @@ -72,7 +72,7 @@ resource "google_container_node_pool" "llvm_premerge_linux_service" {

resource "google_container_node_pool" "llvm_premerge_linux" {
name = "llvm-premerge-linux"
location = "europe-west3-a"
location = "us-central1-a"
cluster = google_container_cluster.llvm_premerge.name
initial_node_count = 0

Expand All @@ -82,7 +82,7 @@ resource "google_container_node_pool" "llvm_premerge_linux" {
}

node_config {
machine_type = "c2d-highcpu-56"
machine_type = "n2-highcpu-32"
taint = [{
key = "premerge-platform"
value = "linux"
Expand All @@ -96,7 +96,7 @@ resource "google_container_node_pool" "llvm_premerge_linux" {

resource "google_container_node_pool" "llvm_premerge_windows" {
name = "llvm-premerge-windows"
location = "europe-west3-a"
location = "us-central1-a"
cluster = google_container_cluster.llvm_premerge.name
initial_node_count = 0

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

0 comments on commit bb69573

Please sign in to comment.