Skip to content

Commit d6aaec7

Browse files
authored
Merge pull request #250 from Dev25/autoscaling
Add opt out for node pool autoscaling
2 parents 50765a8 + 773eb57 commit d6aaec7

File tree

6 files changed

+41
-16
lines changed

6 files changed

+41
-16
lines changed

autogen/cluster.tf

+8-3
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,14 @@ resource "google_container_node_pool" "pools" {
223223
max_pods_per_node = lookup(var.node_pools[count.index], "max_pods_per_node", null)
224224
{% endif %}
225225

226-
autoscaling {
227-
min_node_count = lookup(var.node_pools[count.index], "min_count", 1)
228-
max_node_count = lookup(var.node_pools[count.index], "max_count", 100)
226+
node_count = lookup(var.node_pools[count.index], "autoscaling", true) ? null : lookup(var.node_pools[count.index], "min_count", 1)
227+
228+
dynamic "autoscaling" {
229+
for_each = lookup(var.node_pools[count.index], "autoscaling", true) ? [var.node_pools[count.index]] : []
230+
content {
231+
min_node_count = lookup(autoscaling.value, "min_count", 1)
232+
max_node_count = lookup(autoscaling.value, "max_count", 100)
233+
}
229234
}
230235

231236
management {

autogen/variables.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ variable "enable_intranode_visibility" {
377377
default = false
378378
}
379379

380-
variable "enable_vertical_pod_autoscaling" {
380+
variable "enable_vertical_pod_autoscaling" {
381381
type = bool
382382
description = "Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it"
383383
default = false

cluster.tf

+8-3
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,14 @@ resource "google_container_node_pool" "pools" {
142142
lookup(var.node_pools[count.index], "min_count", 1),
143143
)
144144

145-
autoscaling {
146-
min_node_count = lookup(var.node_pools[count.index], "min_count", 1)
147-
max_node_count = lookup(var.node_pools[count.index], "max_count", 100)
145+
node_count = lookup(var.node_pools[count.index], "autoscaling", true) ? null : lookup(var.node_pools[count.index], "min_count", 1)
146+
147+
dynamic "autoscaling" {
148+
for_each = lookup(var.node_pools[count.index], "autoscaling", true) ? [var.node_pools[count.index]] : []
149+
content {
150+
min_node_count = lookup(autoscaling.value, "min_count", 1)
151+
max_node_count = lookup(autoscaling.value, "max_count", 100)
152+
}
148153
}
149154

150155
management {

modules/beta-private-cluster/cluster.tf

+8-3
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,14 @@ resource "google_container_node_pool" "pools" {
207207
)
208208
max_pods_per_node = lookup(var.node_pools[count.index], "max_pods_per_node", null)
209209

210-
autoscaling {
211-
min_node_count = lookup(var.node_pools[count.index], "min_count", 1)
212-
max_node_count = lookup(var.node_pools[count.index], "max_count", 100)
210+
node_count = lookup(var.node_pools[count.index], "autoscaling", true) ? null : lookup(var.node_pools[count.index], "min_count", 1)
211+
212+
dynamic "autoscaling" {
213+
for_each = lookup(var.node_pools[count.index], "autoscaling", true) ? [var.node_pools[count.index]] : []
214+
content {
215+
min_node_count = lookup(autoscaling.value, "min_count", 1)
216+
max_node_count = lookup(autoscaling.value, "max_count", 100)
217+
}
213218
}
214219

215220
management {

modules/beta-public-cluster/cluster.tf

+8-3
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,14 @@ resource "google_container_node_pool" "pools" {
202202
)
203203
max_pods_per_node = lookup(var.node_pools[count.index], "max_pods_per_node", null)
204204

205-
autoscaling {
206-
min_node_count = lookup(var.node_pools[count.index], "min_count", 1)
207-
max_node_count = lookup(var.node_pools[count.index], "max_count", 100)
205+
node_count = lookup(var.node_pools[count.index], "autoscaling", true) ? null : lookup(var.node_pools[count.index], "min_count", 1)
206+
207+
dynamic "autoscaling" {
208+
for_each = lookup(var.node_pools[count.index], "autoscaling", true) ? [var.node_pools[count.index]] : []
209+
content {
210+
min_node_count = lookup(autoscaling.value, "min_count", 1)
211+
max_node_count = lookup(autoscaling.value, "max_count", 100)
212+
}
208213
}
209214

210215
management {

modules/private-cluster/cluster.tf

+8-3
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,14 @@ resource "google_container_node_pool" "pools" {
147147
lookup(var.node_pools[count.index], "min_count", 1),
148148
)
149149

150-
autoscaling {
151-
min_node_count = lookup(var.node_pools[count.index], "min_count", 1)
152-
max_node_count = lookup(var.node_pools[count.index], "max_count", 100)
150+
node_count = lookup(var.node_pools[count.index], "autoscaling", true) ? null : lookup(var.node_pools[count.index], "min_count", 1)
151+
152+
dynamic "autoscaling" {
153+
for_each = lookup(var.node_pools[count.index], "autoscaling", true) ? [var.node_pools[count.index]] : []
154+
content {
155+
min_node_count = lookup(autoscaling.value, "min_count", 1)
156+
max_node_count = lookup(autoscaling.value, "max_count", 100)
157+
}
153158
}
154159

155160
management {

0 commit comments

Comments
 (0)