Merge pull request #35167 from fejta/err

Automatic merge from submit-queue

Only delete GKE clusters that exist

This matches the gce pattern: https://github.com/kubernetes/kubernetes/blob/master/cluster/gce/util.sh#L1197
This commit is contained in:
Kubernetes Submit Queue 2016-10-20 07:39:52 -07:00 committed by GitHub
commit 729e4484a2

View File

@ -401,6 +401,8 @@ function test-teardown() {
function kube-down() {
echo "... in gke:kube-down()" >&2
detect-project >&2
"${GCLOUD}" ${CMD_GROUP:-} container clusters delete --project="${PROJECT}" \
--zone="${ZONE}" "${CLUSTER_NAME}" --quiet
if "${GCLOUD}" ${CMD_GROUP:-} container clusters describe --project="${PROJECT}" --zone="${ZONE}" "${CLUSER_NAME}" --quiet &>/dev/null; then
"${GCLOUD}" ${CMD_GROUP:-} container clusters delete --project="${PROJECT}" \
--zone="${ZONE}" "${CLUSTER_NAME}" --quiet
fi
}