From 8fc2232d8debfd8341d2fc7d82dad3e5bd23984d Mon Sep 17 00:00:00 2001 From: Aaron Crickenberger Date: Fri, 21 Aug 2020 18:58:49 -0700 Subject: [PATCH] Remove old n1-highmem-8 nodepool from prow-build --- .../k8s-infra-prow-build/prow-build/main.tf | 25 ++----------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/infra/gcp/clusters/projects/k8s-infra-prow-build/prow-build/main.tf b/infra/gcp/clusters/projects/k8s-infra-prow-build/prow-build/main.tf index 4cdb8c8dfd1..3936230c670 100644 --- a/infra/gcp/clusters/projects/k8s-infra-prow-build/prow-build/main.tf +++ b/infra/gcp/clusters/projects/k8s-infra-prow-build/prow-build/main.tf @@ -107,26 +107,6 @@ module "prow_build_cluster" { is_prod_cluster = "true" } -module "prow_build_nodepool" { - source = "../../../modules/gke-nodepool" - project_name = local.project_id - cluster_name = module.prow_build_cluster.cluster.name - location = module.prow_build_cluster.cluster.location - name = "pool1" - initial_count = 12 - min_count = 6 - max_count = 30 - # kind-ipv6 jobs need an ipv6 stack; COS doesn't provide one, so we need to - # use an UBUNTU image instead. Why the CONTAINERD variant? I don't know, but - # it's what k8s-prow-builds/prow (prow.k8s.io's existing google.com build - # cluster) is using today, so we're just going to follow that - image_type = "UBUNTU_CONTAINERD" - machine_type = "n1-highmem-8" - disk_size_gb = 250 - disk_type = "pd-ssd" - service_account = module.prow_build_cluster.cluster_node_sa.email -} - module "prow_build_nodepool_n1_highmem_16" { source = "../../../modules/gke-nodepool" project_name = local.project_id @@ -137,9 +117,8 @@ module "prow_build_nodepool_n1_highmem_16" { min_count = 1 max_count = 30 # kind-ipv6 jobs need an ipv6 stack; COS doesn't provide one, so we need to - # use an UBUNTU image instead. Why the CONTAINERD variant? I don't know, but - # it's what k8s-prow-builds/prow (prow.k8s.io's existing google.com build - # cluster) is using today, so we're just going to follow that + # use an UBUNTU image instead. Keep parity with the existing google.com + # k8s-prow-builds/prow cluster by using the CONTAINERD variant image_type = "UBUNTU_CONTAINERD" machine_type = "n1-highmem-16" disk_size_gb = 250