Skip to content

Commit e1bb643

Browse files
wyardleywyardley
authored
Merge branch 'master' into wyardley/chore/kitchen_doctor
2 parents 089a8e7 + 620bf32 commit e1bb643

File tree

12 files changed

+22
-23
lines changed

12 files changed

+22
-23
lines changed

‎autogen/main/cluster.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,7 @@ resource "google_container_node_pool" "windows_pools" {
887887
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
888888
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
889889
dynamic "gcfs_config" {
890-
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
890+
for_each = lookup(each.value, "enable_gcfs", null ) !=null ? [each.value.enable_gcfs] : []
891891
content {
892892
enabled = gcfs_config.value
893893
}

‎autogen/main/versions.tf.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ terraform {
4747
google = {
4848
source = "hashicorp/google"
4949
# Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428
50-
version = ">= 5.40.0, != 5.44.0, < 6.2.0, < 7"
50+
version = ">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7"
5151
}
5252
google-beta = {
5353
source = "hashicorp/google-beta"
5454
# Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428
55-
version = ">= 5.40.0, != 5.44.0, < 6.2.0, < 7"
55+
version = ">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7"
5656
}
5757
kubernetes = {
5858
source = "hashicorp/kubernetes"
@@ -71,7 +71,7 @@ terraform {
7171
google = {
7272
source = "hashicorp/google"
7373
# Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428
74-
version = ">= 5.40.0, != 5.44.0, < 6.2.0, < 7"
74+
version = ">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7"
7575
}
7676
kubernetes = {
7777
source = "hashicorp/kubernetes"

‎cluster.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ resource "google_container_node_pool" "pools" {
593593
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
594594
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
595595
dynamic "gcfs_config" {
596-
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
596+
for_each = lookup(each.value, "enable_gcfs", null) != null ? [each.value.enable_gcfs] : []
597597
content {
598598
enabled = gcfs_config.value
599599
}
@@ -875,7 +875,7 @@ resource "google_container_node_pool" "windows_pools" {
875875
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
876876
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
877877
dynamic "gcfs_config" {
878-
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
878+
for_each = lookup(each.value, "enable_gcfs", null) != null ? [each.value.enable_gcfs] : []
879879
content {
880880
enabled = gcfs_config.value
881881
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ terraform {
2222
google = {
2323
source = "hashicorp/google"
2424
# Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428
25-
version = ">= 5.40.0, != 5.44.0, < 6.2.0, < 7"
25+
version = ">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7"
2626
}
2727
google-beta = {
2828
source = "hashicorp/google-beta"
2929
# Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428
30-
version = ">= 5.40.0, != 5.44.0, < 6.2.0, < 7"
30+
version = ">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7"
3131
}
3232
kubernetes = {
3333
source = "hashicorp/kubernetes"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ terraform {
2222
google = {
2323
source = "hashicorp/google"
2424
# Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428
25-
version = ">= 5.40.0, != 5.44.0, < 6.2.0, < 7"
25+
version = ">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7"
2626
}
2727
google-beta = {
2828
source = "hashicorp/google-beta"
2929
# Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428
30-
version = ">= 5.40.0, != 5.44.0, < 6.2.0, < 7"
30+
version = ">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7"
3131
}
3232
kubernetes = {
3333
source = "hashicorp/kubernetes"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,7 @@ resource "google_container_node_pool" "pools" {
760760
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
761761
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
762762
dynamic "gcfs_config" {
763-
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
763+
for_each = lookup(each.value, "enable_gcfs", null) != null ? [each.value.enable_gcfs] : []
764764
content {
765765
enabled = gcfs_config.value
766766
}
@@ -1056,7 +1056,7 @@ resource "google_container_node_pool" "windows_pools" {
10561056
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
10571057
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
10581058
dynamic "gcfs_config" {
1059-
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
1059+
for_each = lookup(each.value, "enable_gcfs", null) != null ? [each.value.enable_gcfs] : []
10601060
content {
10611061
enabled = gcfs_config.value
10621062
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ resource "google_container_node_pool" "pools" {
678678
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
679679
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
680680
dynamic "gcfs_config" {
681-
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
681+
for_each = lookup(each.value, "enable_gcfs", null) != null ? [each.value.enable_gcfs] : []
682682
content {
683683
enabled = gcfs_config.value
684684
}
@@ -973,7 +973,7 @@ resource "google_container_node_pool" "windows_pools" {
973973
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
974974
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
975975
dynamic "gcfs_config" {
976-
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
976+
for_each = lookup(each.value, "enable_gcfs", null) != null ? [each.value.enable_gcfs] : []
977977
content {
978978
enabled = gcfs_config.value
979979
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -739,7 +739,7 @@ resource "google_container_node_pool" "pools" {
739739
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
740740
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
741741
dynamic "gcfs_config" {
742-
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
742+
for_each = lookup(each.value, "enable_gcfs", null) != null ? [each.value.enable_gcfs] : []
743743
content {
744744
enabled = gcfs_config.value
745745
}
@@ -1035,7 +1035,7 @@ resource "google_container_node_pool" "windows_pools" {
10351035
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
10361036
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
10371037
dynamic "gcfs_config" {
1038-
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
1038+
for_each = lookup(each.value, "enable_gcfs", null) != null ? [each.value.enable_gcfs] : []
10391039
content {
10401040
enabled = gcfs_config.value
10411041
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ resource "google_container_node_pool" "pools" {
657657
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
658658
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
659659
dynamic "gcfs_config" {
660-
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
660+
for_each = lookup(each.value, "enable_gcfs", null) != null ? [each.value.enable_gcfs] : []
661661
content {
662662
enabled = gcfs_config.value
663663
}
@@ -952,7 +952,7 @@ resource "google_container_node_pool" "windows_pools" {
952952
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
953953
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
954954
dynamic "gcfs_config" {
955-
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
955+
for_each = lookup(each.value, "enable_gcfs", null) != null ? [each.value.enable_gcfs] : []
956956
content {
957957
enabled = gcfs_config.value
958958
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ resource "google_container_node_pool" "pools" {
696696
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
697697
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
698698
dynamic "gcfs_config" {
699-
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
699+
for_each = lookup(each.value, "enable_gcfs", null) != null ? [each.value.enable_gcfs] : []
700700
content {
701701
enabled = gcfs_config.value
702702
}
@@ -979,7 +979,7 @@ resource "google_container_node_pool" "windows_pools" {
979979
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
980980
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
981981
dynamic "gcfs_config" {
982-
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
982+
for_each = lookup(each.value, "enable_gcfs", null) != null ? [each.value.enable_gcfs] : []
983983
content {
984984
enabled = gcfs_config.value
985985
}

‎modules/private-cluster/cluster.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ resource "google_container_node_pool" "pools" {
614614
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
615615
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
616616
dynamic "gcfs_config" {
617-
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
617+
for_each = lookup(each.value, "enable_gcfs", null) != null ? [each.value.enable_gcfs] : []
618618
content {
619619
enabled = gcfs_config.value
620620
}
@@ -896,7 +896,7 @@ resource "google_container_node_pool" "windows_pools" {
896896
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
897897
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
898898
dynamic "gcfs_config" {
899-
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
899+
for_each = lookup(each.value, "enable_gcfs", null) != null ? [each.value.enable_gcfs] : []
900900
content {
901901
enabled = gcfs_config.value
902902
}

‎test/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,6 @@
210210
"config": {
211211
"diskSizeGb": 100,
212212
"diskType": "pd-standard",
213-
"gcfsConfig": {},
214213
"imageType": "COS_CONTAINERD",
215214
"labels": {
216215
"cluster_name": "CLUSTER_NAME",

0 commit comments

Comments
 (0)