Skip to content

Commit 132e6c9

Browse files
committed
Merge branch '53812-review-apps-check-whether-release-exists-before-attempting-stop_review' into 'master'
Ensure we abort the cleanup if release is empty Closes #53812 See merge request gitlab-org/gitlab-ce!22992
2 parents fc77606 + 4383c79 commit 132e6c9

File tree

1 file changed

+20
-6
lines changed

1 file changed

+20
-6
lines changed

scripts/review_apps/review-apps.sh

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,21 +179,35 @@ function delete() {
179179
track="${1-stable}"
180180
name="$CI_ENVIRONMENT_SLUG"
181181

182+
if [ -z "$CI_ENVIRONMENT_SLUG" ]; then
183+
echo "No release given, aborting the delete!"
184+
return
185+
fi
186+
182187
if [[ "$track" != "stable" ]]; then
183188
name="$name-$track"
184189
fi
185190

191+
if ! deployExists "${KUBE_NAMESPACE}" "${name}"; then
192+
echo "The release $name doesn't exist, aborting the cleanup!"
193+
return
194+
fi
195+
186196
echo "Deleting release '$name'..."
187197
helm delete --purge "$name" || true
188198
}
189199

190200
function cleanup() {
191-
echo "Cleaning up $CI_ENVIRONMENT_SLUG..."
192-
kubectl -n "$KUBE_NAMESPACE" get ingress,svc,pdb,hpa,deploy,statefulset,job,pod,secret,configmap,pvc,secret,clusterrole,clusterrolebinding,role,rolebinding,sa 2>&1 \
193-
| grep "$CI_ENVIRONMENT_SLUG" \
194-
| awk '{print $1}' \
195-
| xargs kubectl -n "$KUBE_NAMESPACE" delete \
196-
|| true
201+
if [ -z "$CI_ENVIRONMENT_SLUG" ]; then
202+
echo "No release given, aborting the delete!"
203+
return
204+
fi
205+
206+
echo "Cleaning up '$CI_ENVIRONMENT_SLUG'..."
207+
kubectl -n "$KUBE_NAMESPACE" delete \
208+
ingress,svc,pdb,hpa,deploy,statefulset,job,pod,secret,configmap,pvc,secret,clusterrole,clusterrolebinding,role,rolebinding,sa \
209+
-l release="$CI_ENVIRONMENT_SLUG" \
210+
|| true
197211
}
198212

199213
function install_external_dns() {

0 commit comments

Comments
 (0)