diff --git a/premerge/linux_container_pod_template.yaml b/premerge/linux_container_pod_template.yaml index 42914bf6..176e40e7 100644 --- a/premerge/linux_container_pod_template.yaml +++ b/premerge/linux_container_pod_template.yaml @@ -22,5 +22,5 @@ spec: cpu: "100m" memory: "25Gi" limits: - cpu: 32 - memory: "32Gi" + cpu: 64 + memory: "256Gi" diff --git a/premerge/linux_runners_values.yaml b/premerge/linux_runners_values.yaml index d9b91a15..8b54a020 100644 --- a/premerge/linux_runners_values.yaml +++ b/premerge/linux_runners_values.yaml @@ -47,10 +47,10 @@ template: # itself doesn't need much, just using something enough not to get # OOM killed. requests: - cpu: 25 + cpu: 55 memory: "2Gi" limits: - cpu: 32 + cpu: 64 memory: "2Gi" env: - name: ACTIONS_RUNNER_CONTAINER_HOOKS diff --git a/premerge/main.tf b/premerge/main.tf index 571761dd..e6450af0 100644 --- a/premerge/main.tf +++ b/premerge/main.tf @@ -82,7 +82,7 @@ resource "google_container_node_pool" "llvm_premerge_linux" { } node_config { - machine_type = "n2-highcpu-32" + machine_type = "n2-standard-64" taint = [{ key = "premerge-platform" value = "linux" @@ -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 = "n2-highcpu-32" + machine_type = "n2-standard-64" labels = { "premerge-platform" : "windows" } diff --git a/premerge/windows_runner_values.yaml b/premerge/windows_runner_values.yaml index e676e3df..3962a98f 100644 --- a/premerge/windows_runner_values.yaml +++ b/premerge/windows_runner_values.yaml @@ -21,7 +21,7 @@ template: - name: runner resources: requests: - cpu: 25 + cpu: 55 # TODO(boomanaiden154): Update this image when we have a proper windows # image ready. image: ghcr.io/keenuts-test-org/windows-ci-image:latest