Skip to content

Commit 86286a0

Browse files
committed
Merge branch 'feature/private_network_config' of github.com:shubhamkr619/terraform-google-kubernetes-engine into feature/private_network_config
2 parents c1a7af8 + a7832ff commit 86286a0

File tree

3 files changed

+70
-0
lines changed

3 files changed

+70
-0
lines changed

cluster.tf

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,20 @@ resource "google_container_node_pool" "pools" {
436436
}
437437
}
438438

439+
dynamic "placement_policy" {
440+
for_each = length(lookup(each.value, "placement_policy", "")) > 0 ? [each.value] : []
441+
content {
442+
type = lookup(placement_policy.value, "placement_policy", null)
443+
}
444+
}
445+
446+
dynamic "network_config" {
447+
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
448+
content {
449+
pod_range = lookup(network_config.value, "pod_range", null)
450+
enable_private_nodes = lookup(network_config.value, "enable_private_nodes", null)
451+
}
452+
}
439453

440454
management {
441455
auto_repair = lookup(each.value, "auto_repair", true)
@@ -631,6 +645,20 @@ resource "google_container_node_pool" "windows_pools" {
631645
}
632646
}
633647

648+
dynamic "placement_policy" {
649+
for_each = length(lookup(each.value, "placement_policy", "")) > 0 ? [each.value] : []
650+
content {
651+
type = lookup(placement_policy.value, "placement_policy", null)
652+
}
653+
}
654+
655+
dynamic "network_config" {
656+
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
657+
content {
658+
pod_range = lookup(network_config.value, "pod_range", null)
659+
enable_private_nodes = lookup(network_config.value, "enable_private_nodes", null)
660+
}
661+
}
634662

635663
management {
636664
auto_repair = lookup(each.value, "auto_repair", true)

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,20 @@ resource "google_container_node_pool" "pools" {
530530
}
531531
}
532532

533+
dynamic "placement_policy" {
534+
for_each = length(lookup(each.value, "placement_policy", "")) > 0 ? [each.value] : []
535+
content {
536+
type = lookup(placement_policy.value, "placement_policy", null)
537+
}
538+
}
539+
540+
dynamic "network_config" {
541+
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
542+
content {
543+
pod_range = lookup(network_config.value, "pod_range", null)
544+
enable_private_nodes = var.enable_private_nodes
545+
}
546+
}
533547

534548
management {
535549
auto_repair = lookup(each.value, "auto_repair", true)
@@ -726,6 +740,20 @@ resource "google_container_node_pool" "windows_pools" {
726740
}
727741
}
728742

743+
dynamic "placement_policy" {
744+
for_each = length(lookup(each.value, "placement_policy", "")) > 0 ? [each.value] : []
745+
content {
746+
type = lookup(placement_policy.value, "placement_policy", null)
747+
}
748+
}
749+
750+
dynamic "network_config" {
751+
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
752+
content {
753+
pod_range = lookup(network_config.value, "pod_range", null)
754+
enable_private_nodes = var.enable_private_nodes
755+
}
756+
}
729757

730758
management {
731759
auto_repair = lookup(each.value, "auto_repair", true)

modules/private-cluster/cluster.tf

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -664,6 +664,20 @@ resource "google_container_node_pool" "windows_pools" {
664664
}
665665
}
666666

667+
dynamic "placement_policy" {
668+
for_each = length(lookup(each.value, "placement_policy", "")) > 0 ? [each.value] : []
669+
content {
670+
type = lookup(placement_policy.value, "placement_policy", null)
671+
}
672+
}
673+
674+
dynamic "network_config" {
675+
for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
676+
content {
677+
pod_range = lookup(network_config.value, "pod_range", null)
678+
enable_private_nodes = var.enable_private_nodes
679+
}
680+
}
667681

668682
management {
669683
auto_repair = lookup(each.value, "auto_repair", true)

0 commit comments

Comments
 (0)