terraform-google-modules · morgante · Jul 22, 2019 · Jul 19, 2019 · Jul 19, 2019 · Jul 19, 2019
@@ -129,6 +129,7 @@ In either case, upgrading to module version `v1.0.0` will trigger a recreation o
 | basic\_auth\_password | The password to be used with Basic Authentication. | string | `""` | no |
 | basic\_auth\_username | The username to be used with Basic Authentication. An empty value will disable Basic Authentication, which is the recommended configuration. | string | `""` | no |
 | cluster\_ipv4\_cidr | The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR. | string | `""` | no |
+| cluster\_resource\_labels | The GCE resource labels (a map of key/value pairs) to be applied to the cluster | map(string) | `<map>` | no |
 | configure\_ip\_masq | Enables the installation of ip masquerading, which is usually no longer required when using aliasied IP addresses. IP masquerading uses a kubectl call, so when you have a private cluster, you will need access to the API server. | string | `"false"` | no |
 | description | The description of the cluster | string | `""` | no |
 | disable\_legacy\_metadata\_endpoints | Disable the /0.1/ and /v1beta1/ metadata server endpoints on the node. Changing this value will cause all node pools to be recreated. | bool | `"true"` | no |

@@ -26,10 +26,11 @@ resource "google_container_cluster" "primary" {
   provider = google
   {% endif %}
 
-  count       = var.regional ? 1 : 0
-  name        = var.name
-  description = var.description
-  project     = var.project_id
+  count           = var.regional ? 1 : 0
+  name            = var.name
+  description     = var.description
+  project         = var.project_id
+  resource_labels = var.cluster_resource_labels
 
   region = var.region
   node_locations = coalescelist(

@@ -26,10 +26,11 @@ resource "google_container_cluster" "zonal_primary" {
   provider = google
   {% endif %}
 
-  count       = var.regional ? 0 : 1
-  name        = var.name
-  description = var.description
-  project     = var.project_id
+  count           = var.regional ? 0 : 1
+  name            = var.name
+  description     = var.description
+  project         = var.project_id
+  resource_labels = var.cluster_resource_labels
 
   zone              = var.zones[0]
   node_locations    = slice(var.zones, 1, length(var.zones))

@@ -284,6 +284,12 @@ variable "cluster_ipv4_cidr" {
   description = "The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR."
 }
 
+variable "cluster_resource_labels" {
+  type        = map(string)
+  description = "The GCE resource labels (a map of key/value pairs) to be applied to the cluster"
+  default     = {}
+}
+
 {% if private_cluster %}
 
 variable "deploy_using_private_endpoint" {

@@ -22,10 +22,11 @@
 resource "google_container_cluster" "primary" {
   provider = google
 
-  count       = var.regional ? 1 : 0
-  name        = var.name
-  description = var.description
-  project     = var.project_id
+  count           = var.regional ? 1 : 0
+  name            = var.name
+  description     = var.description
+  project         = var.project_id
+  resource_labels = var.cluster_resource_labels
 
   region = var.region
   node_locations = coalescelist(

@@ -22,10 +22,11 @@
 resource "google_container_cluster" "zonal_primary" {
   provider = google
 
-  count       = var.regional ? 0 : 1
-  name        = var.name
-  description = var.description
-  project     = var.project_id
+  count           = var.regional ? 0 : 1
+  name            = var.name
+  description     = var.description
+  project         = var.project_id
+  resource_labels = var.cluster_resource_labels
 
   zone              = var.zones[0]
   node_locations    = slice(var.zones, 1, length(var.zones))

diff --git a/main.tf b/main.tf
@@ -22,8 +22,8 @@
 data "google_compute_zones" "available" {
   provider = google
 
-  project = var.project_id
-  region  = var.region
+  project  = var.project_id
+  region   = var.region
 }
 
 resource "random_shuffle" "available_zones" {
@@ -35,19 +35,19 @@ locals {
   kubernetes_version_regional = var.kubernetes_version != "latest" ? var.kubernetes_version : data.google_container_engine_versions.region.latest_master_version
   kubernetes_version_zonal    = var.kubernetes_version != "latest" ? var.kubernetes_version : data.google_container_engine_versions.zone.latest_master_version
   node_version_regional       = var.node_version != "" && var.regional ? var.node_version : local.kubernetes_version_regional
-  node_version_zonal          = var.node_version != "" && ! var.regional ? var.node_version : local.kubernetes_version_zonal
+  node_version_zonal          = var.node_version != "" && !var.regional ? var.node_version : local.kubernetes_version_zonal
   custom_kube_dns_config      = length(keys(var.stub_domains)) > 0
   upstream_nameservers_config = length(var.upstream_nameservers) > 0
   network_project_id          = var.network_project_id != "" ? var.network_project_id : var.project_id
-  zone_count                  = length(var.zones)
+  zone_count = length(var.zones)
 
   cluster_type = var.regional ? "regional" : "zonal"
 
   cluster_network_policy = var.network_policy ? [{
     enabled  = true
     provider = var.network_policy_provider
-    }] : [{
-    enabled  = false
+  }] : [{
+    enabled = false
     provider = null
   }]
 
@@ -247,10 +247,10 @@ locals {
   cluster_monitoring_service                 = local.cluster_type_output_monitoring_service[local.cluster_type]
   cluster_node_pools_names                   = local.cluster_type_output_node_pools_names[local.cluster_type]
   cluster_node_pools_versions                = local.cluster_type_output_node_pools_versions[local.cluster_type]
-  cluster_network_policy_enabled             = ! local.cluster_type_output_network_policy_enabled[local.cluster_type]
-  cluster_http_load_balancing_enabled        = ! local.cluster_type_output_http_load_balancing_enabled[local.cluster_type]
-  cluster_horizontal_pod_autoscaling_enabled = ! local.cluster_type_output_horizontal_pod_autoscaling_enabled[local.cluster_type]
-  cluster_kubernetes_dashboard_enabled       = ! local.cluster_type_output_kubernetes_dashboard_enabled[local.cluster_type]
+  cluster_network_policy_enabled             = !local.cluster_type_output_network_policy_enabled[local.cluster_type]
+  cluster_http_load_balancing_enabled        = !local.cluster_type_output_http_load_balancing_enabled[local.cluster_type]
+  cluster_horizontal_pod_autoscaling_enabled = !local.cluster_type_output_horizontal_pod_autoscaling_enabled[local.cluster_type]
+  cluster_kubernetes_dashboard_enabled       = !local.cluster_type_output_kubernetes_dashboard_enabled[local.cluster_type]
 }
 
 /******************************************

@@ -137,6 +137,7 @@ In either case, upgrading to module version `v1.0.0` will trigger a recreation o
 | basic\_auth\_username | The username to be used with Basic Authentication. An empty value will disable Basic Authentication, which is the recommended configuration. | string | `""` | no |
 | cloudrun | (Beta) Enable CloudRun addon | string | `"false"` | no |
 | cluster\_ipv4\_cidr | The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR. | string | `""` | no |
+| cluster\_resource\_labels | The GCE resource labels (a map of key/value pairs) to be applied to the cluster | map(string) | `<map>` | no |
 | configure\_ip\_masq | Enables the installation of ip masquerading, which is usually no longer required when using aliasied IP addresses. IP masquerading uses a kubectl call, so when you have a private cluster, you will need access to the API server. | string | `"false"` | no |
 | database\_encryption | Application-layer Secrets Encryption settings. The object format is {state = string, key_name = string}. Valid values of state are: "ENCRYPTED"; "DECRYPTED". key_name is the name of a CloudKMS key. | object | `<list>` | no |
 | deploy\_using\_private\_endpoint | (Beta) A toggle for Terraform and kubectl to connect to the master's internal IP address during deployment. | bool | `"false"` | no |

@@ -22,10 +22,11 @@
 resource "google_container_cluster" "primary" {
   provider = google-beta
 
-  count       = var.regional ? 1 : 0
-  name        = var.name
-  description = var.description
-  project     = var.project_id
+  count           = var.regional ? 1 : 0
+  name            = var.name
+  description     = var.description
+  project         = var.project_id
+  resource_labels = var.cluster_resource_labels
 
   region = var.region
   node_locations = coalescelist(

@@ -22,10 +22,11 @@
 resource "google_container_cluster" "zonal_primary" {
   provider = google-beta
 
-  count       = var.regional ? 0 : 1
-  name        = var.name
-  description = var.description
-  project     = var.project_id
+  count           = var.regional ? 0 : 1
+  name            = var.name
+  description     = var.description
+  project         = var.project_id
+  resource_labels = var.cluster_resource_labels
 
   zone              = var.zones[0]
   node_locations    = slice(var.zones, 1, length(var.zones))

diff --git a/modules/beta-private-cluster/main.tf b/modules/beta-private-cluster/main.tf
@@ -22,8 +22,8 @@
 data "google_compute_zones" "available" {
   provider = google-beta
 
-  project = var.project_id
-  region  = var.region
+  project  = var.project_id
+  region   = var.region
 }
 
 resource "random_shuffle" "available_zones" {
@@ -35,23 +35,23 @@ locals {
   kubernetes_version_regional = var.kubernetes_version != "latest" ? var.kubernetes_version : data.google_container_engine_versions.region.latest_master_version
   kubernetes_version_zonal    = var.kubernetes_version != "latest" ? var.kubernetes_version : data.google_container_engine_versions.zone.latest_master_version
   node_version_regional       = var.node_version != "" && var.regional ? var.node_version : local.kubernetes_version_regional
-  node_version_zonal          = var.node_version != "" && ! var.regional ? var.node_version : local.kubernetes_version_zonal
+  node_version_zonal          = var.node_version != "" && !var.regional ? var.node_version : local.kubernetes_version_zonal
   custom_kube_dns_config      = length(keys(var.stub_domains)) > 0
   upstream_nameservers_config = length(var.upstream_nameservers) > 0
   network_project_id          = var.network_project_id != "" ? var.network_project_id : var.project_id
-  zone_count                  = length(var.zones)
+  zone_count = length(var.zones)
 
   cluster_type = var.regional ? "regional" : "zonal"
 
   cluster_network_policy = var.network_policy ? [{
     enabled  = true
     provider = var.network_policy_provider
-    }] : [{
-    enabled  = false
+  }] : [{
+    enabled = false
     provider = null
   }]
 
-  cluster_cloudrun_config = var.cloudrun ? [{ disabled = false }] : []
+  cluster_cloudrun_config = var.cloudrun ? [{disabled = false}] : []
 
   cluster_node_metadata_config = var.node_metadata == "UNSPECIFIED" ? [] : [{
     node_metadata = var.node_metadata
@@ -262,12 +262,12 @@ locals {
   cluster_monitoring_service                 = local.cluster_type_output_monitoring_service[local.cluster_type]
   cluster_node_pools_names                   = local.cluster_type_output_node_pools_names[local.cluster_type]
   cluster_node_pools_versions                = local.cluster_type_output_node_pools_versions[local.cluster_type]
-  cluster_network_policy_enabled             = ! local.cluster_type_output_network_policy_enabled[local.cluster_type]
-  cluster_http_load_balancing_enabled        = ! local.cluster_type_output_http_load_balancing_enabled[local.cluster_type]
-  cluster_horizontal_pod_autoscaling_enabled = ! local.cluster_type_output_horizontal_pod_autoscaling_enabled[local.cluster_type]
-  cluster_kubernetes_dashboard_enabled       = ! local.cluster_type_output_kubernetes_dashboard_enabled[local.cluster_type]
+  cluster_network_policy_enabled             = !local.cluster_type_output_network_policy_enabled[local.cluster_type]
+  cluster_http_load_balancing_enabled        = !local.cluster_type_output_http_load_balancing_enabled[local.cluster_type]
+  cluster_horizontal_pod_autoscaling_enabled = !local.cluster_type_output_horizontal_pod_autoscaling_enabled[local.cluster_type]
+  cluster_kubernetes_dashboard_enabled       = !local.cluster_type_output_kubernetes_dashboard_enabled[local.cluster_type]
   # BETA features
-  cluster_istio_enabled               = ! local.cluster_type_output_istio_enabled[local.cluster_type]
+  cluster_istio_enabled               = !local.cluster_type_output_istio_enabled[local.cluster_type]
   cluster_cloudrun_enabled            = var.cloudrun
   cluster_pod_security_policy_enabled = local.cluster_type_output_pod_security_policy_enabled[local.cluster_type]
   # /BETA features

@@ -78,7 +78,7 @@ variable "node_version" {
 }
 
 variable "master_authorized_networks_config" {
-  type        = list(object({ cidr_blocks = list(object({ cidr_block = string, display_name = string })) }))
+  type        = list(object({cidr_blocks = list(object({cidr_block = string, display_name = string}))}))
   description = "The desired configuration options for master authorized networks. The object format is {cidr_blocks = list(object({cidr_block = string, display_name = string}))}. Omit the nested cidr_blocks attribute to disallow external access (except the cluster node IPs, which GKE automatically whitelists)."
   default     = []
 }
@@ -179,7 +179,7 @@ variable "node_pools_metadata" {
 }
 
 variable "node_pools_taints" {
-  type        = map(list(object({ key = string, value = string, effect = string })))
+  type        = map(list(object({key=string,value=string,effect=string})))
   description = "Map of lists containing node taints by node-pool name"
 
   default = {
@@ -284,6 +284,12 @@ variable "cluster_ipv4_cidr" {
   description = "The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR."
 }
 
+variable "cluster_resource_labels" {
+  type        = map(string)
+  description = "The GCE resource labels (a map of key/value pairs) to be applied to the cluster"
+  default     = {}
+}
+
 
 variable "deploy_using_private_endpoint" {
   type        = bool
@@ -316,10 +322,10 @@ variable "istio" {
 
 variable "database_encryption" {
   description = "Application-layer Secrets Encryption settings. The object format is {state = string, key_name = string}. Valid values of state are: \"ENCRYPTED\"; \"DECRYPTED\". key_name is the name of a CloudKMS key."
-  type        = list(object({ state = string, key_name = string }))
-  default = [{
-    state    = "DECRYPTED"
-    key_name = ""
+  type        = list(object({state = string, key_name = string}))
+  default     = [{
+    state     = "DECRYPTED"
+    key_name  = ""
   }]
 }
 
@@ -335,7 +341,7 @@ variable "enable_binary_authorization" {
 
 variable "pod_security_policy_config" {
   description = "enabled - Enable the PodSecurityPolicy controller for this cluster. If enabled, pods must be valid under a PodSecurityPolicy to be created."
-  default = [{
+  default     = [{
     "enabled" = false
   }]
 }

@@ -132,6 +132,7 @@ In either case, upgrading to module version `v1.0.0` will trigger a recreation o
 | basic\_auth\_username | The username to be used with Basic Authentication. An empty value will disable Basic Authentication, which is the recommended configuration. | string | `""` | no |
 | cloudrun | (Beta) Enable CloudRun addon | string | `"false"` | no |
 | cluster\_ipv4\_cidr | The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR. | string | `""` | no |
+| cluster\_resource\_labels | The GCE resource labels (a map of key/value pairs) to be applied to the cluster | map(string) | `<map>` | no |
 | configure\_ip\_masq | Enables the installation of ip masquerading, which is usually no longer required when using aliasied IP addresses. IP masquerading uses a kubectl call, so when you have a private cluster, you will need access to the API server. | string | `"false"` | no |
 | database\_encryption | Application-layer Secrets Encryption settings. The object format is {state = string, key_name = string}. Valid values of state are: "ENCRYPTED"; "DECRYPTED". key_name is the name of a CloudKMS key. | object | `<list>` | no |
 | description | The description of the cluster | string | `""` | no |

@@ -22,10 +22,11 @@
 resource "google_container_cluster" "primary" {
   provider = google-beta
 
-  count       = var.regional ? 1 : 0
-  name        = var.name
-  description = var.description
-  project     = var.project_id
+  count           = var.regional ? 1 : 0
+  name            = var.name
+  description     = var.description
+  project         = var.project_id
+  resource_labels = var.cluster_resource_labels
 
   region = var.region
   node_locations = coalescelist(

@@ -22,10 +22,11 @@
 resource "google_container_cluster" "zonal_primary" {
   provider = google-beta
 
-  count       = var.regional ? 0 : 1
-  name        = var.name
-  description = var.description
-  project     = var.project_id
+  count           = var.regional ? 0 : 1
+  name            = var.name
+  description     = var.description
+  project         = var.project_id
+  resource_labels = var.cluster_resource_labels
 
   zone              = var.zones[0]
   node_locations    = slice(var.zones, 1, length(var.zones))