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 }} diff --git a/test/hack/resource/clean/main.go b/test/hack/resource/clean/main.go index 2ce07e09c78d..61bd36a8bbd4 100644 --- a/test/hack/resource/clean/main.go +++ b/test/hack/resource/clean/main.go @@ -34,10 +34,7 @@ import ( const sweeperCleanedResourcesTableName = "sweeperCleanedResources" -var excludedClusters = []string{ - // TODO: @jmdeal remove after SQS investigation - "soak-periodic-46287782", -} +var excludedClusters = []string{} func main() { expiration := flag.String("expiration", "12h", "define the expirationTTL of the resources") diff --git a/test/hack/soak/get_clusters.go b/test/hack/soak/get_clusters.go index a0aba650c724..1278f933753b 100644 --- a/test/hack/soak/get_clusters.go +++ b/test/hack/soak/get_clusters.go @@ -36,9 +36,7 @@ type cluster struct { const expirationTTL = time.Hour * 168 // 7 days -var excludedClustersCleanup = []string{ - "soak-periodic-46287782", -} +var excludedClustersCleanup = []string{} func main() { ctx := context.Background()