Changes due to migrating autoscaler here.

SCT-Engineering · Sep 26, 2023 · 9c00be5 · 9c00be5
1 parent 4d6d41f
commit 9c00be5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/cluster_autoscaler.tf b/cluster_autoscaler.tf
@@ -5,7 +5,7 @@ locals {
     "k8s.io/cluster-autoscaler/enabled"                      = "TRUE"
   }
 
-  ng_asg_name = module.cluster.eks_managed_node_groups["node_group"].node_group_resources[0].autoscaling_groups[0].name
+  ng_asg_name = var.eks_managed_node_groups_autoscaling_group_names[0]
 }
 
 module "cluster_autoscaler_irsa_role" {
@@ -15,11 +15,11 @@ module "cluster_autoscaler_irsa_role" {
 
   attach_cluster_autoscaler_policy = true
 
-  cluster_autoscaler_cluster_names = [module.cluster.cluster_name]
+  cluster_autoscaler_cluster_names = [var.cluster_name]
 
   oidc_providers = {
     main = {
-      provider_arn               = module.cluster.oidc_provider_arn
+      provider_arn               = var.oidc_provider_arn
       namespace_service_accounts = ["kube-system:cluster-autoscaler"]
     }
   }
@@ -36,10 +36,6 @@ resource "aws_autoscaling_group_tag" "on-demand" {
 }
 
 data "kubernetes_namespace" "kube-system" {
-  depends_on = [
-    module.cluster.eks_managed_node_groups,
-  ]
-
   metadata {
     name = "kube-system"
   }
@@ -48,7 +44,6 @@ data "kubernetes_namespace" "kube-system" {
 resource "helm_release" "cluster-autoscaler" {
   depends_on = [
     module.images,
-    module.cluster.eks_managed_node_groups,
   ]
 
   chart      = "cluster-autoscaler"

diff --git a/main.tf b/main.tf
@@ -11,6 +11,8 @@ locals {
     "boc:created_by"        = "terraform"
     CostAllocation          = var.tag_costallocation
   }
+
+  tags = merge(local.base_tags, var.tags)
 }
 
 resource "kubernetes_storage_class" "gp3_encrypted" {

diff --git a/variables.tf b/variables.tf
@@ -29,6 +29,16 @@ variable "security_group_all_worker_mgmt_id" {
   type        = string
 }
 
+variable "eks_managed_node_groups_autoscaling_group_names" {
+  description = "List of the autoscaling group names created by EKS managed node groups"
+  type        = list(string)
+}
+
+variable "oidc_provider_arn" {
+  description = "The ARN of the OIDC Provider if `enable_irsa = true`"
+  type        = string
+}
+
 variable "tag_costallocation" {
   description = "Tag CostAllocation (default)"
   type        = string