Skip to content

Commit 96419bb

Browse files
authored
Add user data to AMIs (#457)
* Clean up node_groups * FIx * Added custom ami * Test * Revert "Test" This reverts commit 08deb1f.
1 parent a0b8184 commit 96419bb

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

node_groups.tf

+6-10
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ module "eks_custom_ami" {
2020
source = "github.com/terraform-aws-modules/terraform-aws-eks/modules/_user_data"
2121

2222
# https://docs.aws.amazon.com/eks/latest/APIReference/API_Nodegroup.html#AmazonEKS-Type-Nodegroup-amiType
23-
for_each = toset([
24-
for k, v in var.node_groups : v.ami_type if lookup(v, "node_disk_encrypted", false) == true
25-
])
23+
for_each = {
24+
for k, v in var.node_groups : k => v if lookup(v, "node_disk_encrypted", false) == true
25+
}
2626

27-
ami_type = each.key
27+
ami_type = each.value.ami_type
2828

2929
cluster_name = var.environment_name
3030
cluster_endpoint = aws_eks_cluster.cluster.endpoint
@@ -33,19 +33,15 @@ module "eks_custom_ami" {
3333

3434
enable_bootstrap_user_data = true
3535

36-
# bootstrap_extra_args = <<-EOT
37-
# # extra args added
38-
# [settings.kernel]
39-
# lockdown = "integrity"
40-
# EOT
36+
bootstrap_extra_args = lookup(each.value, "ami_bootstrap_extra_args", "")
4137
}
4238

4339
resource "aws_launch_template" "encrypted_launch_template" {
4440
for_each = { for k, v in var.node_groups : k => v if lookup(v, "node_disk_encrypted", false) }
4541

4642
name_prefix = "${var.environment_name}-${each.key}"
4743
image_id = data.aws_ssm_parameter.amis[each.value.ami_type].value
48-
user_data = module.eks_custom_ami[each.value.ami_type].user_data
44+
user_data = module.eks_custom_ami[each.key].user_data
4945

5046
metadata_options {
5147
http_endpoint = "enabled"

0 commit comments

Comments
 (0)