Move aws_autoscaling_group_tag back to kubernetes stage.

nebari-dev · Jan 7, 2024 · bfe9ce2 · bfe9ce2
1 parent 73fbc6c
commit bfe9ce2
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 38 deletions.
diff --git a/src/_nebari/stages/infrastructure/template/aws/main.tf b/src/_nebari/stages/infrastructure/template/aws/main.tf
@@ -96,41 +96,3 @@ module "kubernetes" {
   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    = local.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/infrastructure/template/aws/modules/kubernetes/main.tf b/src/_nebari/stages/infrastructure/template/aws/modules/kubernetes/main.tf
@@ -95,3 +95,55 @@ resource "aws_iam_openid_connect_provider" "oidc_provider" {
     var.tags
   )
 }
+data "aws_eks_node_group" "user" {
+  cluster_name    = aws_eks_cluster.main.name
+  node_group_name = "user"
+  depends_on = [
+    aws_eks_node_group.main
+  ]
+}
+
+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
+  }
+  depends_on = [
+    aws_eks_node_group.main,
+    data.aws_eks_node_group.user
+  ]
+}
+
+data "aws_eks_node_group" "worker" {
+  cluster_name    = aws_eks_cluster.main.name
+  node_group_name = "worker"
+  depends_on = [
+    aws_eks_node_group.main
+  ]
+}
+
+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
+  }
+  depends_on = [
+    data.aws_eks_node_group.worker,
+    aws_eks_node_group.main
+  ]
+}
diff --git a/src/_nebari/stages/infrastructure/template/aws/modules/kubernetes/outputs.tf b/src/_nebari/stages/infrastructure/template/aws/modules/kubernetes/outputs.tf
@@ -23,6 +23,11 @@ output "oidc_provider_arn" {
   value       = aws_iam_openid_connect_provider.oidc_provider.arn
 }
 
+output "cluster_name" {
+  description = "Name cluster"
+  value       = aws_eks_cluster.main.name
+}
+
 # https://github.com/terraform-aws-modules/terraform-aws-eks/blob/16f46db94b7158fd762d9133119206aaa7cf6d63/examples/self_managed_node_group/main.tf
 output "kubeconfig" {
   description = "Kubernetes connection configuration kubeconfig"