add tests

cmd/eksctl-anywhere/cmd/deletecluster.go

@@ -161,7 +161,7 @@ func (dc *deleteClusterOptions) deleteCluster(ctx context.Context) error {
 		deleteWorkload := workload.NewDelete(deps.Provider, deps.Writer, deps.ClusterManager, deps.ClusterDeleter)
 		err = deleteWorkload.Run(ctx, cluster, clusterSpec)
 	} else if features.UseControllerViaCLIWorkflow().IsActive() && clusterSpec.Cluster.IsSelfManaged() {
-		deleteManagement := management.NewDelete(deps.Bootstrapper, deps.Provider, deps.Writer, deps.ClusterManager, deps.ClusterDeleter, deps.GitOpsFlux)
+		deleteManagement := management.NewDelete(deps.Bootstrapper, deps.Provider, deps.Writer, deps.ClusterManager, deps.GitOpsFlux)
 		err = deleteManagement.Run(ctx, cluster, clusterSpec)
 	} else {
 		err = deleteCluster.Run(ctx, cluster, clusterSpec, dc.forceCleanup, dc.managementKubeconfig)

pkg/clustermanager/deleter.go

@@ -7,11 +7,9 @@ import (
 
 	"github.com/go-logr/logr"
 	"github.com/pkg/errors"
-	"sigs.k8s.io/cluster-api/api/v1beta1"
 
 	"github.com/aws/eks-anywhere/pkg/clients/kubernetes"
 	"github.com/aws/eks-anywhere/pkg/cluster"
-	"github.com/aws/eks-anywhere/pkg/constants"
 	"github.com/aws/eks-anywhere/pkg/retrier"
 	"github.com/aws/eks-anywhere/pkg/types"
 )
@@ -101,37 +99,3 @@ func (a Deleter) Run(ctx context.Context, spec *cluster.Spec, managementCluster
 
 	return nil
 }
-
-// DeleteCAPICluster deletes the CAPI cluster in the bootstrap cluster and waits
-// until the changes are fully reconciled.
-func (a Deleter) DeleteCAPICluster(ctx context.Context, cluster string, bootstrapCluster types.Cluster) error {
-	var client kubernetes.Client
-	a.log.V(3).Info("Deleting cluster spec")
-	err := retrier.New(
-		a.deleteClusterTimeout,
-		retrier.WithRetryPolicy(retrier.BackOffPolicy(a.retryBackOff)),
-	).Retry(func() error {
-		var err error
-		client, err = a.clientFactory.BuildClientFromKubeconfig(bootstrapCluster.KubeconfigFile)
-		if err != nil {
-			return errors.Wrap(err, "building client to delete cluster")
-		}
-
-		capiCluster := &v1beta1.Cluster{}
-
-		if err := client.Get(ctx, cluster, constants.EksaSystemNamespace, capiCluster); err != nil {
-			return errors.Wrapf(err, "getting capi cluster")
-		}
-
-		if err := client.Delete(ctx, capiCluster); err != nil {
-			return errors.Wrapf(err, "deleting cluster")
-		}
-
-		return nil
-	})
-	if err != nil {
-		return err
-	}
-
-	return nil
-}

pkg/workflows/interfaces/interfaces.go

@@ -110,5 +110,4 @@ type EksaInstaller interface {
 // ClusterDeleter deletes the cluster.
 type ClusterDeleter interface {
 	Run(ctx context.Context, spec *cluster.Spec, managementCluster types.Cluster) error
-	DeleteCAPICluster(ctx context.Context, cluster string, bootstrapCluster types.Cluster) error
 }

pkg/workflows/management/create_delete_bootstrap.go

@@ -39,7 +39,7 @@ type deleteBootstrapClusterForDeleteTask struct{}
 
 func (s *deleteBootstrapClusterForDeleteTask) Run(ctx context.Context, commandContext *task.CommandContext) task.Task {
 	logger.Info("Deleting bootstrap cluster")
-	if err := commandContext.Bootstrapper.DeleteBootstrapCluster(ctx, commandContext.BootstrapCluster, constants.Delete, true); err != nil {
+	if err := commandContext.Bootstrapper.DeleteBootstrapCluster(ctx, commandContext.BootstrapCluster, constants.Delete, false); err != nil {
 		commandContext.SetError(err)
 	}
 

pkg/workflows/management/create_install_capi.go

@@ -56,7 +56,8 @@ func (s *installCAPIComponentsForDeleteTask) Run(ctx context.Context, commandCon
 	}
 
 	logger.Info("Installing cluster-api providers on bootstrap cluster")
-	if err := commandContext.ClusterManager.InstallCAPI(ctx, commandContext.ClusterSpec, commandContext.BootstrapCluster, commandContext.Provider); err != nil {
+	managementComponents := cluster.ManagementComponentsFromBundles(commandContext.ClusterSpec.Bundles)
+	if err := commandContext.ClusterManager.InstallCAPI(ctx, managementComponents, commandContext.ClusterSpec, commandContext.BootstrapCluster, commandContext.Provider); err != nil {
 		commandContext.SetError(err)
 		return &deleteManagementCluster{}
 	}

pkg/workflows/management/delete.go

@@ -17,7 +17,6 @@ type Delete struct {
 	provider       providers.Provider
 	writer         filewriter.FileWriter
 	clusterManager interfaces.ClusterManager
-	clusterDeleter interfaces.ClusterDeleter
 	gitopsManager  interfaces.GitOpsManager
 }
 
@@ -26,15 +25,13 @@ func NewDelete(bootstrapper interfaces.Bootstrapper,
 	provider providers.Provider,
 	writer filewriter.FileWriter,
 	clusterManager interfaces.ClusterManager,
-	clusterDeleter interfaces.ClusterDeleter,
 	gitopsManager interfaces.GitOpsManager,
 ) *Delete {
 	return &Delete{
 		bootstrapper:   bootstrapper,
 		provider:       provider,
 		writer:         writer,
 		clusterManager: clusterManager,
-		clusterDeleter: clusterDeleter,
 		gitopsManager:  gitopsManager,
 	}
 }
@@ -48,7 +45,6 @@ func (c *Delete) Run(ctx context.Context, workload *types.Cluster, clusterSpec *
 		ClusterManager:  c.clusterManager,
 		ClusterSpec:     clusterSpec,
 		WorkloadCluster: workload,
-		ClusterDeleter:  c.clusterDeleter,
 		GitOpsManager:   c.gitopsManager,
 	}
 

pkg/workflows/management/delete_cluster.go

@@ -12,7 +12,7 @@ type deleteManagementCluster struct{}
 
 func (s *deleteManagementCluster) Run(ctx context.Context, commandContext *task.CommandContext) task.Task {
 	logger.Info("Deleting management cluster")
-	err := commandContext.ClusterDeleter.DeleteCAPICluster(ctx, commandContext.ClusterSpec.Cluster.Name, *commandContext.BootstrapCluster)
+	err := commandContext.ClusterManager.DeleteCluster(ctx, commandContext.BootstrapCluster, commandContext.WorkloadCluster, commandContext.Provider, commandContext.ClusterSpec)
 	if err != nil {
 		commandContext.SetError(err)
 		return &workflows.CollectMgmtClusterDiagnosticsTask{}