cleanup all

Author: nammn

scripts/evergreen/e2e/e2e.sh

@@ -46,22 +46,37 @@ dump_cluster_information() {
   fi
 }
 
-delete_operator() {
+cleanup_operator() {
   local context="${1}"
-  timeout 5s helm uninstall --kube-context="${context}" mongodb-kubernetes-operator || true
+  if ! timeout 5s helm uninstall --wait --kube-context="${context}" mongodb-kubernetes-operator; then
+    echo "Warning: Helm uninstall failed or timed out. Continuing anyway."
+  fi
 }
 
 cleanup_openshift_cluster(){
-    if [[ "${TEST_RESULTS}" -ne 0 ]]; then
-      # Mark namespace as failed to be cleaned later
-      kubectl label "namespace/${NAMESPACE}" "evg/state=failed" --overwrite=true
-
-      if [ "${ALWAYS_REMOVE_TESTING_NAMESPACE-}" = "true" ]; then
-        # Failed namespaces might cascade into more failures if the namespaces
-        # are not being removed soon enough.
-        reset_namespace "$(kubectl config current-context)" "${NAMESPACE}" || true
-      fi
+  if [[ "${TEST_RESULTS}" -ne 0 ]]; then
+    # Mark namespace as failed to be cleaned later
+    kubectl label "namespace/${NAMESPACE}" "evg/state=failed" --overwrite=true
+
+    if [ "${ALWAYS_REMOVE_TESTING_NAMESPACE-}" = "true" ]; then
+      # Failed namespaces might cascade into more failures if the namespaces
+      # are not being removed soon enough.
+      reset_namespace "$(kubectl config current-context)" "${NAMESPACE}" || true
+    fi
+  else
+    if [[ "${KUBE_ENVIRONMENT_NAME}" = "multi" ]]; then
+      echo "Tearing down cluster ${CENTRAL_CLUSTER}"
+      reset_namespace "${CENTRAL_CLUSTER}" "${NAMESPACE}" || true
+
+      for member_cluster in ${MEMBER_CLUSTERS}; do
+        echo "Tearing down cluster ${member_cluster}"
+        reset_namespace "${member_cluster}" "${NAMESPACE}" || true
+      done
+    else
+      # If the test pass, then the namespace is removed
+      reset_namespace "$(kubectl config current-context)" "${NAMESPACE}" || true
     fi
+  fi
 }
 
 if [[ -n "${KUBECONFIG:-}" && ! -f "${KUBECONFIG}" ]]; then
@@ -145,16 +160,11 @@ if [[ "${CLUSTER_TYPE}" == "openshift" ]]; then
   cleanup_openshift_cluster
 else
   if [[ "${KUBE_ENVIRONMENT_NAME}" == "multi" ]]; then
-    echo "Tearing down cluster ${CENTRAL_CLUSTER}"
-    reset_namespace "${CENTRAL_CLUSTER}" "${NAMESPACE}" || true
-
-    for member_cluster in ${MEMBER_CLUSTERS}; do
-      echo "Tearing down cluster ${member_cluster}"
-      reset_namespace "${member_cluster}" "${NAMESPACE}" || true
-    done
+    echo "Tearing down operator on ${CENTRAL_CLUSTER}"
+    cleanup_operator "${CENTRAL_CLUSTER}"
   else
     # If the test passed, then the namespace is removed
-    reset_namespace "$(kubectl config current-context)" "${NAMESPACE}" || true
+    cleanup_operator "$(kubectl config current-context)"
   fi
 fi