Merge pull request #30816 from zmerlynn/aws-down-dangling-config

Automatic merge from submit-queue AWS: Handle kube-down case where the LaunchConfig is dangling **What this PR does / why we need it**: Fixed `cluster/kube-down.sh` on AWS in the case where no minions were started. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, #<issue_number>, ...)` format, will close that issue when PR gets merged)*: N/A **Special notes for your reviewer**: N/A **Release note**: If we can't infer it from the tagged instances, assume we've created the $ASG_NAME.

Merge pull request #30816 from zmerlynn/aws-down-dangling-config
332edf8b · Kubernetes Submit Queue · GitHub · 9ecee38f · ec330895 · 332edf8b
Commit 332edf8b authored Aug 17, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 17, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

util.sh cluster/aws/util.sh +5 -0

No files found.
--- a/cluster/aws/util.sh
+++ b/cluster/aws/util.sh
@@ -1345,6 +1345,11 @@ function kube-down {
      done
      echo "All instances deleted"
    fi
+    if [[ -n $(${AWS_ASG_CMD} describe-launch-configurations --launch-configuration-names ${ASG_NAME} --query LaunchConfigurations[].LaunchConfigurationName) ]]; then
+      echo "Warning: default auto-scaling launch configuration ${ASG_NAME} still exists, attempting to delete"
+      echo "  (This may happen if kube-up leaves just the launch configuration but no auto-scaling group.)"
+      ${AWS_ASG_CMD} delete-launch-configuration --launch-configuration-name ${ASG_NAME} || true
+    fi
    find-master-pd
    find-tagged-master-ip