Skip to content

Commit 48d3d10

Browse files
ItsMattLItsMattL
committed
default threads_per_core to 0
1 parent 36266df commit 48d3d10

File tree

10 files changed

+17
-17
lines changed

10 files changed

+17
-17
lines changed

‎autogen/main/cluster.tf.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1260,7 +1260,7 @@ resource "google_container_node_pool" "windows_pools" {
12601260
dynamic "advanced_machine_features" {
12611261
for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
12621262
content {
1263-
threads_per_core = lookup(each.value, "threads_per_core", null)
1263+
threads_per_core = lookup(each.value, "threads_per_core", 0)
12641264
enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
12651265
performance_monitoring_unit = lookup(each.value, "performance_monitoring_unit", null)
12661266
}

‎cluster.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -961,7 +961,7 @@ resource "google_container_node_pool" "pools" {
961961
dynamic "advanced_machine_features" {
962962
for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
963963
content {
964-
threads_per_core = lookup(each.value, "threads_per_core", null)
964+
threads_per_core = lookup(each.value, "threads_per_core", 0)
965965
enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
966966
performance_monitoring_unit = lookup(each.value, "performance_monitoring_unit", null)
967967
}
@@ -1341,7 +1341,7 @@ resource "google_container_node_pool" "windows_pools" {
13411341
dynamic "advanced_machine_features" {
13421342
for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
13431343
content {
1344-
threads_per_core = lookup(each.value, "threads_per_core", null)
1344+
threads_per_core = lookup(each.value, "threads_per_core", 0)
13451345
enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
13461346
performance_monitoring_unit = lookup(each.value, "performance_monitoring_unit", null)
13471347
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,7 +1111,7 @@ resource "google_container_node_pool" "pools" {
11111111
dynamic "advanced_machine_features" {
11121112
for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
11131113
content {
1114-
threads_per_core = lookup(each.value, "threads_per_core", null)
1114+
threads_per_core = lookup(each.value, "threads_per_core", 0)
11151115
enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
11161116
performance_monitoring_unit = lookup(each.value, "performance_monitoring_unit", null)
11171117
}
@@ -1505,7 +1505,7 @@ resource "google_container_node_pool" "windows_pools" {
15051505
dynamic "advanced_machine_features" {
15061506
for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
15071507
content {
1508-
threads_per_core = lookup(each.value, "threads_per_core", null)
1508+
threads_per_core = lookup(each.value, "threads_per_core", 0)
15091509
enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
15101510
performance_monitoring_unit = lookup(each.value, "performance_monitoring_unit", null)
15111511
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,7 +1025,7 @@ resource "google_container_node_pool" "pools" {
10251025
dynamic "advanced_machine_features" {
10261026
for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
10271027
content {
1028-
threads_per_core = lookup(each.value, "threads_per_core", null)
1028+
threads_per_core = lookup(each.value, "threads_per_core", 0)
10291029
enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
10301030
performance_monitoring_unit = lookup(each.value, "performance_monitoring_unit", null)
10311031
}
@@ -1418,7 +1418,7 @@ resource "google_container_node_pool" "windows_pools" {
14181418
dynamic "advanced_machine_features" {
14191419
for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
14201420
content {
1421-
threads_per_core = lookup(each.value, "threads_per_core", null)
1421+
threads_per_core = lookup(each.value, "threads_per_core", 0)
14221422
enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
14231423
performance_monitoring_unit = lookup(each.value, "performance_monitoring_unit", null)
14241424
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,7 +1089,7 @@ resource "google_container_node_pool" "pools" {
10891089
dynamic "advanced_machine_features" {
10901090
for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
10911091
content {
1092-
threads_per_core = lookup(each.value, "threads_per_core", null)
1092+
threads_per_core = lookup(each.value, "threads_per_core", 0)
10931093
enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
10941094
performance_monitoring_unit = lookup(each.value, "performance_monitoring_unit", null)
10951095
}
@@ -1483,7 +1483,7 @@ resource "google_container_node_pool" "windows_pools" {
14831483
dynamic "advanced_machine_features" {
14841484
for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
14851485
content {
1486-
threads_per_core = lookup(each.value, "threads_per_core", null)
1486+
threads_per_core = lookup(each.value, "threads_per_core", 0)
14871487
enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
14881488
performance_monitoring_unit = lookup(each.value, "performance_monitoring_unit", null)
14891489
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,7 +1003,7 @@ resource "google_container_node_pool" "pools" {
10031003
dynamic "advanced_machine_features" {
10041004
for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
10051005
content {
1006-
threads_per_core = lookup(each.value, "threads_per_core", null)
1006+
threads_per_core = lookup(each.value, "threads_per_core", 0)
10071007
enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
10081008
performance_monitoring_unit = lookup(each.value, "performance_monitoring_unit", null)
10091009
}
@@ -1396,7 +1396,7 @@ resource "google_container_node_pool" "windows_pools" {
13961396
dynamic "advanced_machine_features" {
13971397
for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
13981398
content {
1399-
threads_per_core = lookup(each.value, "threads_per_core", null)
1399+
threads_per_core = lookup(each.value, "threads_per_core", 0)
14001400
enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
14011401
performance_monitoring_unit = lookup(each.value, "performance_monitoring_unit", null)
14021402
}

‎modules/gke-autopilot-cluster/metadata.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,9 +573,9 @@ spec:
573573
roles:
574574
- level: Project
575575
roles:
576-
- roles/iam.serviceAccountUser
577576
- roles/compute.admin
578577
- roles/container.admin
578+
- roles/iam.serviceAccountUser
579579
services:
580580
- compute.googleapis.com
581581
- container.googleapis.com

‎modules/gke-standard-cluster/metadata.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1123,9 +1123,9 @@ spec:
11231123
roles:
11241124
- level: Project
11251125
roles:
1126+
- roles/compute.admin
11261127
- roles/container.admin
11271128
- roles/iam.serviceAccountUser
1128-
- roles/compute.admin
11291129
services:
11301130
- compute.googleapis.com
11311131
- container.googleapis.com

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,7 +1068,7 @@ resource "google_container_node_pool" "pools" {
10681068
dynamic "advanced_machine_features" {
10691069
for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
10701070
content {
1071-
threads_per_core = lookup(each.value, "threads_per_core", null)
1071+
threads_per_core = lookup(each.value, "threads_per_core", 0)
10721072
enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
10731073
performance_monitoring_unit = lookup(each.value, "performance_monitoring_unit", null)
10741074
}
@@ -1449,7 +1449,7 @@ resource "google_container_node_pool" "windows_pools" {
14491449
dynamic "advanced_machine_features" {
14501450
for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
14511451
content {
1452-
threads_per_core = lookup(each.value, "threads_per_core", null)
1452+
threads_per_core = lookup(each.value, "threads_per_core", 0)
14531453
enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
14541454
performance_monitoring_unit = lookup(each.value, "performance_monitoring_unit", null)
14551455
}

‎modules/private-cluster/cluster.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -983,7 +983,7 @@ resource "google_container_node_pool" "pools" {
983983
dynamic "advanced_machine_features" {
984984
for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
985985
content {
986-
threads_per_core = lookup(each.value, "threads_per_core", null)
986+
threads_per_core = lookup(each.value, "threads_per_core", 0)
987987
enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
988988
performance_monitoring_unit = lookup(each.value, "performance_monitoring_unit", null)
989989
}
@@ -1363,7 +1363,7 @@ resource "google_container_node_pool" "windows_pools" {
13631363
dynamic "advanced_machine_features" {
13641364
for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
13651365
content {
1366-
threads_per_core = lookup(each.value, "threads_per_core", null)
1366+
threads_per_core = lookup(each.value, "threads_per_core", 0)
13671367
enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
13681368
performance_monitoring_unit = lookup(each.value, "performance_monitoring_unit", null)
13691369
}

0 commit comments

Comments
 (0)