Skip to content

Commit

Permalink
Merge pull request #120 from kbst/eksawsauthfix2
Browse files Browse the repository at this point in the history
EKS: Remove data source for causing problems on destroy
  • Loading branch information
pst authored Aug 13, 2020
2 parents 59ab383 + b2f6261 commit 89e5fe0
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 19 deletions.
4 changes: 0 additions & 4 deletions aws/_modules/eks/node_pool.tf
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
module "node_pool" {
providers = {
kubernetes = kubernetes.eks
}

source = "./node_pool"

metadata_labels = var.metadata_labels
Expand Down
16 changes: 1 addition & 15 deletions aws/_modules/eks/node_pool/main.tf
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
data "kubernetes_config_map" "aws_auth" {
# Force an explicit depends_on, on the configmap
# before creating the node pool
# Otherwise the aws_eks_node_group resource
# creates the configmap leaving TF to error
# out because it already exists

metadata {
name = var.depends-on-aws-auth.name
namespace = var.depends-on-aws-auth.namespace
}
}


resource "aws_eks_node_group" "nodes" {
cluster_name = var.cluster_name
node_group_name = var.node_group_name
Expand All @@ -30,5 +16,5 @@ resource "aws_eks_node_group" "nodes" {
tags = var.eks_metadata_tags
labels = var.metadata_labels

depends_on = [data.kubernetes_config_map.aws_auth]
depends_on = [var.depends-on-aws-auth]
}

0 comments on commit 89e5fe0

Please sign in to comment.