Clean up

Author: abhiyerra

karpenter.tf

@@ -72,9 +72,7 @@ resource "helm_release" "karpenter_crd" {
   version    = var.karpenter_version
 }
 
-data "aws_ssm_parameter" "eks_al2_ami" {
-  name = "/aws/service/eks/optimized-ami/${var.cluster_version}/amazon-linux-2/recommended/image_id"
-}
+
 
 
 resource "null_resource" "karpenter_ec2_node_class_apply" {
@@ -104,15 +102,15 @@ spec:
         volumeSize: 50Gi
         volumeType: gp3
         encrypted: true
-  amiFamily: ${var.ami_family}
+  amiFamily: ${var.karpenter_ami_family}
   role: ${aws_iam_role.node.name}
   securityGroupSelectorTerms:
   - id: ${aws_eks_cluster.cluster.vpc_config[0].cluster_security_group_id}
   subnetSelectorTerms:
   - id: ${aws_subnet.public[0].id}
   - id: ${aws_subnet.public[1].id}
   amiSelectorTerms:
-    - id: "${var.ami_family == "AL2" ? data.aws_ssm_parameter.eks_al2_ami.value : data.aws_ssm_parameter.bottlerocket_image_id.value}"
+    - id: "${var.karpenter_ami_family == "AL2" ? data.aws_ssm_parameter.eks_al2_ami.value : data.aws_ssm_parameter.bottlerocket_ami.value}"
 EOF
 EOT
   }

node_groups.tf

@@ -1,7 +1,11 @@
-data "aws_ssm_parameter" "bottlerocket_image_id" {
+data "aws_ssm_parameter" "bottlerocket_ami" {
   name = "/aws/service/bottlerocket/aws-k8s-${var.cluster_version}/x86_64/latest/image_id"
 }
 
+data "aws_ssm_parameter" "eks_al2_ami" {
+  name = "/aws/service/eks/optimized-ami/${var.cluster_version}/amazon-linux-2/recommended/image_id"
+}
+
 module "eks_mng_bottlerocket_custom_ami" {
   source = "github.com/terraform-aws-modules/terraform-aws-eks/modules/_user_data"
 

variables.tf

@@ -390,6 +390,12 @@ variable "karpenter_version" {
   description = "The version of the karpenter helm chart"
 }
 
+variable "karpenter_ami_family" {
+  description = "AMI family to use for the EC2 Node Class. Possible values: AL2 or Bottlerocket"
+  type        = string
+  default     = "Bottlerocket"
+}
+
 variable "csi_secrets_store_enabled" {
   default     = false
   description = "Specify whether the CSI driver is enabled on the EKS cluster"
@@ -450,8 +456,3 @@ variable "s3_csi_bucket_names" {
   default     = [""]
 }
 
-variable "ami_family" {
-  description = "AMI family to use for the EC2 Node Class. Possible values: AL2 or Bottlerocket"
-  type        = string
-  default     = "AL2"
-}