From 5254e8e4be421f8854798a761a922dc5bb9c1a4a Mon Sep 17 00:00:00 2001
From: Jason Deal <jmdeal@amazon.com>
Date: Mon, 18 Mar 2024 10:59:19 -0700
Subject: [PATCH] Revert "ci: don't remove cluster with unhealthy mng (#5746)"

This reverts commit 4b1d4e6bd4e2d879607509c6577f9aa8c9356625.
---
 .github/workflows/e2e.yaml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index d84b7cc9e567..98974eba1a1f 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -172,21 +172,9 @@ jobs:
           role: ${{ vars.CI_ROLE_NAME }}
           region: ${{ inputs.region }}
           cluster_name: ${{ steps.generate-cluster-name.outputs.CLUSTER_NAME }}
-      # In the case of failure, check if the managed node group is unhealthy. If so, do not clean up cluster for further investigation.
-      # TODO: @jmdeal remove after investigation is complete
-      - name: detect unhealthy mng
-        id: detect-unhealthy-mng
-        shell: bash
-        if: failure() || cancelled()
-        run: |
-          if ! kubectl get nodes -l eks.amazonaws.com/nodegroup -oyaml | yq ".items[].status.conditions" | grep -q "KubeletNotReady"; then
-            echo UNHEALTHY="false" >> "$GITHUB_OUTPUT"
-          else
-            echo UNHEALTHY="true" >> "$GITHUB_OUTPUT"
-          fi
       - name: cleanup karpenter and cluster '${{ steps.generate-cluster-name.outputs.CLUSTER_NAME }}' resources
         uses: ./.github/actions/e2e/cleanup
-        if: always() && inputs.cleanup && (steps.detect-unhealthy-mng.conclusion == 'skipped' || steps.detect-unhealthy-mng.outputs.UNHEALTHY == 'false')
+        if: always() && inputs.cleanup
         with:
           account_id: ${{ vars.CI_ACCOUNT_ID }}
           role: ${{ vars.CI_ROLE_NAME }}