Skip to content

Commit 3b1bb0c

Browse files
apeabodyapeabody
authored
Merge branch 'main' into ap/node_affinity
2 parents 5f9519d + d49c3bf commit 3b1bb0c

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
@@ -891,7 +891,7 @@ resource "google_container_node_pool" "windows_pools" {
891891
}
892892

893893
dynamic "network_config" {
894-
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
894+
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] : []
895895
content {
896896
pod_range = lookup(network_config.value, "pod_range", null)
897897
{% if private_cluster %}

‎cluster.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ resource "google_container_node_pool" "pools" {
610610
}
611611

612612
dynamic "network_config" {
613-
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
613+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
614614
content {
615615
pod_range = lookup(network_config.value, "pod_range", null)
616616
enable_private_nodes = lookup(network_config.value, "enable_private_nodes", null)
@@ -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 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
930930
content {
931931
pod_range = lookup(network_config.value, "pod_range", null)
932932
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
@@ -767,7 +767,7 @@ resource "google_container_node_pool" "pools" {
767767
}
768768

769769
dynamic "network_config" {
770-
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
770+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || var.enable_private_nodes != null ? [each.value] : []
771771
content {
772772
pod_range = lookup(network_config.value, "pod_range", null)
773773
enable_private_nodes = var.enable_private_nodes
@@ -1097,7 +1097,7 @@ resource "google_container_node_pool" "windows_pools" {
10971097
}
10981098

10991099
dynamic "network_config" {
1100-
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
1100+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || var.enable_private_nodes != null ? [each.value] : []
11011101
content {
11021102
pod_range = lookup(network_config.value, "pod_range", null)
11031103
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
@@ -686,7 +686,7 @@ resource "google_container_node_pool" "pools" {
686686
}
687687

688688
dynamic "network_config" {
689-
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
689+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || var.enable_private_nodes != null ? [each.value] : []
690690
content {
691691
pod_range = lookup(network_config.value, "pod_range", null)
692692
enable_private_nodes = var.enable_private_nodes
@@ -1015,7 +1015,7 @@ resource "google_container_node_pool" "windows_pools" {
10151015
}
10161016

10171017
dynamic "network_config" {
1018-
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
1018+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || var.enable_private_nodes != null ? [each.value] : []
10191019
content {
10201020
pod_range = lookup(network_config.value, "pod_range", null)
10211021
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
@@ -737,7 +737,7 @@ resource "google_container_node_pool" "pools" {
737737
}
738738

739739
dynamic "network_config" {
740-
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
740+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
741741
content {
742742
pod_range = lookup(network_config.value, "pod_range", null)
743743
enable_private_nodes = lookup(network_config.value, "enable_private_nodes", null)
@@ -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 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
10711071
content {
10721072
pod_range = lookup(network_config.value, "pod_range", null)
10731073
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
@@ -656,7 +656,7 @@ resource "google_container_node_pool" "pools" {
656656
}
657657

658658
dynamic "network_config" {
659-
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
659+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
660660
content {
661661
pod_range = lookup(network_config.value, "pod_range", null)
662662
enable_private_nodes = lookup(network_config.value, "enable_private_nodes", null)
@@ -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 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
989989
content {
990990
pod_range = lookup(network_config.value, "pod_range", null)
991991
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
@@ -720,7 +720,7 @@ resource "google_container_node_pool" "pools" {
720720
}
721721

722722
dynamic "network_config" {
723-
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
723+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || var.enable_private_nodes != null ? [each.value] : []
724724
content {
725725
pod_range = lookup(network_config.value, "pod_range", null)
726726
enable_private_nodes = var.enable_private_nodes
@@ -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 || var.enable_private_nodes != null ? [each.value] : []
10411041
content {
10421042
pod_range = lookup(network_config.value, "pod_range", null)
10431043
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
@@ -640,7 +640,7 @@ resource "google_container_node_pool" "pools" {
640640
}
641641

642642
dynamic "network_config" {
643-
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
643+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || var.enable_private_nodes != null ? [each.value] : []
644644
content {
645645
pod_range = lookup(network_config.value, "pod_range", null)
646646
enable_private_nodes = var.enable_private_nodes
@@ -956,7 +956,7 @@ resource "google_container_node_pool" "windows_pools" {
956956
}
957957

958958
dynamic "network_config" {
959-
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
959+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || var.enable_private_nodes != null ? [each.value] : []
960960
content {
961961
pod_range = lookup(network_config.value, "pod_range", null)
962962
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)