Skip to content

Commit 84baaf6

Browse files
DrFaust92apeabody
DrFaust92
and
apeabody
authored
feate: add resource_manager_tags (#2022)
Co-authored-by: Andrew Peabody <[email protected]>
1 parent e298e74 commit 84baaf6

File tree

31 files changed

+259
-0
lines changed

31 files changed

+259
-0
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ Then perform the following commands on the root folder:
220220
| 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 |
221221
| 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 |
222222
| 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 |
223+
| node\_pools\_resource\_manager\_tags | Map of maps containing resource manager tags by node-pool name | `map(map(string))` | <pre>{<br> "all": {},<br> "default-node-pool": {}<br>}</pre> | no |
223224
| 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 |
224225
| 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 |
225226
| 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‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -890,6 +890,10 @@ resource "google_container_node_pool" "windows_pools" {
890890
local.node_pools_resource_labels["all"],
891891
local.node_pools_resource_labels[each.value["name"]],
892892
)
893+
resource_manager_tags = merge(
894+
local.node_pools_resource_manager_tags["all"],
895+
local.node_pools_resource_manager_tags[each.value["name"]],
896+
)
893897
metadata = merge(
894898
lookup(lookup(local.node_pools_metadata, "default_values", {}), "cluster_name", var.enable_default_node_pools_metadata) ? { "cluster_name" = var.name } : {},
895899
lookup(lookup(local.node_pools_metadata, "default_values", {}), "node_pool", var.enable_default_node_pools_metadata) ? { "node_pool" = each.value["name"] } : {},

‎autogen/main/variables.tf.tmpl‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,16 @@ variable "node_pools_resource_labels" {
195195
}
196196
}
197197

198+
variable "node_pools_resource_manager_tags" {
199+
type = map(map(string))
200+
description = "Map of maps containing resource manager tags by node-pool name"
201+
202+
default = {
203+
all = {}
204+
default-node-pool = {}
205+
}
206+
}
207+
198208
variable "node_pools_metadata" {
199209
type = map(map(string))
200210
description = "Map of maps containing node metadata by node-pool name"

‎autogen/main/variables_defaults.tf.tmpl‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,20 @@ locals {
4949
var.node_pools_resource_labels
5050
)
5151

52+
node_pools_resource_manager_tags = merge(
53+
{ all = {} },
54+
{ default-node-pool = {} },
55+
zipmap(
56+
[for node_pool in var.node_pools : node_pool["name"]],
57+
[for node_pool in var.node_pools : {}]
58+
),
59+
zipmap(
60+
[for node_pool in var.windows_node_pools : node_pool["name"]],
61+
[for node_pool in var.windows_node_pools : {}]
62+
),
63+
var.node_pools_resource_manager_tags
64+
)
65+
5266
node_pools_metadata = merge(
5367
{ all = {} },
5468
{ default-node-pool = {} },

‎cluster.tf‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -603,6 +603,10 @@ resource "google_container_node_pool" "pools" {
603603
local.node_pools_resource_labels["all"],
604604
local.node_pools_resource_labels[each.value["name"]],
605605
)
606+
resource_manager_tags = merge(
607+
local.node_pools_resource_manager_tags["all"],
608+
local.node_pools_resource_manager_tags[each.value["name"]],
609+
)
606610
metadata = merge(
607611
lookup(lookup(local.node_pools_metadata, "default_values", {}), "cluster_name", var.enable_default_node_pools_metadata) ? { "cluster_name" = var.name } : {},
608612
lookup(lookup(local.node_pools_metadata, "default_values", {}), "node_pool", var.enable_default_node_pools_metadata) ? { "node_pool" = each.value["name"] } : {},
@@ -877,6 +881,10 @@ resource "google_container_node_pool" "windows_pools" {
877881
local.node_pools_resource_labels["all"],
878882
local.node_pools_resource_labels[each.value["name"]],
879883
)
884+
resource_manager_tags = merge(
885+
local.node_pools_resource_manager_tags["all"],
886+
local.node_pools_resource_manager_tags[each.value["name"]],
887+
)
880888
metadata = merge(
881889
lookup(lookup(local.node_pools_metadata, "default_values", {}), "cluster_name", var.enable_default_node_pools_metadata) ? { "cluster_name" = var.name } : {},
882890
lookup(lookup(local.node_pools_metadata, "default_values", {}), "node_pool", var.enable_default_node_pools_metadata) ? { "node_pool" = each.value["name"] } : {},

‎modules/beta-private-cluster-update-variant/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ Then perform the following commands on the root folder:
268268
| 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 |
269269
| 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 |
270270
| 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 |
271+
| node\_pools\_resource\_manager\_tags | Map of maps containing resource manager tags by node-pool name | `map(map(string))` | <pre>{<br> "all": {},<br> "default-node-pool": {}<br>}</pre> | no |
271272
| 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 |
272273
| 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 |
273274
| 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 |

‎modules/beta-private-cluster-update-variant/cluster.tf‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -768,6 +768,10 @@ resource "google_container_node_pool" "pools" {
768768
local.node_pools_resource_labels["all"],
769769
local.node_pools_resource_labels[each.value["name"]],
770770
)
771+
resource_manager_tags = merge(
772+
local.node_pools_resource_manager_tags["all"],
773+
local.node_pools_resource_manager_tags[each.value["name"]],
774+
)
771775
metadata = merge(
772776
lookup(lookup(local.node_pools_metadata, "default_values", {}), "cluster_name", var.enable_default_node_pools_metadata) ? { "cluster_name" = var.name } : {},
773777
lookup(lookup(local.node_pools_metadata, "default_values", {}), "node_pool", var.enable_default_node_pools_metadata) ? { "node_pool" = each.value["name"] } : {},
@@ -1056,6 +1060,10 @@ resource "google_container_node_pool" "windows_pools" {
10561060
local.node_pools_resource_labels["all"],
10571061
local.node_pools_resource_labels[each.value["name"]],
10581062
)
1063+
resource_manager_tags = merge(
1064+
local.node_pools_resource_manager_tags["all"],
1065+
local.node_pools_resource_manager_tags[each.value["name"]],
1066+
)
10591067
metadata = merge(
10601068
lookup(lookup(local.node_pools_metadata, "default_values", {}), "cluster_name", var.enable_default_node_pools_metadata) ? { "cluster_name" = var.name } : {},
10611069
lookup(lookup(local.node_pools_metadata, "default_values", {}), "node_pool", var.enable_default_node_pools_metadata) ? { "node_pool" = each.value["name"] } : {},

‎modules/beta-private-cluster-update-variant/variables.tf‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,16 @@ variable "node_pools_resource_labels" {
192192
}
193193
}
194194

195+
variable "node_pools_resource_manager_tags" {
196+
type = map(map(string))
197+
description = "Map of maps containing resource manager tags by node-pool name"
198+
199+
default = {
200+
all = {}
201+
default-node-pool = {}
202+
}
203+
}
204+
195205
variable "node_pools_metadata" {
196206
type = map(map(string))
197207
description = "Map of maps containing node metadata by node-pool name"

‎modules/beta-private-cluster-update-variant/variables_defaults.tf‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,20 @@ locals {
4848
var.node_pools_resource_labels
4949
)
5050

51+
node_pools_resource_manager_tags = merge(
52+
{ all = {} },
53+
{ default-node-pool = {} },
54+
zipmap(
55+
[for node_pool in var.node_pools : node_pool["name"]],
56+
[for node_pool in var.node_pools : {}]
57+
),
58+
zipmap(
59+
[for node_pool in var.windows_node_pools : node_pool["name"]],
60+
[for node_pool in var.windows_node_pools : {}]
61+
),
62+
var.node_pools_resource_manager_tags
63+
)
64+
5165
node_pools_metadata = merge(
5266
{ all = {} },
5367
{ default-node-pool = {} },

‎modules/beta-private-cluster/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ Then perform the following commands on the root folder:
246246
| 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 |
247247
| 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 |
248248
| 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 |
249+
| node\_pools\_resource\_manager\_tags | Map of maps containing resource manager tags by node-pool name | `map(map(string))` | <pre>{<br> "all": {},<br> "default-node-pool": {}<br>}</pre> | no |
249250
| 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 |
250251
| 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 |
251252
| 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 |

0 commit comments

Comments
 (0)