Add random suffix to end of cluster names during testing

Author: Jberlinsky

examples/deploy_service/main.tf

@@ -35,11 +35,10 @@ data "google_client_config" "default" {}
 module "gke" {
   source             = "../../"
   project_id         = "${var.project_id}"
-  name               = "${local.cluster_type}-cluster"
+  name               = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
   region             = "${var.region}"
   network            = "${var.network}"
-  subnetwork         = "${var.subnetwork}"
-  ip_range_pods      = "${var.ip_range_pods}"
+  subnetwork         = "${var.subnetwork}" ip_range_pods      = "${var.ip_range_pods}"
   ip_range_services  = "${var.ip_range_services}"
   kubernetes_version = "1.11.5-gke.4"
   service_account    = "${var.compute_engine_service_account}"

examples/deploy_service/variables.tf

@@ -22,6 +22,11 @@ variable "credentials_path" {
   description = "The path to the GCP credentials JSON file"
 }
 
+variable "cluster_name_suffix" {
+  description = "A suffix to append to the default cluster name"
+  default     = ""
+}
+
 variable "region" {
   description = "The region to host the cluster in"
 }

examples/node_pool/main.tf

@@ -26,7 +26,7 @@ provider "google" {
 module "gke" {
   source             = "../../"
   project_id         = "${var.project_id}"
-  name               = "${local.cluster_type}-cluster"
+  name               = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
   region             = "${var.region}"
   network            = "${var.network}"
   subnetwork         = "${var.subnetwork}"

examples/node_pool/variables.tf

@@ -22,6 +22,11 @@ variable "credentials_path" {
   description = "The path to the GCP credentials JSON file"
 }
 
+variable "cluster_name_suffix" {
+  description = "A suffix to append to the default cluster name"
+  default     = ""
+}
+
 variable "region" {
   description = "The region to host the cluster in"
 }

examples/shared_vpc/main.tf

@@ -26,7 +26,7 @@ provider "google" {
 module "gke" {
   source             = "../../"
   project_id         = "${var.project_id}"
-  name               = "${local.cluster_type}-cluster"
+  name               = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
   region             = "${var.region}"
   network            = "${var.network}"
   network_project_id = "${var.network_project_id}"

examples/shared_vpc/variables.tf

@@ -22,6 +22,11 @@ variable "credentials_path" {
   description = "The path to the GCP credentials JSON file"
 }
 
+variable "cluster_name_suffix" {
+  description = "A suffix to append to the default cluster name"
+  default     = ""
+}
+
 variable "region" {
   description = "The region to host the cluster in"
 }

examples/simple_regional/main.tf

@@ -26,7 +26,7 @@ provider "google" {
 module "gke" {
   source             = "../../"
   project_id         = "${var.project_id}"
-  name               = "${local.cluster_type}-cluster"
+  name               = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
   regional           = true
   region             = "${var.region}"
   network            = "${var.network}"

examples/simple_regional/variables.tf

@@ -22,6 +22,11 @@ variable "credentials_path" {
   description = "The path to the GCP credentials JSON file"
 }
 
+variable "cluster_name_suffix" {
+  description = "A suffix to append to the default cluster name"
+  default     = ""
+}
+
 variable "region" {
   description = "The region to host the cluster in"
 }

examples/simple_zonal/main.tf

@@ -26,7 +26,7 @@ provider "google" {
 module "gke" {
   source             = "../../"
   project_id         = "${var.project_id}"
-  name               = "${local.cluster_type}-cluster"
+  name               = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
   regional           = false
   region             = "${var.region}"
   zones              = "${var.zones}"

examples/simple_zonal/variables.tf

@@ -22,6 +22,11 @@ variable "credentials_path" {
   description = "The path to the GCP credentials JSON file"
 }
 
+variable "cluster_name_suffix" {
+  description = "A suffix to append to the default cluster name"
+  default     = ""
+}
+
 variable "region" {
   description = "The region to host the cluster in"
 }

examples/stub_domains/main.tf

@@ -26,7 +26,7 @@ provider "google" {
 module "gke" {
   source             = "../../"
   project_id         = "${var.project_id}"
-  name               = "${local.cluster_type}-cluster"
+  name               = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
   region             = "${var.region}"
   network            = "${var.network}"
   subnetwork         = "${var.subnetwork}"

examples/stub_domains/variables.tf

@@ -22,6 +22,11 @@ variable "credentials_path" {
   description = "The path to the GCP credentials JSON file"
 }
 
+variable "cluster_name_suffix" {
+  description = "A suffix to append to the default cluster name"
+  default     = ""
+}
+
 variable "region" {
   description = "The region to host the cluster in"
 }

test/fixtures/deploy_service/example.tf

@@ -19,6 +19,7 @@ module "example" {
 
   project_id                     = "${var.project_id}"
   credentials_path               = "${local.credentials_path}"
+  cluster_name_suffix            = "-${random_string.suffix.result}"
   region                         = "${var.region}"
   network                        = "${google_compute_network.main.name}"
   subnetwork                     = "${google_compute_subnetwork.main.name}"

test/fixtures/node_pool/example.tf

@@ -19,6 +19,7 @@ module "example" {
 
   project_id                     = "${var.project_id}"
   credentials_path               = "${local.credentials_path}"
+  cluster_name_suffix            = "-${random_string.suffix.result}"
   region                         = "${var.region}"
   network                        = "${google_compute_network.main.name}"
   subnetwork                     = "${google_compute_subnetwork.main.name}"

test/fixtures/shared_vpc/example.tf

@@ -19,6 +19,7 @@ module "example" {
 
   project_id                     = "${var.project_id}"
   credentials_path               = "${local.credentials_path}"
+  cluster_name_suffix            = "-${random_string.suffix.result}"
   region                         = "${var.region}"
   network                        = "${google_compute_network.main.name}"
   network_project_id             = "${var.project_id}"

test/fixtures/simple_regional/example.tf

@@ -19,6 +19,7 @@ module "example" {
 
   project_id                     = "${var.project_id}"
   credentials_path               = "${local.credentials_path}"
+  cluster_name_suffix            = "-${random_string.suffix.result}"
   region                         = "${var.region}"
   network                        = "${google_compute_network.main.name}"
   subnetwork                     = "${google_compute_subnetwork.main.name}"

test/fixtures/simple_zonal/example.tf

@@ -19,6 +19,7 @@ module "example" {
 
   project_id                     = "${var.project_id}"
   credentials_path               = "${local.credentials_path}"
+  cluster_name_suffix            = "-${random_string.suffix.result}"
   region                         = "${var.region}"
   zones                          = ["${var.zones}"]
   network                        = "${google_compute_network.main.name}"

test/fixtures/stub_domains/example.tf

@@ -19,6 +19,7 @@ module "example" {
 
   project_id                     = "${var.project_id}"
   credentials_path               = "${local.credentials_path}"
+  cluster_name_suffix            = "-${random_string.suffix.result}"
   region                         = "${var.region}"
   network                        = "${google_compute_network.main.name}"
   subnetwork                     = "${google_compute_subnetwork.main.name}"