From 55865f5f9d4b66bf748898b2174fc0d01897fd91 Mon Sep 17 00:00:00 2001 From: Uijin Lee <100072451+dml113@users.noreply.github.com> Date: Tue, 29 Oct 2024 19:35:19 +0900 Subject: [PATCH 1/5] Update node_groups.tf --- node_groups.tf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/node_groups.tf b/node_groups.tf index 4ac638100a..bf7b92ad83 100644 --- a/node_groups.tf +++ b/node_groups.tf @@ -305,7 +305,7 @@ module "eks_managed_node_group" { # EKS Managed Node Group name = try(each.value.name, each.key) - use_name_prefix = try(each.value.use_name_prefix, var.eks_managed_node_group_defaults.use_name_prefix, true) + use_name_prefix = try(each.value.use_name_prefix, false) subnet_ids = try(each.value.subnet_ids, var.eks_managed_node_group_defaults.subnet_ids, var.subnet_ids) @@ -435,7 +435,6 @@ module "self_managed_node_group" { min_size = try(each.value.min_size, var.self_managed_node_group_defaults.min_size, 0) max_size = try(each.value.max_size, var.self_managed_node_group_defaults.max_size, 3) desired_size = try(each.value.desired_size, var.self_managed_node_group_defaults.desired_size, 1) - desired_size_type = try(each.value.desired_size_type, var.self_managed_node_group_defaults.desired_size_type, null) capacity_rebalance = try(each.value.capacity_rebalance, var.self_managed_node_group_defaults.capacity_rebalance, null) min_elb_capacity = try(each.value.min_elb_capacity, var.self_managed_node_group_defaults.min_elb_capacity, null) wait_for_elb_capacity = try(each.value.wait_for_elb_capacity, var.self_managed_node_group_defaults.wait_for_elb_capacity, null) From 76538bcf5df109629ea24861ff6641f71ce32b70 Mon Sep 17 00:00:00 2001 From: Uijin Lee <100072451+dml113@users.noreply.github.com> Date: Tue, 29 Oct 2024 19:35:29 +0900 Subject: [PATCH 2/5] Update main.tf --- main.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/main.tf b/main.tf index b891b26d0e..b13602ad6d 100644 --- a/main.tf +++ b/main.tf @@ -191,6 +191,7 @@ locals { association_policy_arn = pol_val.policy_arn association_access_scope_type = pol_val.access_scope.type association_access_scope_namespaces = lookup(pol_val.access_scope, "namespaces", []) + } : k => v if !contains(["EC2_LINUX", "EC2_WINDOWS", "FARGATE_LINUX"], lookup(entry_val, "type", "STANDARD")) }, ) ] From 38e15dd0f0e0ce53dd918e3a03a0e560c177966d Mon Sep 17 00:00:00 2001 From: Uijin Lee <100072451+dml113@users.noreply.github.com> Date: Tue, 29 Oct 2024 19:35:56 +0900 Subject: [PATCH 3/5] Update main.tf --- modules/eks-managed-node-group/main.tf | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/eks-managed-node-group/main.tf b/modules/eks-managed-node-group/main.tf index 42c221dc91..9c0c78c9c4 100644 --- a/modules/eks-managed-node-group/main.tf +++ b/modules/eks-managed-node-group/main.tf @@ -362,8 +362,6 @@ locals { WINDOWS_FULL_2022_x86_64 = "/aws/service/ami-windows-latest/Windows_Server-2022-English-Core-EKS_Optimized-${local.ssm_cluster_version}" AL2023_x86_64_STANDARD = "/aws/service/eks/optimized-ami/${local.ssm_cluster_version}/amazon-linux-2023/x86_64/standard/recommended/release_version" AL2023_ARM_64_STANDARD = "/aws/service/eks/optimized-ami/${local.ssm_cluster_version}/amazon-linux-2023/arm64/standard/recommended/release_version" - AL2023_x86_64_NEURON = "/aws/service/eks/optimized-ami/${local.ssm_cluster_version}/amazon-linux-2023/x86_64/neuron/recommended/release_version" - AL2023_x86_64_NVIDIA = "/aws/service/eks/optimized-ami/${local.ssm_cluster_version}/amazon-linux-2023/x86_64/nvidia/recommended/release_version" } # The Windows SSM params currently do not have a release version, so we have to get the full output JSON blob and parse out the release version From 22343199e957d07b5b92785dc54135d88fdc6c13 Mon Sep 17 00:00:00 2001 From: Uijin Lee <100072451+dml113@users.noreply.github.com> Date: Tue, 29 Oct 2024 19:36:16 +0900 Subject: [PATCH 4/5] Update variables.tf --- modules/eks-managed-node-group/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/eks-managed-node-group/variables.tf b/modules/eks-managed-node-group/variables.tf index bb60b85665..3d88e62d5d 100644 --- a/modules/eks-managed-node-group/variables.tf +++ b/modules/eks-managed-node-group/variables.tf @@ -371,7 +371,7 @@ variable "name" { variable "use_name_prefix" { description = "Determines whether to use `name` as is or create a unique name beginning with the `name` as the prefix" type = bool - default = true + default = false } variable "ami_type" { From 17d8ead249c3c4a7c6730dc7a1dccc03f2b69fa6 Mon Sep 17 00:00:00 2001 From: Uijin Lee <100072451+dml113@users.noreply.github.com> Date: Tue, 29 Oct 2024 21:36:24 +0900 Subject: [PATCH 5/5] Update node_groups.tf --- node_groups.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node_groups.tf b/node_groups.tf index bf7b92ad83..05bbed6614 100644 --- a/node_groups.tf +++ b/node_groups.tf @@ -305,7 +305,7 @@ module "eks_managed_node_group" { # EKS Managed Node Group name = try(each.value.name, each.key) - use_name_prefix = try(each.value.use_name_prefix, false) + use_name_prefix = false subnet_ids = try(each.value.subnet_ids, var.eks_managed_node_group_defaults.subnet_ids, var.subnet_ids)