Merge pull request #30380 from zmerlynn/fix-aws-teardown

Automatic merge from submit-queue AWS: Allow no-op kube-down to exit 0 Not exactly sure why hack/e2e.go `IsUp()` is returning true right now, but I can solve this a different way. This unifies with the GCE behavior, which is that no-op kube-down returns 0.  --- This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30380)

Merge pull request #30380 from zmerlynn/fix-aws-teardown
66c9edfd · Kubernetes Submit Queue · GitHub · a40d2cd9 · 8d0200e5 · 66c9edfd
Commit 66c9edfd authored Aug 10, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 10, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

util.sh cluster/aws/util.sh +3 -1

No files found.
--- a/cluster/aws/util.sh
+++ b/cluster/aws/util.sh
@@ -1439,7 +1439,9 @@ function kube-down {
    echo "If you are trying to delete a cluster in a shared VPC," >&2
    echo "please consider using one of the methods in the kube-deploy repo." >&2
    echo "See: https://github.com/kubernetes/kube-deploy/blob/master/docs/delete_cluster.md" >&2
-    exit 1
+    echo "" >&2
+    echo "Note: You may be seeing this message may be because the cluster was already deleted, or" >&2
+    echo "has a name other than '${CLUSTER_ID}'." >&2
  fi
 }