Skip to content

Commit 5603718

Browse files
stanley98yustanley98yu
authored
feat: Make auto_provisioning_defaults a non-beta feature and set min_cpu_platform for auto-provisioned node pools (terraform-google-modules#1077)
1 parent d062c5b commit 5603718

File tree

8 files changed

+40
-9
lines changed

8 files changed

+40
-9
lines changed

‎autogen/main/cluster.tf.tmpl‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,18 @@ resource "google_container_cluster" "primary" {
8686

8787
cluster_autoscaling {
8888
enabled = var.cluster_autoscaling.enabled
89-
{% if beta_cluster %}
9089
dynamic "auto_provisioning_defaults" {
9190
for_each = var.cluster_autoscaling.enabled ? [1] : []
9291

9392
content {
9493
service_account = local.service_account
9594
oauth_scopes = local.node_pools_oauth_scopes["all"]
95+
{% if beta_cluster %}
96+
min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
97+
{% endif %}
9698
}
9799
}
100+
{% if beta_cluster %}
98101
autoscaling_profile = var.cluster_autoscaling.autoscaling_profile != null ? var.cluster_autoscaling.autoscaling_profile : "BALANCED"
99102
{% endif %}
100103
dynamic "resource_limits" {

‎cluster.tf‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,14 @@ resource "google_container_cluster" "primary" {
5858

5959
cluster_autoscaling {
6060
enabled = var.cluster_autoscaling.enabled
61+
dynamic "auto_provisioning_defaults" {
62+
for_each = var.cluster_autoscaling.enabled ? [1] : []
63+
64+
content {
65+
service_account = local.service_account
66+
oauth_scopes = local.node_pools_oauth_scopes["all"]
67+
}
68+
}
6169
dynamic "resource_limits" {
6270
for_each = local.autoscaling_resource_limits
6371
content {

‎modules/beta-private-cluster-update-variant/cluster.tf‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,9 @@ resource "google_container_cluster" "primary" {
7777
for_each = var.cluster_autoscaling.enabled ? [1] : []
7878

7979
content {
80-
service_account = local.service_account
81-
oauth_scopes = local.node_pools_oauth_scopes["all"]
80+
service_account = local.service_account
81+
oauth_scopes = local.node_pools_oauth_scopes["all"]
82+
min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
8283
}
8384
}
8485
autoscaling_profile = var.cluster_autoscaling.autoscaling_profile != null ? var.cluster_autoscaling.autoscaling_profile : "BALANCED"

‎modules/beta-private-cluster/cluster.tf‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,9 @@ resource "google_container_cluster" "primary" {
7777
for_each = var.cluster_autoscaling.enabled ? [1] : []
7878

7979
content {
80-
service_account = local.service_account
81-
oauth_scopes = local.node_pools_oauth_scopes["all"]
80+
service_account = local.service_account
81+
oauth_scopes = local.node_pools_oauth_scopes["all"]
82+
min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
8283
}
8384
}
8485
autoscaling_profile = var.cluster_autoscaling.autoscaling_profile != null ? var.cluster_autoscaling.autoscaling_profile : "BALANCED"

‎modules/beta-public-cluster-update-variant/cluster.tf‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,9 @@ resource "google_container_cluster" "primary" {
7777
for_each = var.cluster_autoscaling.enabled ? [1] : []
7878

7979
content {
80-
service_account = local.service_account
81-
oauth_scopes = local.node_pools_oauth_scopes["all"]
80+
service_account = local.service_account
81+
oauth_scopes = local.node_pools_oauth_scopes["all"]
82+
min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
8283
}
8384
}
8485
autoscaling_profile = var.cluster_autoscaling.autoscaling_profile != null ? var.cluster_autoscaling.autoscaling_profile : "BALANCED"

‎modules/beta-public-cluster/cluster.tf‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,9 @@ resource "google_container_cluster" "primary" {
7777
for_each = var.cluster_autoscaling.enabled ? [1] : []
7878

7979
content {
80-
service_account = local.service_account
81-
oauth_scopes = local.node_pools_oauth_scopes["all"]
80+
service_account = local.service_account
81+
oauth_scopes = local.node_pools_oauth_scopes["all"]
82+
min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
8283
}
8384
}
8485
autoscaling_profile = var.cluster_autoscaling.autoscaling_profile != null ? var.cluster_autoscaling.autoscaling_profile : "BALANCED"

‎modules/private-cluster-update-variant/cluster.tf‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,14 @@ resource "google_container_cluster" "primary" {
5858

5959
cluster_autoscaling {
6060
enabled = var.cluster_autoscaling.enabled
61+
dynamic "auto_provisioning_defaults" {
62+
for_each = var.cluster_autoscaling.enabled ? [1] : []
63+
64+
content {
65+
service_account = local.service_account
66+
oauth_scopes = local.node_pools_oauth_scopes["all"]
67+
}
68+
}
6169
dynamic "resource_limits" {
6270
for_each = local.autoscaling_resource_limits
6371
content {

‎modules/private-cluster/cluster.tf‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,14 @@ resource "google_container_cluster" "primary" {
5858

5959
cluster_autoscaling {
6060
enabled = var.cluster_autoscaling.enabled
61+
dynamic "auto_provisioning_defaults" {
62+
for_each = var.cluster_autoscaling.enabled ? [1] : []
63+
64+
content {
65+
service_account = local.service_account
66+
oauth_scopes = local.node_pools_oauth_scopes["all"]
67+
}
68+
}
6169
dynamic "resource_limits" {
6270
for_each = local.autoscaling_resource_limits
6371
content {

0 commit comments

Comments
 (0)