fix: min_cpu_platform ref in cluster autoscaling (#2208)

DrFaust92 · web-flow · commit f48e7322c757 · 2024-12-17T10:06:15.000-08:00
Signed-off-by: drfaust92 &lt;ilia.lazebnik@gmail.com&gt;
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")
       }

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ resource "google_container_cluster" "primary" {`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`{% if beta_cluster %}`
`186`		`- min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")`
	`186`	`+ min_cpu_platform = lookup(var.cluster_autoscaling, "min_cpu_platform", "")`
`187`	`187`	`{% endif %}`
`188`	`188`
`189`	`189`	`image_type = lookup(var.cluster_autoscaling, "image_type", "COS_CONTAINERD")`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ resource "google_container_cluster" "primary" {`
`155`	`155`	`enable_integrity_monitoring = lookup(var.cluster_autoscaling, "enable_integrity_monitoring", true)`
`156`	`156`	`}`
`157`	`157`
`158`		`- min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")`
	`158`	`+ min_cpu_platform = lookup(var.cluster_autoscaling, "min_cpu_platform", "")`
`159`	`159`
`160`	`160`	`image_type = lookup(var.cluster_autoscaling, "image_type", "COS_CONTAINERD")`
`161`	`161`	`}`