Skip to content

Commit 4737eab

Browse files
DrFaust92DrFaust92
committed
support network_performance_config
Signed-off-by: drfaust92 <[email protected]>
1 parent 4b07e0f commit 4737eab

File tree

19 files changed

+45
-1778
lines changed

19 files changed

+45
-1778
lines changed

‎README.md

-165
Large diffs are not rendered by default.

‎autogen/main/cluster.tf.tmpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -923,7 +923,7 @@ resource "google_container_node_pool" "windows_pools" {
923923
}
924924

925925
dynamic "network_config" {
926-
for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
926+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null || lookup(each.value, "total_egress_bandwidth_tier", null) != null ? [each.value] : []
927927
content {
928928
pod_range = lookup(network_config.value, "pod_range", null)
929929
{% if private_cluster %}
@@ -933,9 +933,9 @@ resource "google_container_node_pool" "windows_pools" {
933933
{% endif %}
934934

935935
dynamic "network_performance_config" {
936-
for_each = lookup(each.value, "total_egress_bandwidth_tier", "") != "" ? [1] : []
936+
for_each = lookup(network_config.value, "total_egress_bandwidth_tier", "") != "" ? [1] : []
937937
content {
938-
total_egress_bandwidth_tier = lookup(each.value, "total_egress_bandwidth_tier", null)
938+
total_egress_bandwidth_tier = lookup(network_config.value, "total_egress_bandwidth_tier", null)
939939
}
940940
}
941941
}

‎cluster.tf

+6-6
Original file line numberDiff line numberDiff line change
@@ -634,15 +634,15 @@ resource "google_container_node_pool" "pools" {
634634
}
635635

636636
dynamic "network_config" {
637-
for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
637+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null || lookup(each.value, "total_egress_bandwidth_tier", null) != null ? [each.value] : []
638638
content {
639639
pod_range = lookup(network_config.value, "pod_range", null)
640640
enable_private_nodes = lookup(network_config.value, "enable_private_nodes", null)
641641

642642
dynamic "network_performance_config" {
643-
for_each = lookup(each.value, "total_egress_bandwidth_tier", "") != "" ? [1] : []
643+
for_each = lookup(network_config.value, "total_egress_bandwidth_tier", "") != "" ? [1] : []
644644
content {
645-
total_egress_bandwidth_tier = lookup(each.value, "total_egress_bandwidth_tier", null)
645+
total_egress_bandwidth_tier = lookup(network_config.value, "total_egress_bandwidth_tier", null)
646646
}
647647
}
648648
}
@@ -957,15 +957,15 @@ resource "google_container_node_pool" "windows_pools" {
957957
}
958958

959959
dynamic "network_config" {
960-
for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
960+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null || lookup(each.value, "total_egress_bandwidth_tier", null) != null ? [each.value] : []
961961
content {
962962
pod_range = lookup(network_config.value, "pod_range", null)
963963
enable_private_nodes = lookup(network_config.value, "enable_private_nodes", null)
964964

965965
dynamic "network_performance_config" {
966-
for_each = lookup(each.value, "total_egress_bandwidth_tier", "") != "" ? [1] : []
966+
for_each = lookup(network_config.value, "total_egress_bandwidth_tier", "") != "" ? [1] : []
967967
content {
968-
total_egress_bandwidth_tier = lookup(each.value, "total_egress_bandwidth_tier", null)
968+
total_egress_bandwidth_tier = lookup(network_config.value, "total_egress_bandwidth_tier", null)
969969
}
970970
}
971971
}

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

-133
Large diffs are not rendered by default.

‎modules/beta-autopilot-public-cluster/README.md

-125
Large diffs are not rendered by default.

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

-187
Large diffs are not rendered by default.

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -784,15 +784,15 @@ resource "google_container_node_pool" "pools" {
784784
}
785785

786786
dynamic "network_config" {
787-
for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
787+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null || lookup(each.value, "total_egress_bandwidth_tier", null) != null ? [each.value] : []
788788
content {
789789
pod_range = lookup(network_config.value, "pod_range", null)
790790
enable_private_nodes = lookup(network_config.value, "enable_private_nodes", var.enable_private_nodes)
791791

792792
dynamic "network_performance_config" {
793-
for_each = lookup(each.value, "total_egress_bandwidth_tier", "") != "" ? [1] : []
793+
for_each = lookup(network_config.value, "total_egress_bandwidth_tier", "") != "" ? [1] : []
794794
content {
795-
total_egress_bandwidth_tier = lookup(each.value, "total_egress_bandwidth_tier", null)
795+
total_egress_bandwidth_tier = lookup(network_config.value, "total_egress_bandwidth_tier", null)
796796
}
797797
}
798798
}
@@ -1121,15 +1121,15 @@ resource "google_container_node_pool" "windows_pools" {
11211121
}
11221122

11231123
dynamic "network_config" {
1124-
for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
1124+
for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null || lookup(each.value, "total_egress_bandwidth_tier", null) != null ? [each.value] : []
11251125
content {
11261126
pod_range = lookup(network_config.value, "pod_range", null)
11271127
enable_private_nodes = lookup(network_config.value, "enable_private_nodes", var.enable_private_nodes)
11281128

11291129
dynamic "network_performance_config" {
1130-
for_each = lookup(each.value, "total_egress_bandwidth_tier", "") != "" ? [1] : []
1130+
for_each = lookup(network_config.value, "total_egress_bandwidth_tier", "") != "" ? [1] : []
11311131
content {
1132-
total_egress_bandwidth_tier = lookup(each.value, "total_egress_bandwidth_tier", null)
1132+
total_egress_bandwidth_tier = lookup(network_config.value, "total_egress_bandwidth_tier", null)
11331133
}
11341134
}
11351135
}

0 commit comments

Comments
 (0)