+squash, commit changes from 40d77b7 via make generate

Author: emalloy

README.md

@@ -97,6 +97,7 @@ Then perform the following commands on the root folder:
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
+| cluster_resource_labels | Map containing cluster labels. Maximum of 64 labels | map | `<map>` | no |
 | description | The description of the cluster | string | `` | no |
 | horizontal_pod_autoscaling | Enable horizontal pod autoscaling addon | string | `true` | no |
 | http_load_balancing | Enable httpload balancer addon | string | `true` | no |

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/README.md

@@ -100,6 +100,7 @@ Then perform the following commands on the root folder:
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
+| cluster_resource_labels | Map containing cluster labels. Maximum of 64 labels | map | `<map>` | no |
 | description | The description of the cluster | string | `` | no |
 | enable_private_endpoint | (Beta) Whether the master's internal IP address is used as the cluster endpoint | string | `false` | no |
 | enable_private_nodes | (Beta) Whether nodes have internal IP addresses only | string | `false` | no |

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/variables.tf

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

variables.tf

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