Fix failures in cluster deletion in regions without capability support (#8631)

Author: NicholasBlaskey

pkg/actions/capability/remover.go

@@ -70,20 +70,34 @@ func (r *Remover) DeleteTasks(ctx context.Context, capabilities []Summary) (*tas
 		return nil, fmt.Errorf("failed to fetch IAM role stacks for capabilities: %w", err)
 	}
 
+	capabilityNames := make(map[string]bool)
+	if len(capabilities) == 0 { // Passed in on cluster deletion case.
+		for _, capStack := range capabilityStacks {
+			capabilityNames[manager.GetCapabilityNameFromStack(capStack)] = true
+		}
+		for _, iamStack := range iamStacks {
+			capabilityNames[manager.GetCapabilityNameFromIAMStack(iamStack)] = true
+		}
+	} else {
+		for _, cap := range capabilities {
+			capabilityNames[cap.Name] = true
+		}
+	}
+
 	// Create parallel tasks for capability deletion and waiting
 	capabilityTasks := &tasks.TaskTree{
 		Parallel: true,
 	}
 
-	for _, cap := range capabilities {
+	for capName := range capabilityNames {
 		capabilityTasks.Append(&tasks.GenericTask{
-			Description: fmt.Sprintf("delete and wait for capability %s", cap.Name),
+			Description: fmt.Sprintf("delete and wait for capability %s", capName),
 			Doer: func() error {
-				if err := r.deleteCapabilityStack(ctx, cap.Name, capabilityStacks); err != nil {
+				if err := r.deleteCapabilityStack(ctx, capName, capabilityStacks); err != nil {
 					return err
 				}
 
-				return r.deleteCapabilityIAMRoleStack(ctx, cap.Name, iamStacks)
+				return r.deleteCapabilityIAMRoleStack(ctx, capName, iamStacks)
 			},
 		})
 	}

pkg/actions/capability/remover_test.go

@@ -4,6 +4,8 @@ import (
 	"context"
 	"testing"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
+
 	cfntypes "github.com/aws/aws-sdk-go-v2/service/cloudformation/types"
 	"github.com/stretchr/testify/mock"
 
@@ -57,6 +59,59 @@ func TestRemover_DeleteTasks(t *testing.T) {
 	}
 }
 
+func TestRemover_DeleteTasks_ClusterDeleteCase(t *testing.T) {
+	mockStackRemover := mocks.NewStackRemover(t)
+
+	// Create mock stacks for ListCapabilityStacks (cap-a, cap-b)
+	capAStack := &cfntypes.Stack{
+		StackName: aws.String("eksctl-test-cluster-capability-cap-a"),
+		Tags: []cfntypes.Tag{
+			{Key: aws.String(api.CapabilityNameTag), Value: aws.String("cap-a")},
+		},
+	}
+	capBStack := &cfntypes.Stack{
+		StackName: aws.String("eksctl-test-cluster-capability-cap-b"),
+		Tags: []cfntypes.Tag{
+			{Key: aws.String(api.CapabilityNameTag), Value: aws.String("cap-b")},
+		},
+	}
+
+	// Create mock stacks for ListCapabilitiesIAMStacks (cap-b, cap-c)
+	capBIAMStack := &cfntypes.Stack{
+		StackName: aws.String("eksctl-test-cluster-capability-iam-cap-b"),
+		Tags: []cfntypes.Tag{
+			{Key: aws.String(api.CapabilityNameTag), Value: aws.String("cap-b")},
+		},
+	}
+	capCIAMStack := &cfntypes.Stack{
+		StackName: aws.String("eksctl-test-cluster-capability-iam-cap-c"),
+		Tags: []cfntypes.Tag{
+			{Key: aws.String(api.CapabilityNameTag), Value: aws.String("cap-c")},
+		},
+	}
+
+	// Mock stack listing calls
+	mockStackRemover.EXPECT().ListCapabilityStacks(mock.Anything).Return([]*cfntypes.Stack{capAStack, capBStack}, nil)
+	mockStackRemover.EXPECT().ListCapabilitiesIAMStacks(mock.Anything).Return([]*cfntypes.Stack{capBIAMStack, capCIAMStack}, nil)
+
+	remover := capability.NewRemover("test-cluster", mockStackRemover)
+
+	// Pass in 0 capabilities - cluster delete case
+	taskTree, err := remover.DeleteTasks(context.Background(), []capability.Summary{})
+	if err != nil {
+		t.Fatalf("Expected no error, got %v", err)
+	}
+
+	// Should have 3 tasks (cap-a, cap-b, cap-c - deduplicated from stacks)
+	if taskTree.Len() != 3 {
+		t.Errorf("Expected 3 tasks, got %d", taskTree.Len())
+	}
+	// Should be parallel execution
+	if !taskTree.Parallel {
+		t.Error("Expected parallel task execution, got sequential")
+	}
+}
+
 func TestRemover_DeleteWithWait(t *testing.T) {
 	// This test is simplified to avoid complex mock setup
 	// The functionality is tested through integration tests

pkg/actions/cluster/owned.go

@@ -126,20 +126,8 @@ func (c *OwnedCluster) Delete(ctx context.Context, _, podEvictionWaitPeriod time
 	newTasksToDeleteAddonIAM := addon.NewRemover(c.stackManager).DeleteAddonIAMTasks
 
 	newTasksToDeleteCapability := func() (*tasks.TaskTree, error) {
-		capabilityGetter := &capability.Getter{
-			ClusterName: c.cfg.Metadata.Name,
-			EKSAPI:      c.ctl.AWSProvider.EKS(),
-		}
-
-		// Get all capabilities
-		capabilities, err := capabilityGetter.Get(ctx, "")
-
-		if err != nil {
-			return &tasks.TaskTree{}, err
-		}
-
 		capabilityRemover := capability.NewRemover(c.cfg.Metadata.Name, c.stackManager)
-		return capabilityRemover.DeleteTasks(ctx, capabilities)
+		return capabilityRemover.DeleteTasks(ctx, nil) // Delete all capabilities.
 	}
 
 	newTasksToDeletePodIdentityRoles := func() (*tasks.TaskTree, error) {