Move aws_autoscaling_group_tag to initilization stage.

nebari-dev · Jan 6, 2024 · 1850624 · 1850624
1 parent 4855087
commit 1850624
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 38 deletions.
diff --git 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
@@ -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
-  }
-}