diff --git a/nodes/main.tf b/nodes/main.tf index 6ec651bb..a02bcee0 100644 --- a/nodes/main.tf +++ b/nodes/main.tf @@ -38,12 +38,12 @@ data "aws_iam_instance_profile" "node" { } data "aws_autoscaling_group" "nodes" { - count = (var.group_enabled ? 1 : 0) * length(data.aws_subnet_ids.nodes.ids) + count = var.group_enabled ? length(data.aws_subnet_ids.nodes.ids) : 0 name = element(module.workers.node_asg_names, count.index) } data "aws_autoscaling_group" "spots" { - count = (var.group_enabled && var.spot_nodes_enabled ? 1 : 0) * length(data.aws_subnet_ids.nodes.ids) + count = var.group_enabled && var.spot_nodes_enabled ? length(data.aws_subnet_ids.nodes.ids) : 0 name = element(module.workers.spot_node_asg_names, count.index) } diff --git a/nodes/modules/workers/worker_image.tf b/nodes/modules/workers/worker_image.tf index 0d102eb8..47d0909d 100644 --- a/nodes/modules/workers/worker_image.tf +++ b/nodes/modules/workers/worker_image.tf @@ -53,7 +53,7 @@ resource "aws_launch_template" "node" { } resource "aws_launch_template" "spot" { - count = (var.spot_nodes_enabled ? 1 : 0) * length(var.nodes_subnet_group) + count = var.spot_nodes_enabled ? length(var.nodes_subnet_group) : 0 name_prefix = var.cluster_name image_id = local.ami_id user_data = base64encode(local.eks-node-userdata) diff --git a/nodes/modules/workers/workers.tf b/nodes/modules/workers/workers.tf index cd70cd10..f7766dfa 100644 --- a/nodes/modules/workers/workers.tf +++ b/nodes/modules/workers/workers.tf @@ -1,5 +1,5 @@ resource "aws_autoscaling_group" "nodes" { - count = (var.nodes_enabled ? 1 : 0) * length(var.nodes_subnet_group) + count = var.nodes_enabled ? length(var.nodes_subnet_group) : 0 desired_capacity = var.desired_nodes max_size = var.max_nodes min_size = var.min_nodes @@ -44,7 +44,7 @@ resource "aws_autoscaling_group" "nodes" { } resource "aws_autoscaling_group" "spot_nodes" { - count = (var.spot_nodes_enabled ? 1 : 0) * length(var.nodes_subnet_group) + count = var.spot_nodes_enabled ? length(var.nodes_subnet_group) : 0 desired_capacity = var.desired_nodes max_size = var.max_nodes min_size = var.min_nodes