feat(eks-official-image): support ubuntu 24.04 eks images

Author: posquit0

modules/eks-official-image/README.md

@@ -7,7 +7,7 @@ This module creates following resources.
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.10 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.6 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.42 |
 
 ## Providers
@@ -31,7 +31,7 @@ No modules.
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | <a name="input_kubernetes_version"></a> [kubernetes\_version](#input\_kubernetes\_version) | (Required) Desired Kubernetes version to search the official EKS AMIs for the EKS cluster. | `string` | n/a | yes |
-| <a name="input_os"></a> [os](#input\_os) | (Required) A configuration of OS (Operating System) to search EKS official AMIs. `os` block as defined below.<br/>    (Required) `name` - A name of the OS (Operating System). Valid values are `amazon-linux`, `ubuntu`, `ubuntu-pro`.<br/>    (Required) `release` - A release name of the OS.<br/>      `amazon-linux` - Valid values are `2`, `2023`.<br/>      `ubuntu` - Valid values are `18.04`, `20.04`, `22.04`, `24.04`.<br/>      `ubuntu-pro` - Same with `ubuntu`. | <pre>object({<br/>    name    = string<br/>    release = string<br/>  })</pre> | n/a | yes |
+| <a name="input_os"></a> [os](#input\_os) | (Required) A configuration of OS (Operating System) to search EKS official AMIs. `os` block as defined below.<br/>    (Required) `name` - A name of the OS (Operating System). Valid values are `amazon-linux`, `ubuntu`, `ubuntu-pro`.<br/>    (Required) `release` - A release name of the OS.<br/>      `amazon-linux` - Valid values are `2`, `2023`.<br/>      `ubuntu` - Valid values are `18.04`, `20.04`, `22.04`, `24.04`, `26.04`.<br/>      `ubuntu-pro` - Same with `ubuntu`. | <pre>object({<br/>    name    = string<br/>    release = string<br/>  })</pre> | n/a | yes |
 | <a name="input_arch"></a> [arch](#input\_arch) | (Optional) The type of the CPU architecture. Valid values are `amd64`, `arm64`. Defaults to `amd64`. | `string` | `"amd64"` | no |
 
 ## Outputs

modules/eks-official-image/main.tf

@@ -23,6 +23,17 @@ locals {
       "ubuntu-pro" = "/aws/service/canonical/ubuntu/eks-pro"
     }
   }
+  ubuntu_ebs_volume_type = {
+    "18.04"  = "ebs-gp2"
+    "bionic" = "ebs-gp2"
+    "20.04"  = "ebs-gp2"
+    "focal"  = "ebs-gp2"
+    "22.04"  = "ebs-gp2"
+    "jammy"  = "ebs-gp2"
+    "24.04"  = "ebs-gp3"
+    "noble"  = "ebs-gp3"
+    "26.04"  = "ebs-gp3"
+  }
   parameter_name = (var.os.name == "amazon-linux"
     ? join("/", [
       "/aws/service/eks/optimized-ami/${var.kubernetes_version}",
@@ -36,7 +47,7 @@ locals {
         var.kubernetes_version,
         "stable/current",
         var.arch,
-        "hvm/ebs-gp2/ami-id",
+        "hvm/${local.ubuntu_ebs_volume_type[var.os.name]}/ami-id",
       ])
       : null
     )

modules/eks-official-image/variables.tf

@@ -10,7 +10,7 @@ variable "os" {
     (Required) `name` - A name of the OS (Operating System). Valid values are `amazon-linux`, `ubuntu`, `ubuntu-pro`.
     (Required) `release` - A release name of the OS.
       `amazon-linux` - Valid values are `2`, `2023`.
-      `ubuntu` - Valid values are `18.04`, `20.04`, `22.04`, `24.04`.
+      `ubuntu` - Valid values are `18.04`, `20.04`, `22.04`, `24.04`, `26.04`.
       `ubuntu-pro` - Same with `ubuntu`.
   EOF
   type = object({
@@ -26,9 +26,9 @@ variable "os" {
   validation {
     condition = anytrue([
       var.os.name == "amazon-linux" && contains(["2", "2023"], var.os.release),
-      contains(["ubuntu", "ubuntu-pro"], var.os.name) && contains(["18.04", "20.04", "22.04", "24.04"], var.os.release),
+      contains(["ubuntu", "ubuntu-pro"], var.os.name) && contains(["18.04", "20.04", "22.04", "24.04", "26.04"], var.os.release),
     ])
-    error_message = "Valid values for `os.release` are `2`, `2023` when `os.name` is `amazon-linux`. Valid values for `os.release` are `18.04`, `20.04`, `22.04`, `24.04` when `os.name` is `ubuntu` or `ubuntu-pro`."
+    error_message = "Valid values for `os.release` are `2`, `2023` when `os.name` is `amazon-linux`. Valid values for `os.release` are `18.04`, `20.04`, `22.04`, `24.04`, `26.04` when `os.name` is `ubuntu` or `ubuntu-pro`."
   }
 }