added the additional_security_group_ids variable to the checks that t…

…he launch template depends on
DreamLab · Apr 16, 2021 · 3148848 · 3148848
1 parent aa3335a
commit 3148848
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/launch-template.tf b/launch-template.tf
@@ -40,7 +40,8 @@ locals {
   launch_template_vpc_security_group_ids = (
     concat(
       local.ng.additional_security_group_ids,
-      local.need_remote_access_sg ? concat(data.aws_eks_cluster.this[0].vpc_config[*].cluster_security_group_id, aws_security_group.remote_access.*.id) : []
+      data.aws_eks_cluster.this[0].vpc_config[*].cluster_security_group_id,
+      local.need_remote_access_sg ? aws_security_group.remote_access.*.id : []
     )
   )
 

diff --git a/main.tf b/main.tf
@@ -6,13 +6,13 @@ locals {
   configured_ami_image_id = var.ami_image_id == null ? "" : var.ami_image_id
   need_ami_id             = local.enabled ? local.features_require_ami && length(local.configured_ami_image_id) == 0 : false
 
-  features_require_launch_template = local.enabled ? length(var.resources_to_tag) > 0 || local.need_userdata || local.features_require_ami : false
+  features_require_launch_template = local.enabled ? length(var.resources_to_tag) > 0 || local.need_userdata || local.features_require_ami || length(var.additional_security_group_ids) > 0 : false
 
   have_ssh_key = var.ec2_ssh_key != null && var.ec2_ssh_key != ""
 
   need_remote_access_sg = local.enabled && local.have_ssh_key && local.generate_launch_template
 
-  get_cluster_data = local.enabled ? (local.need_cluster_kubernetes_version || local.need_bootstrap || local.need_remote_access_sg) : false
+  get_cluster_data = local.enabled ? (local.need_cluster_kubernetes_version || local.need_bootstrap || local.need_remote_access_sg || length(var.additional_security_group_ids) > 0) : false
 
   autoscaler_enabled = var.enable_cluster_autoscaler != null ? var.enable_cluster_autoscaler : var.cluster_autoscaler_enabled == true
   #