diff --git a/fast/stages/03-gke-multitenant/prod/gke-clusters.tf b/fast/stages/03-gke-multitenant/prod/gke-clusters.tf index afdf0818..2adac67f 100644 --- a/fast/stages/03-gke-multitenant/prod/gke-clusters.tf +++ b/fast/stages/03-gke-multitenant/prod/gke-clusters.tf @@ -26,8 +26,8 @@ locals { module "gke-cluster" { source = "../../../../modules/gke-cluster" for_each = local.clusters - project_id = module.gke-project-0.project_id name = each.key + project_id = each.value.project_id description = each.value.description location = each.value.location network = each.value.net.vpc diff --git a/fast/stages/03-gke-multitenant/prod/gke-nodepools.tf b/fast/stages/03-gke-multitenant/prod/gke-nodepools.tf index 778a42d1..649eeecb 100644 --- a/fast/stages/03-gke-multitenant/prod/gke-nodepools.tf +++ b/fast/stages/03-gke-multitenant/prod/gke-nodepools.tf @@ -34,7 +34,7 @@ module "gke_1_nodepool" { project_id = module.gke-project-0.project_id cluster_name = module.gke-cluster[each.value.cluster].name location = module.gke-cluster[each.value.cluster].location - initial_node_count = each.value.node_count + initial_node_count = each.value.initial_node_count node_machine_type = each.value.node_type # TODO(jccb): can we use spot instances here? node_preemptible = each.value.preemptible diff --git a/fast/stages/03-gke-multitenant/prod/variables.tf b/fast/stages/03-gke-multitenant/prod/variables.tf index ce9203fc..55e7276d 100644 --- a/fast/stages/03-gke-multitenant/prod/variables.tf +++ b/fast/stages/03-gke-multitenant/prod/variables.tf @@ -68,6 +68,7 @@ variable "clusters" { memory_min = number memory_max = number }) + project_id = string description = string dns_domain = string labels = map(string) @@ -139,6 +140,7 @@ variable "nodepools" { type = map(map(object({ node_count = number node_type = string + initial_node_count = number overrides = object({ image_type = string max_pods_per_node = number @@ -159,4 +161,4 @@ variable "vpc_host_project" { # tfdoc:variable:source 02-networking description = "Host project for the shared VPC." type = string -} +} \ No newline at end of file