do not depend on aws_auth configmap

gminiba · May 30, 2023 · 55aad2c · 55aad2c
1 parent b95889c
commit 55aad2c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/aws-auth-configmap.tf b/aws-auth-configmap.tf
@@ -1,5 +1,5 @@
 resource "kubernetes_config_map" "aws_auth" {
-  count = var.create_eks&&var.cluster_manage_aws_auth ? 1 : 0
+  count = var.create_eks && var.cluster_manage_aws_auth ? 1 : 0
 
   metadata {
     name      = "aws-auth"

diff --git a/eks-worker.tf b/eks-worker.tf
@@ -10,7 +10,7 @@ module "aws_eks_managed_node_groups" {
   managed_ng = each.value
   context    = local.node_group_context
 
-  depends_on = [kubernetes_config_map.aws_auth]
+  depends_on = [module.aws_eks.cluster_id, data.http.eks_cluster_readiness[0]]
 }
 
 # ---------------------------------------------------------------------------------------------------------------------
@@ -25,7 +25,7 @@ module "aws_eks_self_managed_node_groups" {
   self_managed_ng = each.value
   context         = local.node_group_context
 
-  depends_on = [kubernetes_config_map.aws_auth]
+  depends_on = [module.aws_eks.cluster_id, data.http.eks_cluster_readiness[0]]
 }
 
 # ---------------------------------------------------------------------------------------------------------------------
@@ -40,5 +40,5 @@ module "aws_eks_fargate_profiles" {
   fargate_profile = each.value
   context         = local.fargate_context
 
-  depends_on = [kubernetes_config_map.aws_auth]
+  depends_on = [module.aws_eks.cluster_id, data.http.eks_cluster_readiness[0]]
 }
diff --git a/main.tf b/main.tf
@@ -94,7 +94,7 @@ module "emr_on_eks" {
   iam_role_permissions_boundary = var.iam_role_permissions_boundary
   tags                          = var.tags
 
-  depends_on = [kubernetes_config_map.aws_auth]
+  depends_on = [module.aws_eks.cluster_id, data.http.eks_cluster_readiness[0]]
 }
 
 resource "kubernetes_config_map" "amazon_vpc_cni" {