fix!: enable private nodes with specified pod ip range (terraform-google-modules#1514)

splichy · web-flow · commit 8190439f33b6 · 2023-01-09T19:53:59.000-06:00
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -663,7 +663,10 @@ resource "google_container_node_pool" "windows_pools" {
   dynamic "network_config" {
     for_each = length(lookup(each.value, "pod_range", "")) > 0  ? [each.value] : []
     content {
-      pod_range = lookup(network_config.value, "pod_range", null)
+      pod_range            = lookup(network_config.value, "pod_range", null)
+      {% if private_cluster %}
+      enable_private_nodes = var.enable_private_nodes
+      {% endif %}
     }
   }
   {% endif %}
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -578,7 +578,8 @@ resource "google_container_node_pool" "pools" {
   dynamic "network_config" {
     for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
     content {
-      pod_range = lookup(network_config.value, "pod_range", null)
+      pod_range            = lookup(network_config.value, "pod_range", null)
+      enable_private_nodes = var.enable_private_nodes
     }
   }
 
@@ -789,7 +790,8 @@ resource "google_container_node_pool" "windows_pools" {
   dynamic "network_config" {
     for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
     content {
-      pod_range = lookup(network_config.value, "pod_range", null)
+      pod_range            = lookup(network_config.value, "pod_range", null)
+      enable_private_nodes = var.enable_private_nodes
     }
   }
 
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -484,7 +484,8 @@ resource "google_container_node_pool" "pools" {
   dynamic "network_config" {
     for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
     content {
-      pod_range = lookup(network_config.value, "pod_range", null)
+      pod_range            = lookup(network_config.value, "pod_range", null)
+      enable_private_nodes = var.enable_private_nodes
     }
   }
 
@@ -694,7 +695,8 @@ resource "google_container_node_pool" "windows_pools" {
   dynamic "network_config" {
     for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
     content {
-      pod_range = lookup(network_config.value, "pod_range", null)
+      pod_range            = lookup(network_config.value, "pod_range", null)
+      enable_private_nodes = var.enable_private_nodes
     }
   }
 
diff --git a/test/setup/versions.tf b/test/setup/versions.tf
@@ -23,7 +23,7 @@ terraform {
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 4.3"
+      version = "~> 4.45"
     }
     random = {
       source = "hashicorp/random"

Original file line number	Diff line number	Diff line change
`@@ -663,7 +663,10 @@ resource "google_container_node_pool" "windows_pools" {`
`663`	`663`	`dynamic "network_config" {`
`664`	`664`	`for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []`
`665`	`665`	`content {`
`666`		`- pod_range = lookup(network_config.value, "pod_range", null)`
	`666`	`+ pod_range = lookup(network_config.value, "pod_range", null)`
	`667`	`+ {% if private_cluster %}`
	`668`	`+ enable_private_nodes = var.enable_private_nodes`
	`669`	`+ {% endif %}`
`667`	`670`	`}`
`668`	`671`	`}`
`669`	`672`	`{% endif %}`
Original file line number	Diff line number	Diff line change
`@@ -578,7 +578,8 @@ resource "google_container_node_pool" "pools" {`
`578`	`578`	`dynamic "network_config" {`
`579`	`579`	`for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []`
`580`	`580`	`content {`
`581`		`- pod_range = lookup(network_config.value, "pod_range", null)`
	`581`	`+ pod_range = lookup(network_config.value, "pod_range", null)`
	`582`	`+ enable_private_nodes = var.enable_private_nodes`
`582`	`583`	`}`
`583`	`584`	`}`
`584`	`585`
`@@ -789,7 +790,8 @@ resource "google_container_node_pool" "windows_pools" {`
`789`	`790`	`dynamic "network_config" {`
`790`	`791`	`for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []`
`791`	`792`	`content {`
`792`		`- pod_range = lookup(network_config.value, "pod_range", null)`
	`793`	`+ pod_range = lookup(network_config.value, "pod_range", null)`
	`794`	`+ enable_private_nodes = var.enable_private_nodes`
`793`	`795`	`}`
`794`	`796`	`}`
`795`	`797`
Original file line number	Diff line number	Diff line change
`@@ -484,7 +484,8 @@ resource "google_container_node_pool" "pools" {`
`484`	`484`	`dynamic "network_config" {`
`485`	`485`	`for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []`
`486`	`486`	`content {`
`487`		`- pod_range = lookup(network_config.value, "pod_range", null)`
	`487`	`+ pod_range = lookup(network_config.value, "pod_range", null)`
	`488`	`+ enable_private_nodes = var.enable_private_nodes`
`488`	`489`	`}`
`489`	`490`	`}`
`490`	`491`
`@@ -694,7 +695,8 @@ resource "google_container_node_pool" "windows_pools" {`
`694`	`695`	`dynamic "network_config" {`
`695`	`696`	`for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []`
`696`	`697`	`content {`
`697`		`- pod_range = lookup(network_config.value, "pod_range", null)`
	`698`	`+ pod_range = lookup(network_config.value, "pod_range", null)`
	`699`	`+ enable_private_nodes = var.enable_private_nodes`
`698`	`700`	`}`
`699`	`701`	`}`
`700`	`702`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ terraform {`
`23`	`23`	`}`
`24`	`24`	`google-beta = {`
`25`	`25`	`source = "hashicorp/google-beta"`
`26`		`- version = "~> 4.3"`
	`26`	`+ version = "~> 4.45"`
`27`	`27`	`}`
`28`	`28`	`random = {`
`29`	`29`	`source = "hashicorp/random"`