From 8190439f33b6b525fe930b1bfcdc65762d8652ab Mon Sep 17 00:00:00 2001
From: splichy <splichal@gmail.com>
Date: Tue, 10 Jan 2023 02:53:59 +0100
Subject: [PATCH] fix!: enable private nodes with specified pod ip range
 (#1514)

---
 autogen/main/cluster.tf.tmpl                           | 5 ++++-
 modules/beta-private-cluster-update-variant/cluster.tf | 6 ++++--
 modules/beta-private-cluster/cluster.tf                | 6 ++++--
 test/setup/versions.tf                                 | 2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
index a52f85265..67f30694d 100644
--- 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
index d702d9571..35432586e 100644
--- 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
index df0379fd1..7b5425c9d 100644
--- 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
index e416115b0..7a5756099 100644
--- 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"