Backport changes to test fixtures into private cluster tests

Author: Jberlinsky

examples/simple_regional_private/main.tf

@@ -33,7 +33,7 @@ data "google_compute_subnetwork" "subnetwork" {
 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_private/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_private/main.tf

@@ -33,7 +33,7 @@ data "google_compute_subnetwork" "subnetwork" {
 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_private/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/simple_regional_private/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_private/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}"