feat!: Add option to pass resource_labels to NP (terraform-google-modules#1508)

Co-authored-by: Bharath KKB <bharathkrishnakb@gmail.com>

Author: eyalzek

README.md

@@ -184,6 +184,7 @@ Then perform the following commands on the root folder:
 | node\_pools\_labels | Map of maps containing node labels by node-pool name | `map(map(string))` | <pre>{<br> "all": {},<br> "default-node-pool": {}<br>}</pre> | no |
 | node\_pools\_metadata | Map of maps containing node metadata by node-pool name | `map(map(string))` | <pre>{<br> "all": {},<br> "default-node-pool": {}<br>}</pre> | no |
 | node\_pools\_oauth\_scopes | Map of lists containing node oauth scopes by node-pool name | `map(list(string))` | <pre>{<br> "all": [<br> "https://www.googleapis.com/auth/cloud-platform"<br> ],<br> "default-node-pool": []<br>}</pre> | no |
+| node\_pools\_resource\_labels | Map of maps containing resource labels by node-pool name | `map(map(string))` | <pre>{<br> "all": {},<br> "default-node-pool": {}<br>}</pre> | no |
 | node\_pools\_tags | Map of lists containing node network tags by node-pool name | `map(list(string))` | <pre>{<br> "all": [],<br> "default-node-pool": []<br>}</pre> | no |
 | node\_pools\_taints | Map of lists containing node taints by node-pool name | `map(list(object({ key = string, value = string, effect = string })))` | <pre>{<br> "all": [],<br> "default-node-pool": []<br>}</pre> | no |
 | non\_masquerade\_cidrs | List of strings in CIDR notation that specify the IP address ranges that do not use IP masquerading. | `list(string)` | <pre>[<br> "10.0.0.0/8",<br> "172.16.0.0/12",<br> "192.168.0.0/16"<br>]</pre> | no |

autogen/main/cluster.tf.tmpl

@@ -696,6 +696,10 @@ resource "google_container_node_pool" "windows_pools" {
  local.node_pools_labels["all"],
  local.node_pools_labels[each.value["name"]],
  )
+ resource_labels = merge(
+ local.node_pools_resource_labels["all"],
+ local.node_pools_resource_labels[each.value["name"]],
+ )
  metadata = merge(
  lookup(lookup(local.node_pools_metadata, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
  lookup(lookup(local.node_pools_metadata, "default_values", {}), "node_pool", true) ? { "node_pool" = each.value["name"] } : {},

autogen/main/variables.tf.tmpl

@@ -171,6 +171,16 @@ variable "node_pools_labels" {
  }
 }
 
+variable "node_pools_resource_labels" {
+ type = map(map(string))
+ description = "Map of maps containing resource labels by node-pool name"
+
+ default = {
+ all = {}
+ default-node-pool = {}
+ }
+}
+
 variable "node_pools_metadata" {
  type = map(map(string))
  description = "Map of maps containing node metadata by node-pool name"

autogen/main/variables_defaults.tf.tmpl

@@ -35,6 +35,20 @@ locals {
  var.node_pools_labels
  )
 
+ node_pools_resource_labels = merge(
+ { all = {} },
+ { default-node-pool = {} },
+ zipmap(
+ [for node_pool in var.node_pools : node_pool["name"]],
+ [for node_pool in var.node_pools : {}]
+ ),
+ zipmap(
+ [for node_pool in var.windows_node_pools : node_pool["name"]],
+ [for node_pool in var.windows_node_pools : {}]
+ ),
+ var.node_pools_resource_labels
+ )
+
  node_pools_metadata = merge(
  { all = {} },
  { default-node-pool = {} },

autogen/main/versions.tf.tmpl

@@ -24,7 +24,7 @@ terraform {
  required_providers {
  google-beta = {
  source = "hashicorp/google-beta"
- version = ">= 4.44.0, < 5.0"
+ version = ">= 4.45.0, < 5.0"
  }
  kubernetes = {
  source = "hashicorp/kubernetes"
@@ -38,7 +38,7 @@ terraform {
  required_providers {
  google = {
  source = "hashicorp/google"
- version = ">= 4.44.0, < 5.0"
+ version = ">= 4.45.0, < 5.0"
  }
  kubernetes = {
  source = "hashicorp/kubernetes"

autogen/safer-cluster/main.tf.tmpl

@@ -86,12 +86,13 @@ module "gke" {
  // If removing the default node pool, initial_node_count should be at least 1.
  initial_node_count = (var.initial_node_count == 0) ? 1 : var.initial_node_count
 
- node_pools = var.node_pools
- windows_node_pools = var.windows_node_pools
- node_pools_labels = var.node_pools_labels
- node_pools_metadata = var.node_pools_metadata
- node_pools_taints = var.node_pools_taints
- node_pools_tags = var.node_pools_tags
+ node_pools = var.node_pools
+ windows_node_pools = var.windows_node_pools
+ node_pools_labels = var.node_pools_labels
+ node_pools_resource_labels = var.node_pools_resource_labels
+ node_pools_metadata = var.node_pools_metadata
+ node_pools_taints = var.node_pools_taints
+ node_pools_tags = var.node_pools_tags
 
  node_pools_oauth_scopes = var.node_pools_oauth_scopes
 

autogen/safer-cluster/variables.tf.tmpl

@@ -168,6 +168,16 @@ variable "node_pools_labels" {
  }
 }
 
+variable "node_pools_resource_labels" {
+ type = map(map(string))
+ description = "Map of maps containing resource labels by node-pool name"
+
+ default = {
+ all = {}
+ default-node-pool = {}
+ }
+}
+
 variable "node_pools_metadata" {
  type = map(map(string))
  description = "Map of maps containing node metadata by node-pool name"

cluster.tf

@@ -384,6 +384,10 @@ resource "google_container_node_pool" "pools" {
  local.node_pools_labels["all"],
  local.node_pools_labels[each.value["name"]],
  )
+ resource_labels = merge(
+ local.node_pools_resource_labels["all"],
+ local.node_pools_resource_labels[each.value["name"]],
+ )
  metadata = merge(
  lookup(lookup(local.node_pools_metadata, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
  lookup(lookup(local.node_pools_metadata, "default_values", {}), "node_pool", true) ? { "node_pool" = each.value["name"] } : {},
@@ -538,6 +542,10 @@ resource "google_container_node_pool" "windows_pools" {
  local.node_pools_labels["all"],
  local.node_pools_labels[each.value["name"]],
  )
+ resource_labels = merge(
+ local.node_pools_resource_labels["all"],
+ local.node_pools_resource_labels[each.value["name"]],
+ )
  metadata = merge(
  lookup(lookup(local.node_pools_metadata, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
  lookup(lookup(local.node_pools_metadata, "default_values", {}), "node_pool", true) ? { "node_pool" = each.value["name"] } : {},

modules/beta-autopilot-private-cluster/versions.tf

@@ -21,7 +21,7 @@ terraform {
  required_providers {
  google-beta = {
  source = "hashicorp/google-beta"
- version = ">= 4.44.0, < 5.0"
+ version = ">= 4.45.0, < 5.0"
  }
  kubernetes = {
  source = "hashicorp/kubernetes"

modules/beta-autopilot-public-cluster/versions.tf

@@ -21,7 +21,7 @@ terraform {
  required_providers {
  google-beta = {
  source = "hashicorp/google-beta"
- version = ">= 4.44.0, < 5.0"
+ version = ">= 4.45.0, < 5.0"
  }
  kubernetes = {
  source = "hashicorp/kubernetes"