Skip to content

Commit ba7a99f

Browse files
committed
fix terraform plan
1 parent e10e4fa commit ba7a99f

File tree

3 files changed

+20
-21
lines changed

3 files changed

+20
-21
lines changed

ami.tf

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1-
data "aws_ssm_parameter" "eks_ami" {
2-
name = "/aws/service/eks/optimized-ami/${var.cluster_version}/amazon-linux-2/recommended/image_id"
1+
data "aws_ssm_parameter" "amis" {
2+
for_each = {
3+
"BOTTLEROCKET_ARM_64" = "/aws/service/bottlerocket/aws-k8s-${var.cluster_version}/arm64/latest/image_id",
4+
"BOTTLEROCKET_x86_64" = "/aws/service/bottlerocket/aws-k8s-${var.cluster_version}/x86_64/latest/image_id",
5+
"BOTTLEROCKET_ARM_64_NVIDIA" = "/aws/service/bottlerocket/aws-k8s-${var.cluster_version}-nvidia/arm64/latest/image_id",
6+
"BOTTLEROCKET_x86_64_NVIDIA" = "/aws/service/bottlerocket/aws-k8s-${var.cluster_version}-nvidia/x86_64/latest/image_id",
7+
"AL2023_x86_64_STANDARD" = "/aws/service/eks/optimized-ami/${var.cluster_version}/amazon-linux-2023/x86_64/standard/recommended/image_id",
8+
"AL2023_ARM_64_STANDARD" = "/aws/service/eks/optimized-ami/${var.cluster_version}/amazon-linux-2023/arm64/standard/recommended/image_id",
9+
"AL2023_x86_64_NEURON" = "/aws/service/eks/optimized-ami/${var.cluster_version}/amazon-linux-2023/x86_64/standard/recommended/image_id",
10+
"AL2023_x86_64_NVIDIA" = "/aws/service/eks/optimized-ami/${var.cluster_version}/amazon-linux-2023/x86_64/nvidia/recommended/image_id"
11+
}
12+
13+
name = each.value
314
}

node.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ resource "aws_launch_configuration" "asg_nodes" {
1616
for_each = var.asg_nodes
1717

1818
iam_instance_profile = aws_iam_instance_profile.node.name
19-
image_id = data.aws_ssm_parameter.eks_ami.value
19+
image_id = data.aws_ssm_parameter.amis["AL2023_x86_64_STANDARD"].value
2020
instance_type = each.value.instance_type
2121
name_prefix = "${var.environment_name}-nodes-${each.key}"
2222
spot_price = each.value.spot_price

node_groups.tf

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,11 @@
1-
data "aws_ssm_parameter" "amis" {
2-
for_each = {
3-
"AL2_x86_64" = "/aws/service/eks/optimized-ami/${var.cluster_version}/amazon-linux-2/recommended/image_id",
4-
"AL2_x86_64_GPU" = "/aws/service/eks/optimized-ami/${var.cluster_version}/amazon-linux-2-gpu/recommended/image_id",
5-
"AL2_ARM_64" = "/aws/service/eks/optimized-ami/${var.cluster_version}/amazon-linux-2-arm64/recommended/image_id",
6-
"BOTTLEROCKET_ARM_64" = "/aws/service/bottlerocket/aws-k8s-${var.cluster_version}/arm64/latest/image_id",
7-
"BOTTLEROCKET_x86_64" = "/aws/service/bottlerocket/aws-k8s-${var.cluster_version}/x86_64/latest/image_id",
8-
"BOTTLEROCKET_ARM_64_NVIDIA" = "/aws/service/bottlerocket/aws-k8s-${var.cluster_version}-nvidia/arm64/latest/image_id",
9-
"BOTTLEROCKET_x86_64_NVIDIA" = "/aws/service/bottlerocket/aws-k8s-${var.cluster_version}-nvidia/x86_64/latest/image_id",
10-
"AL2023_x86_64_STANDARD" = "/aws/service/eks/optimized-ami/${var.cluster_version}/amazon-linux-2023/x86_64/standard/recommended/image_id",
11-
"AL2023_ARM_64_STANDARD" = "/aws/service/eks/optimized-ami/${var.cluster_version}/amazon-linux-2023/arm64/standard/recommended/image_id",
12-
"AL2023_x86_64_NEURON" = "/aws/service/eks/optimized-ami/${var.cluster_version}/amazon-linux-2023/x86_64/standard/recommended/image_id",
13-
"AL2023_x86_64_NVIDIA" = "/aws/service/eks/optimized-ami/${var.cluster_version}/amazon-linux-2023/x86_64/standard/recommended/image_id"
14-
}
151

16-
name = each.value
17-
}
182

193
module "eks_custom_ami" {
20-
source = "github.com/terraform-aws-modules/terraform-aws-eks/modules/_user_data"
4+
source = "./_user_data"
215

226
# https://docs.aws.amazon.com/eks/latest/APIReference/API_Nodegroup.html#AmazonEKS-Type-Nodegroup-amiType
237
for_each = {
24-
for k, v in var.node_groups : k => v if lookup(v, "node_disk_encrypted", false) == true
8+
for k, v in var.node_groups : k => v if lookup(v, "node_disk_encrypted", false) == true
259
}
2610

2711
ami_type = each.value.ami_type
@@ -114,6 +98,10 @@ resource "aws_eks_node_group" "node_group" {
11498
max_unavailable_percentage = lookup(each.value, "update_unavailable_percent", 50)
11599
}
116100

101+
node_repair_config {
102+
enabled = lookup(each.value, "node_repair_enabled", true)
103+
}
104+
117105
dynamic "taint" {
118106
for_each = lookup(each.value, "taints", [])
119107
content {

0 commit comments

Comments
 (0)