diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-09 12:08:17 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-09 12:08:17 +0000 |
| commit | a373ecffca1512404cb4f237399e3bf275d87f69 (patch) | |
| tree | 0c131c86a4f88b427c5d644cd14c4596daa87d36 /scripts/review_apps | |
| parent | 1613500bf7400f5692a55fd65235a4a10fc40a7d (diff) | |
| download | gitlab-ce-a373ecffca1512404cb4f237399e3bf275d87f69.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/review_apps')
| -rwxr-xr-x | scripts/review_apps/review-apps.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh index 3ffdeb31894..a799f8cd925 100755 --- a/scripts/review_apps/review-apps.sh +++ b/scripts/review_apps/review-apps.sh @@ -48,7 +48,9 @@ function delete_release() { return fi - delete_k8s_release_namespace + if deploy_exists "${namespace}" "${release}"; then + helm uninstall --namespace="${namespace}" "${release}" + fi } function delete_failed_release() { @@ -66,7 +68,7 @@ function delete_failed_release() { # Cleanup and previous installs, as FAILED and PENDING_UPGRADE will cause errors with `upgrade` if previous_deploy_failed "${namespace}" "${release}" ; then echoinfo "Review App deployment in bad state, cleaning up namespace ${release}" - delete_release + delete_k8s_release_namespace else echoinfo "Review App deployment in good state" fi |