Skip to content

Commit 516e0cf

Browse files
kopachevskykopachevsky
committed
* Fix #93
Fixed cluster auto scaling conditions
1 parent 49ad1dd commit 516e0cf

File tree

4 files changed

+72
-36
lines changed

4 files changed

+72
-36
lines changed

‎autogen/cluster.tf

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,24 @@ resource "google_container_cluster" "primary" {
6565
{% if beta_cluster %}
6666
cluster_autoscaling {
6767
enabled = var.cluster_autoscaling.enabled
68-
resource_limits {
69-
resource_type = "cpu"
70-
minimum = lookup(var.cluster_autoscaling.resource_limits, "min_cpu_cores", 0)
71-
maximum = lookup(var.cluster_autoscaling.resource_limits, "max_cpu_cores", 0)
72-
}
73-
resource_limits {
74-
resource_type = "memory"
75-
minimum = lookup(var.cluster_autoscaling.resource_limits, "min_memory_gb", 0)
76-
maximum = lookup(var.cluster_autoscaling.resource_limits, "max_memory_gb", 0)
68+
dynamic "resource_limits" {
69+
for_each = concat(
70+
var.cluster_autoscaling.enabled && lookup(var.cluster_autoscaling.resource_limits, "min_cpu_cores", 0) > 0 && lookup(var.cluster_autoscaling.resource_limits, "max_cpu_cores", 0) > 0 ? [{
71+
resource_type = "cpu"
72+
minimum = var.cluster_autoscaling.resource_limits["min_cpu_cores"]
73+
maximum = var.cluster_autoscaling.resource_limits["max_cpu_cores"]
74+
}] : [],
75+
var.cluster_autoscaling.enabled && lookup(var.cluster_autoscaling.resource_limits, "min_memory_gb", 0) > 0 && lookup(var.cluster_autoscaling.resource_limits, "max_memory_gb", 0) > 0 ? [{
76+
resource_type = "memory"
77+
minimum = var.cluster_autoscaling.resource_limits["min_memory_gb"]
78+
maximum = var.cluster_autoscaling.resource_limits["max_memory_gb"]
79+
}] : []
80+
)
81+
content {
82+
resource_type = lookup(resource_limits.value, "resource_type")
83+
minimum = lookup(resource_limits.value, "minimum")
84+
maximum = lookup(resource_limits.value, "maximum")
85+
}
7786
}
7887
}
7988

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

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,24 @@ resource "google_container_cluster" "primary" {
5858

5959
cluster_autoscaling {
6060
enabled = var.cluster_autoscaling.enabled
61-
resource_limits {
62-
resource_type = "cpu"
63-
minimum = lookup(var.cluster_autoscaling.resource_limits, "min_cpu_cores", 0)
64-
maximum = lookup(var.cluster_autoscaling.resource_limits, "max_cpu_cores", 0)
65-
}
66-
resource_limits {
67-
resource_type = "memory"
68-
minimum = lookup(var.cluster_autoscaling.resource_limits, "min_memory_gb", 0)
69-
maximum = lookup(var.cluster_autoscaling.resource_limits, "max_memory_gb", 0)
61+
dynamic "resource_limits" {
62+
for_each = concat(
63+
var.cluster_autoscaling.enabled && lookup(var.cluster_autoscaling.resource_limits, "min_cpu_cores", 0) > 0 && lookup(var.cluster_autoscaling.resource_limits, "max_cpu_cores", 0) > 0 ? [{
64+
resource_type = "cpu"
65+
minimum = var.cluster_autoscaling.resource_limits["min_cpu_cores"]
66+
maximum = var.cluster_autoscaling.resource_limits["max_cpu_cores"]
67+
}] : [],
68+
var.cluster_autoscaling.enabled && lookup(var.cluster_autoscaling.resource_limits, "min_memory_gb", 0) > 0 && lookup(var.cluster_autoscaling.resource_limits, "max_memory_gb", 0) > 0 ? [{
69+
resource_type = "memory"
70+
minimum = var.cluster_autoscaling.resource_limits["min_memory_gb"]
71+
maximum = var.cluster_autoscaling.resource_limits["max_memory_gb"]
72+
}] : []
73+
)
74+
content {
75+
resource_type = lookup(resource_limits.value, "resource_type")
76+
minimum = lookup(resource_limits.value, "minimum")
77+
maximum = lookup(resource_limits.value, "maximum")
78+
}
7079
}
7180
}
7281

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

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,24 @@ resource "google_container_cluster" "primary" {
5858

5959
cluster_autoscaling {
6060
enabled = var.cluster_autoscaling.enabled
61-
resource_limits {
62-
resource_type = "cpu"
63-
minimum = lookup(var.cluster_autoscaling.resource_limits, "min_cpu_cores", 0)
64-
maximum = lookup(var.cluster_autoscaling.resource_limits, "max_cpu_cores", 0)
65-
}
66-
resource_limits {
67-
resource_type = "memory"
68-
minimum = lookup(var.cluster_autoscaling.resource_limits, "min_memory_gb", 0)
69-
maximum = lookup(var.cluster_autoscaling.resource_limits, "max_memory_gb", 0)
61+
dynamic "resource_limits" {
62+
for_each = concat(
63+
var.cluster_autoscaling.enabled && lookup(var.cluster_autoscaling.resource_limits, "min_cpu_cores", 0) > 0 && lookup(var.cluster_autoscaling.resource_limits, "max_cpu_cores", 0) > 0 ? [{
64+
resource_type = "cpu"
65+
minimum = var.cluster_autoscaling.resource_limits["min_cpu_cores"]
66+
maximum = var.cluster_autoscaling.resource_limits["max_cpu_cores"]
67+
}] : [],
68+
var.cluster_autoscaling.enabled && lookup(var.cluster_autoscaling.resource_limits, "min_memory_gb", 0) > 0 && lookup(var.cluster_autoscaling.resource_limits, "max_memory_gb", 0) > 0 ? [{
69+
resource_type = "memory"
70+
minimum = var.cluster_autoscaling.resource_limits["min_memory_gb"]
71+
maximum = var.cluster_autoscaling.resource_limits["max_memory_gb"]
72+
}] : []
73+
)
74+
content {
75+
resource_type = lookup(resource_limits.value, "resource_type")
76+
minimum = lookup(resource_limits.value, "minimum")
77+
maximum = lookup(resource_limits.value, "maximum")
78+
}
7079
}
7180
}
7281

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

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,24 @@ resource "google_container_cluster" "primary" {
5858

5959
cluster_autoscaling {
6060
enabled = var.cluster_autoscaling.enabled
61-
resource_limits {
62-
resource_type = "cpu"
63-
minimum = lookup(var.cluster_autoscaling.resource_limits, "min_cpu_cores", 0)
64-
maximum = lookup(var.cluster_autoscaling.resource_limits, "max_cpu_cores", 0)
65-
}
66-
resource_limits {
67-
resource_type = "memory"
68-
minimum = lookup(var.cluster_autoscaling.resource_limits, "min_memory_gb", 0)
69-
maximum = lookup(var.cluster_autoscaling.resource_limits, "max_memory_gb", 0)
61+
dynamic "resource_limits" {
62+
for_each = concat(
63+
var.cluster_autoscaling.enabled && lookup(var.cluster_autoscaling.resource_limits, "min_cpu_cores", 0) > 0 && lookup(var.cluster_autoscaling.resource_limits, "max_cpu_cores", 0) > 0 ? [{
64+
resource_type = "cpu"
65+
minimum = var.cluster_autoscaling.resource_limits["min_cpu_cores"]
66+
maximum = var.cluster_autoscaling.resource_limits["max_cpu_cores"]
67+
}] : [],
68+
var.cluster_autoscaling.enabled && lookup(var.cluster_autoscaling.resource_limits, "min_memory_gb", 0) > 0 && lookup(var.cluster_autoscaling.resource_limits, "max_memory_gb", 0) > 0 ? [{
69+
resource_type = "memory"
70+
minimum = var.cluster_autoscaling.resource_limits["min_memory_gb"]
71+
maximum = var.cluster_autoscaling.resource_limits["max_memory_gb"]
72+
}] : []
73+
)
74+
content {
75+
resource_type = lookup(resource_limits.value, "resource_type")
76+
minimum = lookup(resource_limits.value, "minimum")
77+
maximum = lookup(resource_limits.value, "maximum")
78+
}
7079
}
7180
}
7281

0 commit comments

Comments
 (0)