From 8d0200e5aff2fa7b979be96957f1d827b6c61d7e Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Wed, 10 Aug 2016 10:31:48 -0700 Subject: [PATCH] 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. --- cluster/aws/util.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh index f0a881114b..50d260eae5 100755 --- 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 }