From 55c502f628d53e2b3f3882f4f0abb8f0e8ce500b Mon Sep 17 00:00:00 2001
From: Hari Sekhon <harisekhon@gmail.com>
Date: Fri, 31 Jan 2025 18:20:59 +0700
Subject: [PATCH] updated aws_eks_create_custom_ami.sh

---
 aws/aws_eks_create_custom_ami.sh | 74 ++++++++++++++++++--------------
 1 file changed, 42 insertions(+), 32 deletions(-)

diff --git a/aws/aws_eks_create_custom_ami.sh b/aws/aws_eks_create_custom_ami.sh
index f4f01bf9c4b..930f6f80bee 100755
--- a/aws/aws_eks_create_custom_ami.sh
+++ b/aws/aws_eks_create_custom_ami.sh
@@ -74,43 +74,53 @@ fi
 timestamp "Base EKS AMI is: $base_ami"
 echo
 
-instance_name="EKS-$eks_version-Instance-for-Custom-AMI"
+instance_launched=0
 
-timestamp "Checking if EC2 instance of EKS Base AMI already exists"
-instance_id="$(
-    aws ec2 describe-instances \
-        --filters "Name=tag:Name,Values=$instance_name" \
-        --query "Reservations[0].Instances[0].InstanceId" \
-        --output text
-)"
+for((i=1; i <= 100 ; i++)); do
+    instance_name="EKS-$eks_version-Instance-for-Custom-AMI-$i"
 
-timestamp "Checking the instance state isn't terminated"
-instance_state="$(
-    aws ec2 describe-instances \
-        --instance-ids "$instance_id" \
-        --query "Reservations[0].Instances[0].State.Name" \
-        --output text
-)"
-if [ "$instance_state" = "terminated" ]; then
-    # will trigger launching a new instance with the same name
-    instance_id=''
-fi
-
-if is_blank "$instance_id" || [ "$instance_id" = "None" ]; then
-    timestamp "Launching EC2 instance of EKS Base AMI: $instance_name"
+    timestamp "Checking if EC2 instance of EKS Base AMI already exists: $instance_name"
     instance_id="$(
-        aws ec2 run-instances \
-            --image-id "$base_ami" \
-            --count 1 \
-            --instance-type "$instance_type" \
-            --key-name "$ssh_key_name" \
-            --security-group-ids "$security_group" \
-            --subnet-id "$subnet_id" \
-            --tag-specifications "ResourceType=instance,Tags=[{Key=Name,Value=$instance_name}]" \
-            --query "Instances[0].InstanceId" \
+        aws ec2 describe-instances \
+            --filters "Name=tag:Name,Values=$instance_name" \
+            --query "Reservations[0].Instances[0].InstanceId" \
+            --output text
+    )"
+
+    timestamp "Checking the instance state isn't terminated"
+    instance_state="$(
+        aws ec2 describe-instances \
+            --instance-ids "$instance_id" \
+            --query "Reservations[0].Instances[0].State.Name" \
             --output text
     )"
-    timestamp "Launched instance: $instance_id"
+    if [ "$instance_state" = "terminated" ]; then
+        timestamp "This instance is already terminated, will try a new instance name"
+        continue
+    fi
+
+    if is_blank "$instance_id" || [ "$instance_id" = "None" ]; then
+        timestamp "Launching EC2 instance of EKS Base AMI: $instance_name"
+        instance_id="$(
+            aws ec2 run-instances \
+                --image-id "$base_ami" \
+                --count 1 \
+                --instance-type "$instance_type" \
+                --key-name "$ssh_key_name" \
+                --security-group-ids "$security_group" \
+                --subnet-id "$subnet_id" \
+                --tag-specifications "ResourceType=instance,Tags=[{Key=Name,Value=$instance_name}]" \
+                --query "Instances[0].InstanceId" \
+                --output text
+        )"
+        timestamp "Launched instance: $instance_id"
+    fi
+    instance_launched=1
+    break
+done
+
+if [ "$instance_launched" != 1 ]; then
+    die "ERROR: Failed to launch instance"
 fi
 
 echo