fix cluster creation for gcp

Author: michaeljguarino

terraform/core-infra/gcp/network.tf

@@ -1,5 +1,10 @@
 data "google_project" "current" {}
 
+locals {
+  dev_subnet = format("%s-plural-dev", var.cluster_name)
+  prod_subnet = format("%s-plural-prod", var.cluster_name)
+}
+
 module "network_dev" {
   source  = "terraform-google-modules/network/google"
   version = ">= 7.5"
@@ -9,14 +14,14 @@ module "network_dev" {
 
   subnets = [
     {
-      subnet_name = format("%s-plural-dev", var.cluster_name)
+      subnet_name   = local.dev_subnet
       subnet_ip     = var.subnet_cidr
       subnet_region = var.region
     },
   ]
 
   secondary_ranges = {
-    plural-dev-subnet = [
+    (local.dev_subnet) = [
       {
         range_name    = var.ip_range_pods_name
         ip_cidr_range = var.pods_cidr
@@ -38,14 +43,14 @@ module "network_prod" {
 
   subnets = [
     {
-      subnet_name = format("%s-plural-prod", var.cluster_name)
+      subnet_name   = local.prod_subnet
       subnet_ip     = var.subnet_cidr
       subnet_region = var.region
     },
   ]
 
   secondary_ranges = {
-    plural-prod-subnet = [
+    (local.prod_subnet) = [
       {
         range_name    = var.ip_range_pods_name
         ip_cidr_range = var.pods_cidr

terraform/modules/clusters/gcp/context.tf

@@ -7,5 +7,6 @@ resource "plural_service_context" "mgmt" {
         network      = local.vpc.network
         subnetwork   = local.vpc.subnetwork
         cidr         = var.subnet_cidr
+        project_id   = local.project_id
     })
 }

terraform/modules/clusters/gcp/externaldns.tf

@@ -2,6 +2,7 @@ resource "google_service_account" "externaldns" {
   account_id                   = "${var.cluster}-externaldns"
   display_name                 = substr("GCP SA bound to K8S SA ${local.project_id}[external-dns]", 0, 100)
   description                  = "GCP SA bound to K8S SA ${local.project_id}[external-dns]"
+  project                      = local.project_id
   create_ignore_already_exists = true
 }
 

terraform/modules/clusters/gcp/gke.tf

@@ -2,11 +2,16 @@ data "plural_service_context" "network" {
   name = "plrl/vpc/${var.tier}"
 }
 
+data "plural_service_context" "mgmt" {
+  name = "plrl/clusters/mgmt"
+}
+
 data "google_client_config" "current" {}
 
 locals {
-  project_id = data.google_client_config.current.project
-  vpc = jsondecode(data.plural_service_context.network.configuration)
+  mgmt       = jsondecode(data.plural_service_context.mgmt.configuration)
+  project_id = local.mgmt.project_id
+  vpc        = jsondecode(data.plural_service_context.network.configuration)
 }
 
 module "gke" {
@@ -21,8 +26,8 @@ module "gke" {
   region                 = var.region
   network                = local.vpc.network
   subnetwork             = local.vpc.subnetwork
-  ip_range_pods          = local.vpc.ip_range_pods_name
-  ip_range_services      = local.vpc.ip_range_services_name
+  ip_range_pods          = local.vpc.ip_range_pods
+  ip_range_services      = local.vpc.ip_range_services
   create_service_account = true
   deletion_protection    = false
   node_pools             = var.node_pools