Skip to content

Commit 95567b0

Browse files
michaelactmichaelact
committed
chore: case insensitive
1 parent de2aa10 commit 95567b0

File tree

2 files changed

+33
-31
lines changed

2 files changed

+33
-31
lines changed

‎modules/_user_data/main.tf‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,37 @@ resource "null_resource" "validate_cluster_service_cidr" {
1414
}
1515

1616
locals {
17-
is_al2 = startswith(var.ami_type, "AL2_")
18-
is_al2023 = startswith(var.ami_type, "AL2023_")
17+
ami_type = upper(var.ami_type)
18+
is_al2 = startswith(local.ami_type, "AL2_")
19+
is_al2023 = startswith(local.ami_type, "AL2023_")
1920

2021
# Converts AMI type into user data template path
2122
ami_type_to_user_data_path = {
2223
AL2_ARM_64 = "${path.module}/../../templates/al2_user_data.tpl"
23-
AL2_x86_64 = "${path.module}/../../templates/al2_user_data.tpl"
24-
AL2_x86_64_GPU = "${path.module}/../../templates/al2_user_data.tpl"
24+
AL2_X86_64 = "${path.module}/../../templates/al2_user_data.tpl"
25+
AL2_X86_64_GPU = "${path.module}/../../templates/al2_user_data.tpl"
2526

26-
AL2023_x86_64_STANDARD = "${path.module}/../../templates/al2023_user_data.tpl"
27+
AL2023_X86_64_STANDARD = "${path.module}/../../templates/al2023_user_data.tpl"
2728
AL2023_ARM_64_STANDARD = "${path.module}/../../templates/al2023_user_data.tpl"
28-
AL2023_x86_64_NEURON = "${path.module}/../../templates/al2023_user_data.tpl"
29-
AL2023_x86_64_NVIDIA = "${path.module}/../../templates/al2023_user_data.tpl"
29+
AL2023_X86_64_NEURON = "${path.module}/../../templates/al2023_user_data.tpl"
30+
AL2023_X86_64_NVIDIA = "${path.module}/../../templates/al2023_user_data.tpl"
3031
AL2023_ARM_64_NVIDIA = "${path.module}/../../templates/al2023_user_data.tpl"
3132

3233
BOTTLEROCKET_ARM_64 = "${path.module}/../../templates/bottlerocket_user_data.tpl"
33-
BOTTLEROCKET_x86_64 = "${path.module}/../../templates/bottlerocket_user_data.tpl"
34+
BOTTLEROCKET_X86_64 = "${path.module}/../../templates/bottlerocket_user_data.tpl"
3435
BOTTLEROCKET_ARM_64_FIPS = "${path.module}/../../templates/bottlerocket_user_data.tpl"
35-
BOTTLEROCKET_x86_64_FIPS = "${path.module}/../../templates/bottlerocket_user_data.tpl"
36+
BOTTLEROCKET_X86_64_FIPS = "${path.module}/../../templates/bottlerocket_user_data.tpl"
3637
BOTTLEROCKET_ARM_64_NVIDIA = "${path.module}/../../templates/bottlerocket_user_data.tpl"
37-
BOTTLEROCKET_x86_64_NVIDIA = "${path.module}/../../templates/bottlerocket_user_data.tpl"
38+
BOTTLEROCKET_X86_64_NVIDIA = "${path.module}/../../templates/bottlerocket_user_data.tpl"
3839

39-
WINDOWS_CORE_2019_x86_64 = "${path.module}/../../templates/windows_user_data.tpl"
40-
WINDOWS_FULL_2019_x86_64 = "${path.module}/../../templates/windows_user_data.tpl"
41-
WINDOWS_CORE_2022_x86_64 = "${path.module}/../../templates/windows_user_data.tpl"
42-
WINDOWS_FULL_2022_x86_64 = "${path.module}/../../templates/windows_user_data.tpl"
40+
WINDOWS_CORE_2019_X86_64 = "${path.module}/../../templates/windows_user_data.tpl"
41+
WINDOWS_FULL_2019_X86_64 = "${path.module}/../../templates/windows_user_data.tpl"
42+
WINDOWS_CORE_2022_X86_64 = "${path.module}/../../templates/windows_user_data.tpl"
43+
WINDOWS_FULL_2022_X86_64 = "${path.module}/../../templates/windows_user_data.tpl"
4344

4445
CUSTOM = var.user_data_template_path
4546
}
46-
user_data_path = coalesce(var.user_data_template_path, local.ami_type_to_user_data_path[var.ami_type])
47+
user_data_path = coalesce(var.user_data_template_path, local.ami_type_to_user_data_path[local.ami_type])
4748

4849
cluster_dns_ips = flatten(concat([try(cidrhost(var.cluster_service_cidr, 10), "")], var.additional_cluster_dns_ips))
4950

‎modules/eks-managed-node-group/main.tf‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ data "aws_caller_identity" "current" {
88
locals {
99
partition = try(data.aws_partition.current[0].partition, var.partition)
1010
account_id = try(data.aws_caller_identity.current[0].account_id, var.account_id)
11+
ami_type = upper(var.ami_type)
1112
}
1213

1314
################################################################################
@@ -18,7 +19,7 @@ module "user_data" {
1819
source = "../_user_data"
1920

2021
create = var.create
21-
ami_type = var.ami_type
22+
ami_type = local.ami_type
2223

2324
cluster_name = var.cluster_name
2425
cluster_endpoint = var.cluster_endpoint
@@ -395,28 +396,28 @@ data "aws_eks_cluster_versions" "this" {
395396
locals {
396397
# Just to ensure templating doesn't fail when values are not provided
397398
ssm_kubernetes_version = var.kubernetes_version != null ? var.kubernetes_version : try(data.aws_eks_cluster_versions.this[0].cluster_versions[0].cluster_version, "UNSPECIFIED")
398-
ssm_ami_type = var.ami_type != null ? var.ami_type : ""
399+
ssm_ami_type = local.ami_type != null ? local.ami_type : ""
399400

400401
# Map the AMI type to the respective SSM param path
401402
ssm_ami_type_to_ssm_param = {
402-
AL2_x86_64 = "/aws/service/eks/optimized-ami/${local.ssm_kubernetes_version}/amazon-linux-2/recommended/release_version"
403-
AL2_x86_64_GPU = "/aws/service/eks/optimized-ami/${local.ssm_kubernetes_version}/amazon-linux-2-gpu/recommended/release_version"
403+
AL2_X86_64 = "/aws/service/eks/optimized-ami/${local.ssm_kubernetes_version}/amazon-linux-2/recommended/release_version"
404+
AL2_X86_64_GPU = "/aws/service/eks/optimized-ami/${local.ssm_kubernetes_version}/amazon-linux-2-gpu/recommended/release_version"
404405
AL2_ARM_64 = "/aws/service/eks/optimized-ami/${local.ssm_kubernetes_version}/amazon-linux-2-arm64/recommended/release_version"
405406
CUSTOM = "NONE"
406407
BOTTLEROCKET_ARM_64 = "/aws/service/bottlerocket/aws-k8s-${local.ssm_kubernetes_version}/arm64/latest/image_version"
407-
BOTTLEROCKET_x86_64 = "/aws/service/bottlerocket/aws-k8s-${local.ssm_kubernetes_version}/x86_64/latest/image_version"
408+
BOTTLEROCKET_X86_64 = "/aws/service/bottlerocket/aws-k8s-${local.ssm_kubernetes_version}/x86_64/latest/image_version"
408409
BOTTLEROCKET_ARM_64_FIPS = "/aws/service/bottlerocket/aws-k8s-${local.ssm_kubernetes_version}-fips/arm64/latest/image_version"
409-
BOTTLEROCKET_x86_64_FIPS = "/aws/service/bottlerocket/aws-k8s-${local.ssm_kubernetes_version}-fips/x86_64/latest/image_version"
410+
BOTTLEROCKET_X86_64_FIPS = "/aws/service/bottlerocket/aws-k8s-${local.ssm_kubernetes_version}-fips/x86_64/latest/image_version"
410411
BOTTLEROCKET_ARM_64_NVIDIA = "/aws/service/bottlerocket/aws-k8s-${local.ssm_kubernetes_version}-nvidia/arm64/latest/image_version"
411-
BOTTLEROCKET_x86_64_NVIDIA = "/aws/service/bottlerocket/aws-k8s-${local.ssm_kubernetes_version}-nvidia/x86_64/latest/image_version"
412-
WINDOWS_CORE_2019_x86_64 = "/aws/service/ami-windows-latest/Windows_Server-2019-English-Full-EKS_Optimized-${local.ssm_kubernetes_version}"
413-
WINDOWS_FULL_2019_x86_64 = "/aws/service/ami-windows-latest/Windows_Server-2019-English-Core-EKS_Optimized-${local.ssm_kubernetes_version}"
414-
WINDOWS_CORE_2022_x86_64 = "/aws/service/ami-windows-latest/Windows_Server-2022-English-Full-EKS_Optimized-${local.ssm_kubernetes_version}"
415-
WINDOWS_FULL_2022_x86_64 = "/aws/service/ami-windows-latest/Windows_Server-2022-English-Core-EKS_Optimized-${local.ssm_kubernetes_version}"
416-
AL2023_x86_64_STANDARD = "/aws/service/eks/optimized-ami/${local.ssm_kubernetes_version}/amazon-linux-2023/x86_64/standard/recommended/release_version"
412+
BOTTLEROCKET_X86_64_NVIDIA = "/aws/service/bottlerocket/aws-k8s-${local.ssm_kubernetes_version}-nvidia/x86_64/latest/image_version"
413+
WINDOWS_CORE_2019_X86_64 = "/aws/service/ami-windows-latest/Windows_Server-2019-English-Full-EKS_Optimized-${local.ssm_kubernetes_version}"
414+
WINDOWS_FULL_2019_X86_64 = "/aws/service/ami-windows-latest/Windows_Server-2019-English-Core-EKS_Optimized-${local.ssm_kubernetes_version}"
415+
WINDOWS_CORE_2022_X86_64 = "/aws/service/ami-windows-latest/Windows_Server-2022-English-Full-EKS_Optimized-${local.ssm_kubernetes_version}"
416+
WINDOWS_FULL_2022_X86_64 = "/aws/service/ami-windows-latest/Windows_Server-2022-English-Core-EKS_Optimized-${local.ssm_kubernetes_version}"
417+
AL2023_X86_64_STANDARD = "/aws/service/eks/optimized-ami/${local.ssm_kubernetes_version}/amazon-linux-2023/x86_64/standard/recommended/release_version"
417418
AL2023_ARM_64_STANDARD = "/aws/service/eks/optimized-ami/${local.ssm_kubernetes_version}/amazon-linux-2023/arm64/standard/recommended/release_version"
418-
AL2023_x86_64_NEURON = "/aws/service/eks/optimized-ami/${local.ssm_kubernetes_version}/amazon-linux-2023/x86_64/neuron/recommended/release_version"
419-
AL2023_x86_64_NVIDIA = "/aws/service/eks/optimized-ami/${local.ssm_kubernetes_version}/amazon-linux-2023/x86_64/nvidia/recommended/release_version"
419+
AL2023_X86_64_NEURON = "/aws/service/eks/optimized-ami/${local.ssm_kubernetes_version}/amazon-linux-2023/x86_64/neuron/recommended/release_version"
420+
AL2023_X86_64_NVIDIA = "/aws/service/eks/optimized-ami/${local.ssm_kubernetes_version}/amazon-linux-2023/x86_64/nvidia/recommended/release_version"
420421
AL2023_ARM_64_NVIDIA = "/aws/service/eks/optimized-ami/${local.ssm_kubernetes_version}/amazon-linux-2023/arm64/nvidia/recommended/release_version"
421422
}
422423

@@ -431,7 +432,7 @@ data "aws_ssm_parameter" "ami" {
431432

432433
region = var.region
433434

434-
name = local.ssm_ami_type_to_ssm_param[var.ami_type]
435+
name = local.ssm_ami_type_to_ssm_param[local.ami_type]
435436
}
436437

437438
################################################################################
@@ -465,7 +466,7 @@ resource "aws_eks_node_group" "this" {
465466
node_group_name_prefix = var.use_name_prefix ? "${var.name}-" : null
466467

467468
# https://docs.aws.amazon.com/eks/latest/userguide/launch-templates.html#launch-template-custom-ami
468-
ami_type = var.ami_id != "" ? null : var.ami_type
469+
ami_type = var.ami_id != "" ? null : local.ami_type
469470
release_version = var.ami_id != "" ? null : var.use_latest_ami_release_version ? local.latest_ami_release_version : var.ami_release_version
470471
version = var.ami_id != "" ? null : var.kubernetes_version
471472

0 commit comments

Comments
 (0)