diff options
author | Rémy Coutable <remy@rymai.me> | 2018-11-12 18:07:22 +0100 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-11-13 14:33:03 +0100 |
commit | a5002ee23685f296859b35a355e1252f5a0144d3 (patch) | |
tree | 8a163692c88fb95e679368060094b51472115e0d | |
parent | 314bb5d1cfe0429aeeb4ca1771097c6831f95498 (diff) | |
download | gitlab-ce-53812-review-apps-check-whether-release-exists-before-attempting-stop_review.tar.gz |
Ensure we abort the cleanup if release is empty53812-review-apps-check-whether-release-exists-before-attempting-stop_review
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rwxr-xr-x | scripts/review_apps/review-apps.sh | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh index b180860899a..2dc4727cad0 100755 --- a/scripts/review_apps/review-apps.sh +++ b/scripts/review_apps/review-apps.sh @@ -183,17 +183,31 @@ function delete() { name="$name-$track" fi + if [[ "$name" == "" ]]; then + echo "No release given, aborting the delete!" + return + fi + + if ! deployExists "${KUBE_NAMESPACE}" "${name}"; then + echo "The release $name doesn't exist, aborting the cleanup!" + return + fi + echo "Deleting release '$name'..." helm delete --purge "$name" || true } function cleanup() { - echo "Cleaning up $CI_ENVIRONMENT_SLUG..." - kubectl -n "$KUBE_NAMESPACE" get ingress,svc,pdb,hpa,deploy,statefulset,job,pod,secret,configmap,pvc,secret,clusterrole,clusterrolebinding,role,rolebinding,sa 2>&1 \ - | grep "$CI_ENVIRONMENT_SLUG" \ - | awk '{print $1}' \ - | xargs kubectl -n "$KUBE_NAMESPACE" delete \ - || true + if [[ "$CI_ENVIRONMENT_SLUG" == "" ]]; then + echo "No release given, aborting the delete!" + return + fi + + echo "Cleaning up '$CI_ENVIRONMENT_SLUG'..." + kubectl -n "$KUBE_NAMESPACE" delete \ + ingress,svc,pdb,hpa,deploy,statefulset,job,pod,secret,configmap,pvc,secret,clusterrole,clusterrolebinding,role,rolebinding,sa \ + -l release="$CI_ENVIRONMENT_SLUG" \ + || true } function install_external_dns() { |