diff --git a/src/_nebari/stages/infrastructure/template/aws/main.tf b/src/_nebari/stages/infrastructure/template/aws/main.tf index a2c0e929d7..6527239a2a 100644 --- a/src/_nebari/stages/infrastructure/template/aws/main.tf +++ b/src/_nebari/stages/infrastructure/template/aws/main.tf @@ -95,3 +95,42 @@ module "kubernetes" { endpoint_private_access = var.eks_endpoint_private_access public_access_cidrs = var.eks_public_access_cidrs } + +data "aws_eks_node_group" "user" { + cluster_name = local.cluster_name + node_group_name = "user" +} + +resource "aws_autoscaling_group_tag" "dedicated_user" { + for_each = toset( + [for asg in flatten( + [for resources in data.aws_eks_node_group.user.resources : resources.autoscaling_groups] + ) : asg.name] + ) + + autoscaling_group_name = each.value + tag { + key = "k8s.io/cluster-autoscaler/node-template/label/dedicated" + value = "user" + propagate_at_launch = true + } +} + +data "aws_eks_node_group" "worker" { + cluster_name = var.cluster-name + node_group_name = "worker" +} + +resource "aws_autoscaling_group_tag" "dedicated_worker" { + for_each = toset( + [for asg in flatten( + [for resources in data.aws_eks_node_group.worker.resources : resources.autoscaling_groups] + ) : asg.name] + ) + autoscaling_group_name = each.value + tag { + key = "k8s.io/cluster-autoscaler/node-template/label/dedicated" + value = "worker" + propagate_at_launch = true + } +} diff --git a/src/_nebari/stages/kubernetes_initialize/template/modules/cluster-autoscaler/main.tf b/src/_nebari/stages/kubernetes_initialize/template/modules/cluster-autoscaler/main.tf index fb9231b967..53a9141191 100644 --- a/src/_nebari/stages/kubernetes_initialize/template/modules/cluster-autoscaler/main.tf +++ b/src/_nebari/stages/kubernetes_initialize/template/modules/cluster-autoscaler/main.tf @@ -27,41 +27,3 @@ resource "helm_release" "autoscaler" { ], var.overrides) } -data "aws_eks_node_group" "user" { - cluster_name = var.cluster-name - node_group_name = "user" -} - -resource "aws_autoscaling_group_tag" "dedicated_user" { - for_each = toset( - [for asg in flatten( - [for resources in data.aws_eks_node_group.user.resources : resources.autoscaling_groups] - ) : asg.name] - ) - - autoscaling_group_name = each.value - tag { - key = "k8s.io/cluster-autoscaler/node-template/label/dedicated" - value = "user" - propagate_at_launch = true - } -} - -data "aws_eks_node_group" "worker" { - cluster_name = var.cluster-name - node_group_name = "worker" -} - -resource "aws_autoscaling_group_tag" "dedicated_worker" { - for_each = toset( - [for asg in flatten( - [for resources in data.aws_eks_node_group.worker.resources : resources.autoscaling_groups] - ) : asg.name] - ) - autoscaling_group_name = each.value - tag { - key = "k8s.io/cluster-autoscaler/node-template/label/dedicated" - value = "worker" - propagate_at_launch = true - } -}