DT-521 use AL2023 (#33)

* update ami node type gp3

* remove ubuntu18

* remove ubuntu18 add al2023

Author: christopher-comet

main.tf

@@ -93,28 +93,6 @@ module "comet_eks" {
   eks_airflow_node_count      = var.eks_airflow_node_count
 }
 
-resource "kubernetes_storage_class" "gp3" {
-  metadata {
-    name = "gp3"
-    annotations = {
-      "storageclass.kubernetes.io/is-default-class" = "true"
-    }
-  }
-
-  storage_provisioner = "ebs.csi.aws.com"
-
-  parameters = {
-    type = "gp3"
-    # Optionally, set iops and throughput:
-    # iops       = "3000"
-    # throughput = "125"
-  }
-
-  reclaim_policy         = "Delete"
-  volume_binding_mode    = "WaitForFirstConsumer"
-  allow_volume_expansion = true
-}
-
 module "comet_elasticache" {
   source      = "./modules/comet_elasticache"
   count       = var.enable_elasticache ? 1 : 0

modules/comet_ec2/main.tf

@@ -6,28 +6,33 @@ locals {
   cidr_anywhere = "0.0.0.0/0"
 }
 
-data "aws_ami" "al2" {
+data "aws_ami" "al2023" {
   most_recent = true
 
   filter {
     name   = "name"
-    values = ["amzn2-ami-hvm-*-x86_64-gp2"]
+    values = ["al2023-ami-*-x86_64"]
+  }
+
+  filter {
+    name   = "architecture"
+    values = ["x86_64"]
   }
 
   filter {
     name   = "root-device-type"
     values = ["ebs"]
   }
 
-  owners = ["amazon"]
+  owners = ["137112412989"] # Amazon official
 }
 
-data "aws_ami" "rhel7" {
+data "aws_ami" "al2" {
   most_recent = true
 
   filter {
     name   = "name"
-    values = ["RHEL-7*_HVM-*"]
+    values = ["amzn2-ami-hvm-*-x86_64-gp2"]
   }
 
   filter {
@@ -38,12 +43,12 @@ data "aws_ami" "rhel7" {
   owners = ["amazon"]
 }
 
-data "aws_ami" "rhel8" {
+data "aws_ami" "rhel7" {
   most_recent = true
 
   filter {
     name   = "name"
-    values = ["RHEL-8*_HVM-*"]
+    values = ["RHEL-7*_HVM-*"]
   }
 
   filter {
@@ -54,12 +59,12 @@ data "aws_ami" "rhel8" {
   owners = ["amazon"]
 }
 
-data "aws_ami" "rhel9" {
+data "aws_ami" "rhel8" {
   most_recent = true
 
   filter {
     name   = "name"
-    values = ["RHEL-9*_HVM-*"]
+    values = ["RHEL-8*_HVM-*"]
   }
 
   filter {
@@ -70,12 +75,12 @@ data "aws_ami" "rhel9" {
   owners = ["amazon"]
 }
 
-data "aws_ami" "ubuntu18" {
+data "aws_ami" "rhel9" {
   most_recent = true
 
   filter {
     name   = "name"
-    values = ["ubuntu/images/hvm-ssd/ubuntu-*-18.04-amd64-server-*"]
+    values = ["RHEL-9*_HVM-*"]
   }
 
   filter {
@@ -120,11 +125,11 @@ data "aws_ami" "ubuntu22" {
 
 resource "aws_instance" "comet_ec2" {
   ami = var.comet_ec2_ami_id != "" ? var.comet_ec2_ami_id : (
-    var.comet_ec2_ami_type == "al2" ? data.aws_ami.al2.id : (
-      var.comet_ec2_ami_type == "rhel7" ? data.aws_ami.rhel7.id : (
-        var.comet_ec2_ami_type == "rhel8" ? data.aws_ami.rhel8.id : (
-          var.comet_ec2_ami_type == "rhel9" ? data.aws_ami.rhel9.id : (
-            var.comet_ec2_ami_type == "ubuntu18" ? data.aws_ami.ubuntu18.id : (
+    var.comet_ec2_ami_type == "al2023" ? data.aws_ami.al2023.id : (
+      var.comet_ec2_ami_type == "al2" ? data.aws_ami.al2.id : (
+        var.comet_ec2_ami_type == "rhel7" ? data.aws_ami.rhel7.id : (
+          var.comet_ec2_ami_type == "rhel8" ? data.aws_ami.rhel8.id : (
+            var.comet_ec2_ami_type == "rhel9" ? data.aws_ami.rhel9.id : (              
               var.comet_ec2_ami_type == "ubuntu20" ? data.aws_ami.ubuntu20.id : (
                 var.comet_ec2_ami_type == "ubuntu22" ? data.aws_ami.ubuntu22.id : (
                   null))))))))

modules/comet_eks/main.tf

@@ -140,4 +140,26 @@ module "eks_blueprints_addons" {
   enable_aws_cloudwatch_metrics       = var.eks_aws_cloudwatch_metrics
   enable_external_dns                 = var.eks_external_dns
   external_dns_route53_zone_arns      = var.eks_external_dns_r53_zones
+}
+
+resource "kubernetes_storage_class" "gp3" {
+  metadata {
+    name = "gp3"
+    annotations = {
+      "storageclass.kubernetes.io/is-default-class" = "true"
+    }
+  }
+
+  storage_provisioner = "ebs.csi.aws.com"
+
+  parameters = {
+    type = "gp3"
+    # Optionally, set iops and throughput:
+    # iops       = "3000"
+    # throughput = "125"
+  }
+
+  reclaim_policy         = "Delete"
+  volume_binding_mode    = "WaitForFirstConsumer"
+  allow_volume_expansion = true
 }

variables.tf

@@ -96,8 +96,8 @@ variable "comet_ec2_ami_type" {
   description = "Operating system type for the EC2 instance AMI"
   default     = "ubuntu22"
   validation {
-    condition     = can(regex("^al2$|^rhel(7|8|9)$|^ubuntu(18|20|22)$", var.comet_ec2_ami_type))
-    error_message = "Invalid OS type. Allowed values are 'al2', 'rhel7', 'rhel8', 'rhel9', 'ubuntu18', 'ubuntu20', 'ubuntu22'."
+    condition     = can(regex("^al2$|^al2023$|^rhel(7|8|9)$|^ubuntu(18|20|22)$", var.comet_ec2_ami_type))
+    error_message = "Invalid OS type. Allowed values are 'al2', 'al2023', 'rhel7', 'rhel8', 'rhel9', 'ubuntu20', 'ubuntu22'."
   }
 }
 
@@ -110,7 +110,7 @@ variable "comet_ec2_ami_id" {
 variable "comet_ec2_instance_type" {
   description = "Instance type for the EC2 instance"
   type        = string
-  default     = "m5.4xlarge"
+  default     = "m7i.4xlarge"
 }
 
 variable "comet_ec2_instance_count" {
@@ -122,7 +122,7 @@ variable "comet_ec2_instance_count" {
 variable "comet_ec2_volume_type" {
   description = "EBS volume type for the EC2 instance root volume"
   type        = string
-  default     = "gp2"
+  default     = "gp3"
 }
 
 variable "comet_ec2_volume_size" {
@@ -166,13 +166,13 @@ variable "eks_mng_name" {
 variable "eks_mng_ami_type" {
   description = "AMI family to use for the EKS nodes"
   type        = string
-  default     = "AL2_x86_64"
+  default     = "AL2023_x86_64_STANDARD"
 }
 
 variable "eks_node_types" {
   description = "Node instance types for EKS managed node group"
   type        = list(string)
-  default     = ["m6i.4xlarge"]
+  default     = ["m7i.4xlarge"]
 }
 
 variable "eks_mng_desired_size" {