Move GKE example to dev

fast/stages/01-resman/branch-gke.tf

@@ -35,7 +35,7 @@ module "branch-gke-folder" {
 module "branch-gke-multitenant-prod-folder" {
   source = "../../../modules/folder"
   parent = module.branch-gke-folder.id
-  name   = "prod"
+  name   = "Production"
   iam = {
     "roles/owner" = [
       module.branch-gke-multitenant-prod-sa.iam_email
@@ -52,7 +52,7 @@ module "branch-gke-multitenant-prod-folder" {
 module "branch-gke-multitenant-prod-sa" {
   source      = "../../../modules/iam-service-account"
   project_id  = var.automation_project_id
-  name        = "gke-prod-0"
+  name        = "prod-resman-gke-0"
   description = "Terraform gke multitenant prod service account."
   prefix      = var.prefix
   iam = {
@@ -64,7 +64,7 @@ module "branch-gke-multitenant-prod-sa" {
 module "branch-gke-multitenant-prod-gcs" {
   source     = "../../../modules/gcs"
   project_id = var.automation_project_id
-  name       = "gke-prod-0"
+  name       = "prod-resman-gke-0"
   prefix     = var.prefix
   versioning = true
   iam = {
@@ -76,7 +76,7 @@ module "branch-gke-multitenant-prod-gcs" {
 module "branch-gke-multitenant-dev-folder" {
   source = "../../../modules/folder"
   parent = module.branch-gke-folder.id
-  name   = "dev"
+  name   = "Development"
   iam = {
     "roles/owner" = [
       module.branch-gke-multitenant-dev-sa.iam_email
@@ -93,7 +93,7 @@ module "branch-gke-multitenant-dev-folder" {
 module "branch-gke-multitenant-dev-sa" {
   source      = "../../../modules/iam-service-account"
   project_id  = var.automation_project_id
-  name        = "gke-dev-0"
+  name        = "dev-resman-gke-0"
   description = "Terraform gke multitenant dev service account."
   prefix      = var.prefix
   iam = {
@@ -105,7 +105,7 @@ module "branch-gke-multitenant-dev-sa" {
 module "branch-gke-multitenant-dev-gcs" {
   source     = "../../../modules/gcs"
   project_id = var.automation_project_id
-  name       = "gke-dev-0"
+  name       = "dev-resman-gke-0"
   prefix     = var.prefix
   versioning = true
   iam = {

fast/stages/03-gke-multitenant/dev/gke-clusters.tf

@@ -30,7 +30,7 @@ module "gke-cluster" {
   project_id               = module.gke-project-0.project_id
   description              = each.value.description
   location                 = each.value.location
-  network                  = each.value.net.vpc
+  network                  = var.shared_vpc_self_link
   subnetwork               = each.value.net.subnet
   secondary_range_pods     = each.value.net.pods
   secondary_range_services = each.value.net.services

fast/stages/03-gke-multitenant/dev/gke-nodepools.tf

@@ -27,14 +27,14 @@ locals {
   ]...)
 }
 
-module "gke_1_nodepool" {
+module "gke-1-nodepool" {
   source             = "../../../../modules/gke-nodepool"
   for_each           = local.nodepools
   name               = each.value.name
   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.initial_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

fast/stages/03-gke-multitenant/dev/variables.tf

@@ -77,7 +77,6 @@ variable "clusters" {
       pods         = string
       services     = string
       subnet       = string
-      vpc          = string
     })
     overrides = object({
       cloudrun_config             = bool
@@ -156,6 +155,13 @@ variable "prefix" {
   type        = string
 }
 
+variable "shared_vpc_self_link" {
+  # tfdoc:variable:source 02-networking
+  description = "Self link for the shared VPC."
+  type        = string
+  default     = null
+}
+
 variable "vpc_host_project" {
   # tfdoc:variable:source 02-networking
   description = "Host project for the shared VPC."