Skip to content

Commit d49c3bf

Browse files
apeabodyapeabody
authored
fix: network_config with just enable_private_nodes (#2292)
1 parent e43ae9e commit d49c3bf

File tree

11 files changed

+18
-15
lines changed

11 files changed

+18
-15
lines changed

‎autogen/main/cluster.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -876,7 +876,7 @@ resource "google_container_node_pool" "windows_pools" {
876876
}
877877

878878
dynamic "network_config" {
879-
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
879+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || {% if private_cluster %}var.enable_private_nodes != null{% else %}lookup(each.value, "enable_private_nodes", null) != null{% endif %} ? [each.value] : []
880880
content {
881881
pod_range = lookup(network_config.value, "pod_range", null)
882882
{% if private_cluster %}

‎cluster.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ resource "google_container_node_pool" "pools" {
595595
}
596596

597597
dynamic "network_config" {
598-
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
598+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
599599
content {
600600
pod_range = lookup(network_config.value, "pod_range", null)
601601
enable_private_nodes = lookup(network_config.value, "enable_private_nodes", null)
@@ -896,7 +896,7 @@ resource "google_container_node_pool" "windows_pools" {
896896
}
897897

898898
dynamic "network_config" {
899-
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
899+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
900900
content {
901901
pod_range = lookup(network_config.value, "pod_range", null)
902902
enable_private_nodes = lookup(network_config.value, "enable_private_nodes", null)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@ resource "google_container_node_pool" "pools" {
752752
}
753753

754754
dynamic "network_config" {
755-
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
755+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || var.enable_private_nodes != null ? [each.value] : []
756756
content {
757757
pod_range = lookup(network_config.value, "pod_range", null)
758758
enable_private_nodes = var.enable_private_nodes
@@ -1067,7 +1067,7 @@ resource "google_container_node_pool" "windows_pools" {
10671067
}
10681068

10691069
dynamic "network_config" {
1070-
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
1070+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || var.enable_private_nodes != null ? [each.value] : []
10711071
content {
10721072
pod_range = lookup(network_config.value, "pod_range", null)
10731073
enable_private_nodes = var.enable_private_nodes

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@ resource "google_container_node_pool" "pools" {
671671
}
672672

673673
dynamic "network_config" {
674-
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
674+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || var.enable_private_nodes != null ? [each.value] : []
675675
content {
676676
pod_range = lookup(network_config.value, "pod_range", null)
677677
enable_private_nodes = var.enable_private_nodes
@@ -985,7 +985,7 @@ resource "google_container_node_pool" "windows_pools" {
985985
}
986986

987987
dynamic "network_config" {
988-
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
988+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || var.enable_private_nodes != null ? [each.value] : []
989989
content {
990990
pod_range = lookup(network_config.value, "pod_range", null)
991991
enable_private_nodes = var.enable_private_nodes

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@ resource "google_container_node_pool" "pools" {
722722
}
723723

724724
dynamic "network_config" {
725-
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
725+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
726726
content {
727727
pod_range = lookup(network_config.value, "pod_range", null)
728728
enable_private_nodes = lookup(network_config.value, "enable_private_nodes", null)
@@ -1037,7 +1037,7 @@ resource "google_container_node_pool" "windows_pools" {
10371037
}
10381038

10391039
dynamic "network_config" {
1040-
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
1040+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
10411041
content {
10421042
pod_range = lookup(network_config.value, "pod_range", null)
10431043
enable_private_nodes = lookup(network_config.value, "enable_private_nodes", null)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ resource "google_container_node_pool" "pools" {
641641
}
642642

643643
dynamic "network_config" {
644-
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
644+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
645645
content {
646646
pod_range = lookup(network_config.value, "pod_range", null)
647647
enable_private_nodes = lookup(network_config.value, "enable_private_nodes", null)
@@ -955,7 +955,7 @@ resource "google_container_node_pool" "windows_pools" {
955955
}
956956

957957
dynamic "network_config" {
958-
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
958+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
959959
content {
960960
pod_range = lookup(network_config.value, "pod_range", null)
961961
enable_private_nodes = lookup(network_config.value, "enable_private_nodes", null)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ resource "google_container_node_pool" "pools" {
705705
}
706706

707707
dynamic "network_config" {
708-
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
708+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || var.enable_private_nodes != null ? [each.value] : []
709709
content {
710710
pod_range = lookup(network_config.value, "pod_range", null)
711711
enable_private_nodes = var.enable_private_nodes
@@ -1007,7 +1007,7 @@ resource "google_container_node_pool" "windows_pools" {
10071007
}
10081008

10091009
dynamic "network_config" {
1010-
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
1010+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || var.enable_private_nodes != null ? [each.value] : []
10111011
content {
10121012
pod_range = lookup(network_config.value, "pod_range", null)
10131013
enable_private_nodes = var.enable_private_nodes

‎modules/private-cluster/cluster.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ resource "google_container_node_pool" "pools" {
625625
}
626626

627627
dynamic "network_config" {
628-
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
628+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || var.enable_private_nodes != null ? [each.value] : []
629629
content {
630630
pod_range = lookup(network_config.value, "pod_range", null)
631631
enable_private_nodes = var.enable_private_nodes
@@ -926,7 +926,7 @@ resource "google_container_node_pool" "windows_pools" {
926926
}
927927

928928
dynamic "network_config" {
929-
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
929+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || var.enable_private_nodes != null ? [each.value] : []
930930
content {
931931
pod_range = lookup(network_config.value, "pod_range", null)
932932
enable_private_nodes = var.enable_private_nodes

‎test/integration/private_zonal_with_networking/private_zonal_with_networking_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ func TestPrivateZonalWithNetworking(t *testing.T) {
3434
bpt.DefineVerify(func(assert *assert.Assertions) {
3535
// Commenting Default Verify due to issue 1478 for location Policy
3636
// bpt.DefaultVerify(assert)
37+
testutils.TGKEVerify(t, bpt, assert) // Verify Resources
3738

3839
projectId := bpt.GetStringOutput("project_id")
3940
location := bpt.GetStringOutput("location")

‎test/integration/simple_regional_private/simple_regional_private_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ func TestSimpleRegionalPrivate(t *testing.T) {
3232
bpt.DefineVerify(func(assert *assert.Assertions) {
3333
//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token
3434
// bpt.DefaultVerify(assert)
35+
testutils.TGKEVerify(t, bpt, assert) // Verify Resources
3536

3637
projectId := bpt.GetStringOutput("project_id")
3738
location := bpt.GetStringOutput("location")

0 commit comments

Comments
 (0)