feat(main): take node_config_defaults out of beta

`node_config_defaults` is GA in all our supported versions
terraform-google-modules · Sep 14, 2024 · 578d8eb · 578d8eb
1 parent 151274e
commit 578d8eb
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -520,6 +520,11 @@ resource "google_container_cluster" "primary" {
       }
     }
   }
+
+  node_pool_defaults {
+    node_config_defaults {
+    }
+  }
 }
 /******************************************
   Create Container Cluster node pools