introduce cluster_resource_labels map var

add resource_labels param to cluster_regional and zonal resource templates

+squash, commit changes from 40d77b7 via make generate

best practice +squash - empty map var

commit formatting changes from make generate

Author: emalloy

autogen/cluster_regional.tf

@@ -25,6 +25,7 @@ resource "google_container_cluster" "primary" {
   name        = "${var.name}"
   description = "${var.description}"
   project     = "${var.project_id}"
+  resource_labels = "${var.cluster_resource_labels}"
 
   region           = "${var.region}"
   additional_zones = ["${coalescelist(compact(var.zones), sort(random_shuffle.available_zones.result))}"]

autogen/cluster_zonal.tf

@@ -25,6 +25,7 @@ resource "google_container_cluster" "zonal_primary" {
   name        = "${var.name}"
   description = "${var.description}"
   project     = "${var.project_id}"
+  resource_labels = "${var.cluster_resource_labels}"
 
   zone             = "${var.zones[0]}"
   additional_zones = ["${slice(var.zones,1,length(var.zones))}"]

autogen/variables.tf

@@ -29,6 +29,14 @@ variable "description" {
   default     = ""
 }
 
+variable "cluster_resource_labels" {
+  type        = "map"
+  description = "Map containing cluster labels. Maximum of 64 labels"
+
+  default = {
+  }
+}
+
 variable "regional" {
   description = "Whether is a regional cluster (zonal cluster if set false. WARNING: changing this after cluster creation is destructive!)"
   default     = true

cluster_regional.tf

@@ -25,6 +25,7 @@ resource "google_container_cluster" "primary" {
   name        = "${var.name}"
   description = "${var.description}"
   project     = "${var.project_id}"
+  resource_labels = "${var.cluster_resource_labels}"
 
   region           = "${var.region}"
   additional_zones = ["${coalescelist(compact(var.zones), sort(random_shuffle.available_zones.result))}"]

cluster_zonal.tf

@@ -25,6 +25,7 @@ resource "google_container_cluster" "zonal_primary" {
   name        = "${var.name}"
   description = "${var.description}"
   project     = "${var.project_id}"
+  resource_labels = "${var.cluster_resource_labels}"
 
   zone             = "${var.zones[0]}"
   additional_zones = ["${slice(var.zones,1,length(var.zones))}"]

modules/private-cluster/cluster_regional.tf

@@ -25,6 +25,7 @@ resource "google_container_cluster" "primary" {
   name        = "${var.name}"
   description = "${var.description}"
   project     = "${var.project_id}"
+  resource_labels = "${var.cluster_resource_labels}"
 
   region           = "${var.region}"
   additional_zones = ["${coalescelist(compact(var.zones), sort(random_shuffle.available_zones.result))}"]

modules/private-cluster/cluster_zonal.tf

@@ -25,6 +25,7 @@ resource "google_container_cluster" "zonal_primary" {
   name        = "${var.name}"
   description = "${var.description}"
   project     = "${var.project_id}"
+  resource_labels = "${var.cluster_resource_labels}"
 
   zone             = "${var.zones[0]}"
   additional_zones = ["${slice(var.zones,1,length(var.zones))}"]

modules/private-cluster/outputs.tf

@@ -111,4 +111,4 @@ output "node_pools_versions" {
 output "service_account" {
   description = "The service account to default running nodes as if not overridden in `node_pools`."
   value = "${local.service_account}"
-}
+}

modules/private-cluster/variables.tf

@@ -29,6 +29,14 @@ variable "description" {
   default     = ""
 }
 
+variable "cluster_resource_labels" {
+  type        = "map"
+  description = "Map containing cluster labels. Maximum of 64 labels"
+
+  default = {
+  }
+}
+
 variable "regional" {
   description = "Whether is a regional cluster (zonal cluster if set false. WARNING: changing this after cluster creation is destructive!)"
   default     = true

outputs.tf

@@ -111,4 +111,4 @@ output "node_pools_versions" {
 output "service_account" {
   description = "The service account to default running nodes as if not overridden in `node_pools`."
   value = "${local.service_account}"
-}
+}

variables.tf

@@ -29,6 +29,14 @@ variable "description" {
   default     = ""
 }
 
+variable "cluster_resource_labels" {
+  type        = "map"
+  description = "Map containing cluster labels. Maximum of 64 labels"
+
+  default = {
+  }
+}
+
 variable "regional" {
   description = "Whether is a regional cluster (zonal cluster if set false. WARNING: changing this after cluster creation is destructive!)"
   default     = true