diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl index b493d04f7c..d997ac407b 100644 --- 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 index 134e5459e1..a97b145063 100644 --- 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 index d4f320e369..3fec97d43a 100644 --- 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 index 29f11bb7ee..73d12ec042 100644 --- 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 index b20fa74835..057e419081 100644 --- 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 index d76574eb39..42a350b6ba 100644 --- 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") }