Merge pull request #16918 from justinsb/aws_fix_kubedown_no_instances

Auto commit by PR queue bot

cluster/aws/util.sh

@@ -1208,6 +1208,7 @@ function kube-down {
                                       Name=tag:KubernetesCluster,Values=${CLUSTER_ID} \
                             --query Reservations[].Instances[].InstanceId)
 
+    if [[ -n "${instance_ids}" ]]; then
       asg_groups=$($AWS_CMD   --output text describe-instances \
                               --query 'Reservations[].Instances[].Tags[?Key==`aws:autoscaling:groupName`].Value[]' \
                               --instance-ids ${instance_ids})
@@ -1222,7 +1223,6 @@ function kube-down {
         fi
       done
 
-    if [[ -n "${instance_ids}" ]]; then
       $AWS_CMD terminate-instances --instance-ids ${instance_ids} > $LOG
       echo "Waiting for instances to be deleted"
       while true; do