From 578d8ebc7e48e459be820a69af4562199d996cd6 Mon Sep 17 00:00:00 2001
From: William Yardley <wyardley@users.noreply.github.com>
Date: Fri, 13 Sep 2024 18:05:11 -0700
Subject: [PATCH] feat(main): take `node_config_defaults` out of beta

`node_config_defaults` is GA in all our supported versions
---
 autogen/main/cluster.tf.tmpl                      | 4 ++--
 cluster.tf                                        | 5 +++++
 modules/private-cluster-update-variant/cluster.tf | 5 +++++
 modules/private-cluster/cluster.tf                | 5 +++++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
index 52d6ef05d2..fdebe4351b 100644
--- a/autogen/main/cluster.tf.tmpl
+++ b/autogen/main/cluster.tf.tmpl
@@ -660,7 +660,6 @@ resource "google_container_cluster" "primary" {
       }
     }
   }
-  {% if beta_cluster %}
 
   node_pool_defaults {
     node_config_defaults {
@@ -674,13 +673,14 @@ resource "google_container_cluster" "primary" {
       }
       {% endif %}
       {% if autopilot_cluster != true %}
+      {% if beta_cluster %}
       gcfs_config {
         enabled = var.enable_gcfs
       }
       {% endif %}
+      {% endif %}
     }
   }
-  {% endif %}
   {% if beta_cluster %}
 
   depends_on = [google_project_iam_member.service_agent]
diff --git a/cluster.tf b/cluster.tf
index 27cd0cebb0..4aae33835a 100644
--- a/cluster.tf
+++ b/cluster.tf
@@ -499,6 +499,11 @@ resource "google_container_cluster" "primary" {
       }
     }
   }
+
+  node_pool_defaults {
+    node_config_defaults {
+    }
+  }
 }
 /******************************************
   Create Container Cluster node pools
diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
index e3a1a52263..428806ab4d 100644
--- a/modules/private-cluster-update-variant/cluster.tf
+++ b/modules/private-cluster-update-variant/cluster.tf
@@ -520,6 +520,11 @@ resource "google_container_cluster" "primary" {
       }
     }
   }
+
+  node_pool_defaults {
+    node_config_defaults {
+    }
+  }
 }
 /******************************************
   Create Container Cluster node pools
diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
index c6cf074c54..ef3f891efe 100644
--- a/modules/private-cluster/cluster.tf
+++ b/modules/private-cluster/cluster.tf
@@ -520,6 +520,11 @@ resource "google_container_cluster" "primary" {
       }
     }
   }
+
+  node_pool_defaults {
+    node_config_defaults {
+    }
+  }
 }
 /******************************************
   Create Container Cluster node pools