Skip to content

Commit bf9609a

Browse files
ericyzericyz
committed
Merge branch 'master' into HEAD
2 parents 5f5f36c + e7566c5 commit bf9609a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+327
-34
lines changed

‎.github/renovate.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,24 @@
1515
],
1616
"stabilityDays":0
1717
},
18+
"separateMajorMinor":false,
1819
"packageRules": [
1920
{
2021
"matchPaths": ["examples/**", "test/**", ".github/**"],
2122
"extends": [":semanticCommitTypeAll(chore)"]
2223
},
24+
{
25+
"matchPaths": ["*", "modules/**"],
26+
"extends": [":semanticCommitTypeAll(fix)"]
27+
},
2328
{
2429
"matchDepTypes": ["module"],
25-
"groupName": "TF modules",
26-
"separateMajorMinor":false,
27-
"major": {
28-
"semanticCommitType": "feat!"
29-
}
30+
"groupName": "TF modules"
3031
},
3132
{
3233
"matchDepTypes": ["require"],
3334
"groupName": "GO modules",
34-
"postUpdateOptions": ["gomodTidy"],
35-
"separateMajorMinor":false
35+
"postUpdateOptions": ["gomodTidy"]
3636
},
3737
{
3838
"matchPackageNames": ["go"],
@@ -41,8 +41,7 @@
4141
},
4242
{
4343
"matchPackageNames": ["google", "google-beta"],
44-
"groupName": "terraform googles",
45-
"separateMajorMinor": false
44+
"groupName": "terraform googles"
4645
}
4746
]
4847
}

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ Then perform the following commands on the root folder:
185185
| 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 |
186186
| 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 |
187187
| 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 |
188+
| 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 |
188189
| 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 |
189190
| 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 |
190191
| 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
@@ -705,6 +705,10 @@ resource "google_container_node_pool" "windows_pools" {
705705
local.node_pools_labels["all"],
706706
local.node_pools_labels[each.value["name"]],
707707
)
708+
resource_labels = merge(
709+
local.node_pools_resource_labels["all"],
710+
local.node_pools_resource_labels[each.value["name"]],
711+
)
708712
metadata = merge(
709713
lookup(lookup(local.node_pools_metadata, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
710714
lookup(lookup(local.node_pools_metadata, "default_values", {}), "node_pool", true) ? { "node_pool" = each.value["name"] } : {},

‎autogen/main/variables.tf.tmpl

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,16 @@ variable "node_pools_labels" {
171171
}
172172
}
173173

174+
variable "node_pools_resource_labels" {
175+
type = map(map(string))
176+
description = "Map of maps containing resource labels by node-pool name"
177+
178+
default = {
179+
all = {}
180+
default-node-pool = {}
181+
}
182+
}
183+
174184
variable "node_pools_metadata" {
175185
type = map(map(string))
176186
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
@@ -35,6 +35,20 @@ locals {
3535
var.node_pools_labels
3636
)
3737

38+
node_pools_resource_labels = merge(
39+
{ all = {} },
40+
{ default-node-pool = {} },
41+
zipmap(
42+
[for node_pool in var.node_pools : node_pool["name"]],
43+
[for node_pool in var.node_pools : {}]
44+
),
45+
zipmap(
46+
[for node_pool in var.windows_node_pools : node_pool["name"]],
47+
[for node_pool in var.windows_node_pools : {}]
48+
),
49+
var.node_pools_resource_labels
50+
)
51+
3852
node_pools_metadata = merge(
3953
{ all = {} },
4054
{ default-node-pool = {} },

‎autogen/main/versions.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ terraform {
2424
required_providers {
2525
google-beta = {
2626
source = "hashicorp/google-beta"
27-
version = ">= 4.44.0, < 5.0"
27+
version = ">= 4.45.0, < 5.0"
2828
}
2929
kubernetes = {
3030
source = "hashicorp/kubernetes"

‎autogen/safer-cluster/main.tf.tmpl

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,13 @@ module "gke" {
8686
// If removing the default node pool, initial_node_count should be at least 1.
8787
initial_node_count = (var.initial_node_count == 0) ? 1 : var.initial_node_count
8888

89-
node_pools = var.node_pools
90-
windows_node_pools = var.windows_node_pools
91-
node_pools_labels = var.node_pools_labels
92-
node_pools_metadata = var.node_pools_metadata
93-
node_pools_taints = var.node_pools_taints
94-
node_pools_tags = var.node_pools_tags
89+
node_pools = var.node_pools
90+
windows_node_pools = var.windows_node_pools
91+
node_pools_labels = var.node_pools_labels
92+
node_pools_resource_labels = var.node_pools_resource_labels
93+
node_pools_metadata = var.node_pools_metadata
94+
node_pools_taints = var.node_pools_taints
95+
node_pools_tags = var.node_pools_tags
9596

9697
node_pools_oauth_scopes = var.node_pools_oauth_scopes
9798

‎autogen/safer-cluster/variables.tf.tmpl

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,16 @@ variable "node_pools_labels" {
168168
}
169169
}
170170

171+
variable "node_pools_resource_labels" {
172+
type = map(map(string))
173+
description = "Map of maps containing resource labels by node-pool name"
174+
175+
default = {
176+
all = {}
177+
default-node-pool = {}
178+
}
179+
}
180+
171181
variable "node_pools_metadata" {
172182
type = map(map(string))
173183
description = "Map of maps containing node metadata by node-pool name"

‎cluster.tf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,10 @@ resource "google_container_node_pool" "pools" {
393393
local.node_pools_labels["all"],
394394
local.node_pools_labels[each.value["name"]],
395395
)
396+
resource_labels = merge(
397+
local.node_pools_resource_labels["all"],
398+
local.node_pools_resource_labels[each.value["name"]],
399+
)
396400
metadata = merge(
397401
lookup(lookup(local.node_pools_metadata, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
398402
lookup(lookup(local.node_pools_metadata, "default_values", {}), "node_pool", true) ? { "node_pool" = each.value["name"] } : {},
@@ -547,6 +551,10 @@ resource "google_container_node_pool" "windows_pools" {
547551
local.node_pools_labels["all"],
548552
local.node_pools_labels[each.value["name"]],
549553
)
554+
resource_labels = merge(
555+
local.node_pools_resource_labels["all"],
556+
local.node_pools_resource_labels[each.value["name"]],
557+
)
550558
metadata = merge(
551559
lookup(lookup(local.node_pools_metadata, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
552560
lookup(lookup(local.node_pools_metadata, "default_values", {}), "node_pool", true) ? { "node_pool" = each.value["name"] } : {},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ terraform {
2121
required_providers {
2222
google-beta = {
2323
source = "hashicorp/google-beta"
24-
version = ">= 4.44.0, < 5.0"
24+
version = ">= 4.45.0, < 5.0"
2525
}
2626
kubernetes = {
2727
source = "hashicorp/kubernetes"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ terraform {
2121
required_providers {
2222
google-beta = {
2323
source = "hashicorp/google-beta"
24-
version = ">= 4.44.0, < 5.0"
24+
version = ">= 4.45.0, < 5.0"
2525
}
2626
kubernetes = {
2727
source = "hashicorp/kubernetes"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ Then perform the following commands on the root folder:
241241
| node\_pools\_linux\_node\_configs\_sysctls | Map of maps containing linux node config sysctls by node-pool name | `map(map(string))` | <pre>{<br> "all": {},<br> "default-node-pool": {}<br>}</pre> | no |
242242
| 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 |
243243
| 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 |
244+
| 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 |
244245
| 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 |
245246
| 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 |
246247
| 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
@@ -613,6 +613,10 @@ resource "google_container_node_pool" "pools" {
613613
local.node_pools_labels["all"],
614614
local.node_pools_labels[each.value["name"]],
615615
)
616+
resource_labels = merge(
617+
local.node_pools_resource_labels["all"],
618+
local.node_pools_resource_labels[each.value["name"]],
619+
)
616620
metadata = merge(
617621
lookup(lookup(local.node_pools_metadata, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
618622
lookup(lookup(local.node_pools_metadata, "default_values", {}), "node_pool", true) ? { "node_pool" = each.value["name"] } : {},
@@ -820,6 +824,10 @@ resource "google_container_node_pool" "windows_pools" {
820824
local.node_pools_labels["all"],
821825
local.node_pools_labels[each.value["name"]],
822826
)
827+
resource_labels = merge(
828+
local.node_pools_resource_labels["all"],
829+
local.node_pools_resource_labels[each.value["name"]],
830+
)
823831
metadata = merge(
824832
lookup(lookup(local.node_pools_metadata, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
825833
lookup(lookup(local.node_pools_metadata, "default_values", {}), "node_pool", true) ? { "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
@@ -170,6 +170,16 @@ variable "node_pools_labels" {
170170
}
171171
}
172172

173+
variable "node_pools_resource_labels" {
174+
type = map(map(string))
175+
description = "Map of maps containing resource labels by node-pool name"
176+
177+
default = {
178+
all = {}
179+
default-node-pool = {}
180+
}
181+
}
182+
173183
variable "node_pools_metadata" {
174184
type = map(map(string))
175185
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
@@ -34,6 +34,20 @@ locals {
3434
var.node_pools_labels
3535
)
3636

37+
node_pools_resource_labels = merge(
38+
{ all = {} },
39+
{ default-node-pool = {} },
40+
zipmap(
41+
[for node_pool in var.node_pools : node_pool["name"]],
42+
[for node_pool in var.node_pools : {}]
43+
),
44+
zipmap(
45+
[for node_pool in var.windows_node_pools : node_pool["name"]],
46+
[for node_pool in var.windows_node_pools : {}]
47+
),
48+
var.node_pools_resource_labels
49+
)
50+
3751
node_pools_metadata = merge(
3852
{ all = {} },
3953
{ default-node-pool = {} },

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ terraform {
2121
required_providers {
2222
google-beta = {
2323
source = "hashicorp/google-beta"
24-
version = ">= 4.44.0, < 5.0"
24+
version = ">= 4.45.0, < 5.0"
2525
}
2626
kubernetes = {
2727
source = "hashicorp/kubernetes"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ Then perform the following commands on the root folder:
219219
| node\_pools\_linux\_node\_configs\_sysctls | Map of maps containing linux node config sysctls by node-pool name | `map(map(string))` | <pre>{<br> "all": {},<br> "default-node-pool": {}<br>}</pre> | no |
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 |
222+
| 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 |
222223
| 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 |
223224
| 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 |
224225
| 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/cluster.tf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,10 @@ resource "google_container_node_pool" "pools" {
519519
local.node_pools_labels["all"],
520520
local.node_pools_labels[each.value["name"]],
521521
)
522+
resource_labels = merge(
523+
local.node_pools_resource_labels["all"],
524+
local.node_pools_resource_labels[each.value["name"]],
525+
)
522526
metadata = merge(
523527
lookup(lookup(local.node_pools_metadata, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
524528
lookup(lookup(local.node_pools_metadata, "default_values", {}), "node_pool", true) ? { "node_pool" = each.value["name"] } : {},
@@ -725,6 +729,10 @@ resource "google_container_node_pool" "windows_pools" {
725729
local.node_pools_labels["all"],
726730
local.node_pools_labels[each.value["name"]],
727731
)
732+
resource_labels = merge(
733+
local.node_pools_resource_labels["all"],
734+
local.node_pools_resource_labels[each.value["name"]],
735+
)
728736
metadata = merge(
729737
lookup(lookup(local.node_pools_metadata, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
730738
lookup(lookup(local.node_pools_metadata, "default_values", {}), "node_pool", true) ? { "node_pool" = each.value["name"] } : {},

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,16 @@ variable "node_pools_labels" {
170170
}
171171
}
172172

173+
variable "node_pools_resource_labels" {
174+
type = map(map(string))
175+
description = "Map of maps containing resource labels by node-pool name"
176+
177+
default = {
178+
all = {}
179+
default-node-pool = {}
180+
}
181+
}
182+
173183
variable "node_pools_metadata" {
174184
type = map(map(string))
175185
description = "Map of maps containing node metadata by node-pool name"

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,20 @@ locals {
3434
var.node_pools_labels
3535
)
3636

37+
node_pools_resource_labels = merge(
38+
{ all = {} },
39+
{ default-node-pool = {} },
40+
zipmap(
41+
[for node_pool in var.node_pools : node_pool["name"]],
42+
[for node_pool in var.node_pools : {}]
43+
),
44+
zipmap(
45+
[for node_pool in var.windows_node_pools : node_pool["name"]],
46+
[for node_pool in var.windows_node_pools : {}]
47+
),
48+
var.node_pools_resource_labels
49+
)
50+
3751
node_pools_metadata = merge(
3852
{ all = {} },
3953
{ default-node-pool = {} },

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ terraform {
2121
required_providers {
2222
google-beta = {
2323
source = "hashicorp/google-beta"
24-
version = ">= 4.44.0, < 5.0"
24+
version = ">= 4.45.0, < 5.0"
2525
}
2626
kubernetes = {
2727
source = "hashicorp/kubernetes"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ Then perform the following commands on the root folder:
230230
| node\_pools\_linux\_node\_configs\_sysctls | Map of maps containing linux node config sysctls by node-pool name | `map(map(string))` | <pre>{<br> "all": {},<br> "default-node-pool": {}<br>}</pre> | no |
231231
| 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 |
232232
| 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 |
233+
| 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 |
233234
| 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 |
234235
| 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 |
235236
| 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-public-cluster-update-variant/cluster.tf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,10 @@ resource "google_container_node_pool" "pools" {
594594
local.node_pools_labels["all"],
595595
local.node_pools_labels[each.value["name"]],
596596
)
597+
resource_labels = merge(
598+
local.node_pools_resource_labels["all"],
599+
local.node_pools_resource_labels[each.value["name"]],
600+
)
597601
metadata = merge(
598602
lookup(lookup(local.node_pools_metadata, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
599603
lookup(lookup(local.node_pools_metadata, "default_values", {}), "node_pool", true) ? { "node_pool" = each.value["name"] } : {},
@@ -801,6 +805,10 @@ resource "google_container_node_pool" "windows_pools" {
801805
local.node_pools_labels["all"],
802806
local.node_pools_labels[each.value["name"]],
803807
)
808+
resource_labels = merge(
809+
local.node_pools_resource_labels["all"],
810+
local.node_pools_resource_labels[each.value["name"]],
811+
)
804812
metadata = merge(
805813
lookup(lookup(local.node_pools_metadata, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
806814
lookup(lookup(local.node_pools_metadata, "default_values", {}), "node_pool", true) ? { "node_pool" = each.value["name"] } : {},

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,16 @@ variable "node_pools_labels" {
170170
}
171171
}
172172

173+
variable "node_pools_resource_labels" {
174+
type = map(map(string))
175+
description = "Map of maps containing resource labels by node-pool name"
176+
177+
default = {
178+
all = {}
179+
default-node-pool = {}
180+
}
181+
}
182+
173183
variable "node_pools_metadata" {
174184
type = map(map(string))
175185
description = "Map of maps containing node metadata by node-pool name"

0 commit comments

Comments
 (0)