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

Jump to bottom

Switch to C3 machine types for prow build cluster #6525

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+18 −19
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
2 commits
Select commit Hold shift + click to select a range
77965af
create a new nodepool using c3 instances
upodroid Mar 5, 2024
a4ad41f
delete old nodepool
upodroid Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 15 additions & 16 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,20 +83,19 @@ 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" {
source = "../modules/gke-nodepool"
project_name = module.project.project_id
cluster_name = module.prow_build_cluster.cluster.name
location = module.prow_build_cluster.cluster.location
name = "pool5"
initial_count = 1
min_count = 1
max_count = 80
image_type = "UBUNTU_CONTAINERD"
machine_type = "n1-highmem-8"
disk_size_gb = 100
disk_type = "pd-standard"
ephemeral_local_ssd_count = 2 # each is 375GB
service_account = module.prow_build_cluster.cluster_node_sa.email
}

module "prow_build_nodepool_c3_standard_8_lssd" {
source = "../modules/gke-nodepool"
project_name = module.project.project_id
cluster_name = module.prow_build_cluster.cluster.name
location = module.prow_build_cluster.cluster.location
name = "pool6"
initial_count = 1
min_count = 1
max_count = 80
image_type = "UBUNTU_CONTAINERD"
machine_type = "c3-standard-8-lssd" // includes 2 Local SSDs
disk_size_gb = 100
disk_type = "pd-balanced"
service_account = module.prow_build_cluster.cluster_node_sa.email
}
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 @@ -183,5 +183,5 @@ resource "google_project_iam_member" "pii_access" {
for_each = toset(["roles/viewer", "roles/bigquery.user"])
project = local.project_id
role = each.key
member = "k8s-infra-public-pii@kubernetes.io"
member = "group:k8s-infra-public-pii@kubernetes.io"
}
4 changes: 2 additions & 2 deletions infra/gcp/terraform/modules/gke-cluster/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ resource "google_container_cluster" "prod_cluster" {

// Enable GKE Network Policy
network_policy {
enabled = true
enabled = false
provider = "CALICO"
}

Expand Down Expand Up @@ -252,7 +252,7 @@ resource "google_container_cluster" "test_cluster" {

// Enable GKE Network Policy
network_policy {
enabled = true
enabled = false
provider = "CALICO"
}

Expand Down