Merge branch...

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

scripts/review_apps/review-apps.sh

@@ -179,20 +179,34 @@ function delete() {
   track="${1-stable}"
   name="$CI_ENVIRONMENT_SLUG"
 
+  if [ -z "$CI_ENVIRONMENT_SLUG" ]; then
+    echo "No release given, aborting the delete!"
+    return
+  fi
+
   if [[ "$track" != "stable" ]]; then
     name="$name-$track"
   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 \
+  if [ -z "$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
 }