diff --git a/premerge/.gitignore b/premerge/.gitignore index e79eb2310..def1e7b0d 100644 --- a/premerge/.gitignore +++ b/premerge/.gitignore @@ -1 +1,2 @@ .terraform* +*.tfstate* diff --git a/premerge/main.tf b/premerge/main.tf index 60acf7dcf..571761dd5 100644 --- a/premerge/main.tf +++ b/premerge/main.tf @@ -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 @@ -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 @@ -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 @@ -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" @@ -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 @@ -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" }