fix: min_cpu_platform ref in cluster autoscaling (#2208)

Signed-off-by: drfaust92 <[email protected]>
terraform-google-modules · Dec 17, 2024 · f48e732 · f48e732
1 parent 9a86b4a
commit f48e732
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -183,7 +183,7 @@ resource "google_container_cluster" "primary" {
         }
 
         {% if beta_cluster %}
-        min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
+        min_cpu_platform = lookup(var.cluster_autoscaling, "min_cpu_platform", "")
         {% endif %}
 
         image_type = lookup(var.cluster_autoscaling, "image_type", "COS_CONTAINERD")

diff --git a/examples/simple_regional_cluster_autoscaling/main.tf b/examples/simple_regional_cluster_autoscaling/main.tf
@@ -53,6 +53,7 @@ module "gke" {
   cluster_autoscaling = {
     enabled             = true
     autoscaling_profile = "OPTIMIZE_UTILIZATION"
+    min_cpu_platform    = "Intel Skylake"
     min_cpu_cores       = 4
     max_cpu_cores       = 86
     min_memory_gb       = 16

diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -155,7 +155,7 @@ resource "google_container_cluster" "primary" {
           enable_integrity_monitoring = lookup(var.cluster_autoscaling, "enable_integrity_monitoring", true)
         }
 
-        min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
+        min_cpu_platform = lookup(var.cluster_autoscaling, "min_cpu_platform", "")
 
         image_type = lookup(var.cluster_autoscaling, "image_type", "COS_CONTAINERD")
       }

diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -155,7 +155,7 @@ resource "google_container_cluster" "primary" {
           enable_integrity_monitoring = lookup(var.cluster_autoscaling, "enable_integrity_monitoring", true)
         }
 
-        min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
+        min_cpu_platform = lookup(var.cluster_autoscaling, "min_cpu_platform", "")
 
         image_type = lookup(var.cluster_autoscaling, "image_type", "COS_CONTAINERD")
       }

diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -155,7 +155,7 @@ resource "google_container_cluster" "primary" {
           enable_integrity_monitoring = lookup(var.cluster_autoscaling, "enable_integrity_monitoring", true)
         }
 
-        min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
+        min_cpu_platform = lookup(var.cluster_autoscaling, "min_cpu_platform", "")
 
         image_type = lookup(var.cluster_autoscaling, "image_type", "COS_CONTAINERD")
       }

diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -155,7 +155,7 @@ resource "google_container_cluster" "primary" {
           enable_integrity_monitoring = lookup(var.cluster_autoscaling, "enable_integrity_monitoring", true)
         }
 
-        min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
+        min_cpu_platform = lookup(var.cluster_autoscaling, "min_cpu_platform", "")
 
         image_type = lookup(var.cluster_autoscaling, "image_type", "COS_CONTAINERD")
       }