Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to C3 machine types for prow build cluster #6525

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Switch to C3 machine types for prow build cluster #6525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions infra/gcp/terraform/k8s-infra-prow-build/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ module "prow_build_cluster" {
# Why use UBUNTU_CONTAINERD for image_type?
# - ipv6 jobs need an ipv6 stack; COS lacks one, so use UBUNTU
# - k8s-prow-builds/prow cluster uses _CONTAINERD variant, keep parity
module "prow_build_nodepool_n1_highmem_8_localssd" {
module "prow_build_nodepool_c3d_highmem_8_lssd" {
source = "../modules/gke-nodepool"
project_name = module.project.project_id
cluster_name = module.prow_build_cluster.cluster.name
Expand All @@ -98,10 +98,9 @@ module "prow_build_nodepool_n1_highmem_8_localssd" {
min_count = 1
max_count = 80
image_type = "UBUNTU_CONTAINERD"
machine_type = "n1-highmem-8"
machine_type = "c3d-highmem-8-lssd" // includes 1 Local SSD
disk_size_gb = 100
disk_type = "pd-standard"
ephemeral_local_ssd_count = 2 # each is 375GB
disk_type = "pd-ssd"
service_account = module.prow_build_cluster.cluster_node_sa.email
}

Expand Down
2 changes: 1 addition & 1 deletion infra/gcp/terraform/k8s-infra-public-pii/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,5 +164,5 @@ resource "google_project_iam_member" "pii_access" {
for_each = toset(["roles/viewer", "roles/bigquery.user"])
project = local.project_id
role = each.key
member = "[email protected]"
member = "group:[email protected]"
}