Merge branch 'master' into rebuild-examples

terraform-aws-modules · Oct 12, 2021 · 41530d9 · 41530d9
2 parents 7ea520b + 54a5f1e
commit 41530d9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/modules/node_groups/launch_template.tf b/modules/node_groups/launch_template.tf
@@ -14,8 +14,8 @@ data "cloudinit_config" "workers_userdata" {
         ami_id               = lookup(each.value, "ami_id", "")
         ami_is_eks_optimized = each.value["ami_is_eks_optimized"]
         cluster_name         = var.cluster_name
-        cluster_endpoint     = data.aws_eks_cluster.default.endpoint
-        cluster_ca           = data.aws_eks_cluster.default.certificate_authority[0].data
+        cluster_endpoint     = data.aws_eks_cluster.default[0].endpoint
+        cluster_ca           = data.aws_eks_cluster.default[0].certificate_authority[0].data
         capacity_type        = lookup(each.value, "capacity_type", "ON_DEMAND")
         append_labels        = length(lookup(each.value, "k8s_labels", {})) > 0 ? ",${join(",", [for k, v in lookup(each.value, "k8s_labels", {}) : "${k}=${v}"])}" : ""
       }

diff --git a/modules/node_groups/locals.tf b/modules/node_groups/locals.tf
@@ -1,4 +1,6 @@
 data "aws_eks_cluster" "default" {
+  count = var.create_eks ? 1 : 0
+
   name = var.cluster_name
 }