Merged in dev/fabien/MPC-5012-reorder-terraform.sh-finalizers (pull r…

…equest elastic#541) MPC-5012: delete ec2 instances before attempting redis flush * delete ec2 instances before attempting redis flush Approved-by: Can Yildiz
mindw · Mar 22, 2022 · f04195d · f04195d
1 parent b3324bc
commit f04195d
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/aws/ams-cluster-v1-tf/terraform.sh b/aws/ams-cluster-v1-tf/terraform.sh
@@ -191,6 +191,23 @@ terraform apply \
   -parallelism=50 \
   -auto-approve
 
+echo "deleting ems, merger, recorder ec2 instances"
+aws \
+  --profile ${STACK_PROFILE} \
+  --region ${STACK_REGION} \
+  ec2 describe-instances \
+  --query 'Reservations[*].Instances[*].{ID:InstanceId}' \
+  --filters "Name=instance-state-name,Values=running,stopped" \
+  "Name=tag:Role,Values=ems,merger,recorder" \
+  "Name=tag:StackName,Values=${STACK_NAME}" \
+  --output text |
+  xargs aws \
+    --profile ${STACK_PROFILE} \
+    --region ${STACK_REGION} \
+    --no-cli-pager \
+    ec2 terminate-instances \
+    --instance-ids
+
 OVERRIDES=$(
   cat <<EOT
 {
@@ -244,20 +261,3 @@ kubectl \
   --restart Never \
   --overrides "$(echo ${OVERRIDES} | sed 's/TARGET/EMS_REDIS_URL/')" \
   flush-ems-redis
-
-echo "deleting ems, merger, recorder ec2 instances"
-aws \
-  --profile ${STACK_PROFILE} \
-  --region ${STACK_REGION} \
-  ec2 describe-instances \
-  --query 'Reservations[*].Instances[*].{ID:InstanceId}' \
-  --filters "Name=instance-state-name,Values=running,stopped" \
-  "Name=tag:Role,Values=ems,merger,recorder" \
-  "Name=tag:StackName,Values=${STACK_NAME}" \
-  --output text |
-  xargs aws \
-    --profile ${STACK_PROFILE} \
-    --region ${STACK_REGION} \
-    --no-cli-pager \
-    ec2 terminate-instances \
-    --instance-ids