Use Eksa installer

Makefile

@@ -543,7 +543,7 @@ mocks: ## Generate mocks
 	${MOCKGEN} -destination=pkg/bootstrapper/mocks/bootstrapper.go -package=mocks "github.com/aws/eks-anywhere/pkg/bootstrapper" ClusterClient
 	${MOCKGEN} -destination=pkg/git/providers/github/mocks/github.go -package=mocks "github.com/aws/eks-anywhere/pkg/git/providers/github" GithubClient
 	${MOCKGEN} -destination=pkg/git/mocks/git.go -package=mocks "github.com/aws/eks-anywhere/pkg/git" Client,ProviderClient
-	${MOCKGEN} -destination=pkg/workflows/interfaces/mocks/clients.go -package=mocks "github.com/aws/eks-anywhere/pkg/workflows/interfaces" Bootstrapper,ClusterManager,GitOpsManager,Validator,CAPIManager,EksdInstaller,EksdUpgrader,PackageInstaller,ClusterUpgrader,ClusterCreator
+	${MOCKGEN} -destination=pkg/workflows/interfaces/mocks/clients.go -package=mocks "github.com/aws/eks-anywhere/pkg/workflows/interfaces" Bootstrapper,ClusterManager,GitOpsManager,Validator,CAPIManager,EksdInstaller,EksdUpgrader,PackageInstaller,ClusterUpgrader,ClusterCreator,EksaInstaller
 	${MOCKGEN} -destination=pkg/git/gogithub/mocks/client.go -package=mocks "github.com/aws/eks-anywhere/pkg/git/gogithub" Client
 	${MOCKGEN} -destination=pkg/git/gitclient/mocks/client.go -package=mocks "github.com/aws/eks-anywhere/pkg/git/gitclient" GoGit
 	${MOCKGEN} -destination=pkg/validations/mocks/docker.go -package=mocks "github.com/aws/eks-anywhere/pkg/validations" DockerExecutable

pkg/clustermanager/client.go

@@ -19,6 +19,7 @@ type KubernetesClient interface {
 	WaitForDeployment(ctx context.Context, cluster *types.Cluster, timeout string, condition string, target string, namespace string) error
 	UpdateAnnotationInNamespace(ctx context.Context, resourceType, objectName string, annotations map[string]string, cluster *types.Cluster, namespace string) error
 	RemoveAnnotationInNamespace(ctx context.Context, resourceType, objectName, key string, cluster *types.Cluster, namespace string) error
+	CreateNamespaceIfNotPresent(ctx context.Context, kubeconfig string, namespace string) error
 }
 
 type clusterManagerClient struct {

pkg/clustermanager/cluster_manager.go

@@ -523,22 +523,6 @@ func (c *ClusterManager) getWorkloadClusterKubeconfig(ctx context.Context, clust
 	return nil
 }
 
-// CreateEKSAReleaseBundle applies the eks-a release bundle to the cluster.
-func (c *ClusterManager) CreateEKSAReleaseBundle(ctx context.Context, cluster *types.Cluster, clusterSpec *cluster.Spec) error {
-	if clusterSpec.Cluster.Namespace != "" {
-		if err := c.clusterClient.CreateNamespaceIfNotPresent(ctx, cluster.KubeconfigFile, clusterSpec.Cluster.Namespace); err != nil {
-			return err
-		}
-	}
-
-	clusterSpec.Cluster.AddManagedByCLIAnnotation()
-
-	if err := c.ApplyBundles(ctx, clusterSpec, cluster); err != nil {
-		return err
-	}
-	return c.ApplyReleases(ctx, clusterSpec, cluster)
-}
-
 func (c *ClusterManager) RunPostCreateWorkloadCluster(ctx context.Context, managementCluster, workloadCluster *types.Cluster, clusterSpec *cluster.Spec) error {
 	logger.V(3).Info("Waiting for controlplane and worker machines to be ready")
 	labels := []string{clusterv1.MachineControlPlaneNameLabel, clusterv1.MachineDeploymentNameLabel}

pkg/clustermanager/eksa_installer.go

@@ -14,6 +14,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
+	"sigs.k8s.io/yaml"
 
 	anywherev1 "github.com/aws/eks-anywhere/pkg/api/v1alpha1"
 	"github.com/aws/eks-anywhere/pkg/cluster"
@@ -108,6 +109,47 @@ func (i *EKSAInstaller) Upgrade(ctx context.Context, log logr.Logger, c *types.C
 	return changeDiff, nil
 }
 
+// ApplyBundles applies the bundles to the cluster.
+func (i *EKSAInstaller) ApplyBundles(ctx context.Context, log logr.Logger, cluster *types.Cluster, spec *cluster.Spec) error {
+	bundleObj, err := yaml.Marshal(spec.Bundles)
+	if err != nil {
+		return fmt.Errorf("outputting bundle yaml: %v", err)
+	}
+
+	log.V(1).Info("Applying Bundles to cluster")
+	if err := i.client.ApplyKubeSpecFromBytes(ctx, cluster, bundleObj); err != nil {
+		return fmt.Errorf("applying bundle spec: %v", err)
+	}
+
+	return nil
+}
+
+// ApplyReleases applies the releases to the cluster.
+func (i *EKSAInstaller) ApplyReleases(ctx context.Context, log logr.Logger, cluster *types.Cluster, spec *cluster.Spec) error {
+	releaseObj, err := yaml.Marshal(spec.EKSARelease)
+	if err != nil {
+		return fmt.Errorf("outputting release yaml: %v", err)
+	}
+
+	log.V(1).Info("Applying EKSA Release to cluster")
+	if err := i.client.ApplyKubeSpecFromBytes(ctx, cluster, releaseObj); err != nil {
+		return fmt.Errorf("applying release spec: %v", err)
+	}
+
+	return nil
+}
+
+// CreateNamespaceIfNotPresent creates the cluster namespace if it doesn not exist.
+func (i *EKSAInstaller) CreateNamespaceIfNotPresent(ctx context.Context, log logr.Logger, cluster *types.Cluster, spec *cluster.Spec) error {
+	if spec.Cluster.Namespace != "" {
+		if err := i.client.CreateNamespaceIfNotPresent(ctx, cluster.KubeconfigFile, spec.Cluster.Namespace); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
 // EKSAComponentGenerator generates and configures eks-a components.
 type EKSAComponentGenerator struct {
 	log    logr.Logger

pkg/dependencies/factory.go

@@ -81,6 +81,7 @@ type Dependencies struct {
 	CiliumTemplater             *cilium.Templater
 	AwsIamAuth                  *awsiamauth.Installer
 	ClusterManager              *clustermanager.ClusterManager
+	EksaInstaller               *clustermanager.EKSAInstaller
 	Bootstrapper                *bootstrapper.Bootstrapper
 	GitOpsFlux                  *flux.Flux
 	Git                         *gitfactory.GitTools
@@ -1103,6 +1104,39 @@ func (f *Factory) WithClusterManager(clusterConfig *v1alpha1.Cluster, timeoutOpt
 	return f
 }
 
+// WithEKSAInstaller builds a cluster manager based on the cluster config and timeout options.
+func (f *Factory) WithEKSAInstaller(clusterConfig *v1alpha1.Cluster, timeoutOpts *ClusterManagerTimeoutOptions) *Factory {
+	f.WithClusterctl().WithKubectl().WithFileReader()
+
+	f.buildSteps = append(f.buildSteps, func(ctx context.Context) error {
+		if f.dependencies.EksaInstaller != nil {
+			return nil
+		}
+
+		var r *retrier.Retrier
+		if f.config.noTimeouts {
+			r = retrier.NewWithNoTimeout()
+		} else {
+			r = clustermanager.DefaultRetrier()
+		}
+
+		client := clustermanager.NewRetrierClient(
+			&clusterManagerClient{
+				f.dependencies.Clusterctl,
+				f.dependencies.Kubectl,
+			},
+			r,
+		)
+
+		installer := clustermanager.NewEKSAInstaller(client, f.dependencies.FileReader, f.eksaInstallerOpts()...)
+
+		f.dependencies.EksaInstaller = installer
+		return nil
+	})
+
+	return f
+}
+
 // WithNoTimeouts injects no timeouts to all the dependencies with configurable timeout.
 // Calling this method sets no timeout for the waits and retries in all the
 // cluster operations, i.e. cluster manager, eksa installer, networking installer.

pkg/task/task.go

@@ -36,6 +36,7 @@ type CommandContext struct {
 	EksdInstaller             interfaces.EksdInstaller
 	PackageInstaller          interfaces.PackageInstaller
 	EksdUpgrader              interfaces.EksdUpgrader
+	EksaInstaller             interfaces.EksaInstaller
 	ClusterUpgrader           interfaces.ClusterUpgrader
 	ClusterCreator            interfaces.ClusterCreator
 	CAPIManager               interfaces.CAPIManager

pkg/workflows/interfaces/interfaces.go

@@ -3,6 +3,8 @@ package interfaces
 import (
 	"context"
 
+	"github.com/go-logr/logr"
+
 	"github.com/aws/eks-anywhere/pkg/bootstrapper"
 	"github.com/aws/eks-anywhere/pkg/cluster"
 	"github.com/aws/eks-anywhere/pkg/constants"
@@ -32,7 +34,6 @@ type ClusterManager interface {
 	SaveLogsManagementCluster(ctx context.Context, spec *cluster.Spec, cluster *types.Cluster) error
 	SaveLogsWorkloadCluster(ctx context.Context, provider providers.Provider, spec *cluster.Spec, cluster *types.Cluster) error
 	InstallCustomComponents(ctx context.Context, clusterSpec *cluster.Spec, cluster *types.Cluster, provider providers.Provider) error
-	CreateEKSAReleaseBundle(ctx context.Context, cluster *types.Cluster, clusterSpec *cluster.Spec) error
 	CreateEKSANamespace(ctx context.Context, cluster *types.Cluster) error
 	CreateEKSAResources(ctx context.Context, cluster *types.Cluster, clusterSpec *cluster.Spec, datacenterConfig providers.DatacenterConfig, machineConfigs []providers.MachineConfig) error
 	ApplyBundles(ctx context.Context, clusterSpec *cluster.Spec, cluster *types.Cluster) error
@@ -93,3 +94,10 @@ type ClusterCreator interface {
 	Run(ctx context.Context, spec *cluster.Spec, managementCluster types.Cluster) error
 	CreateSync(ctx context.Context, spec *cluster.Spec, managementCluster *types.Cluster) (*types.Cluster, error)
 }
+
+// EksaInstaller exposes the EKSA installer methods.
+type EksaInstaller interface {
+	ApplyBundles(ctx context.Context, log logr.Logger, cluster *types.Cluster, spec *cluster.Spec) error
+	ApplyReleases(ctx context.Context, log logr.Logger, cluster *types.Cluster, spec *cluster.Spec) error
+	CreateNamespaceIfNotPresent(ctx context.Context, log logr.Logger, cluster *types.Cluster, spec *cluster.Spec) error
+}

pkg/workflows/management/create.go

@@ -20,14 +20,15 @@ type Create struct {
 	eksdInstaller    interfaces.EksdInstaller
 	packageInstaller interfaces.PackageInstaller
 	clusterCreator   interfaces.ClusterCreator
+	eksaInstaller    interfaces.EksaInstaller
 }
 
 // NewCreate builds a new create construct.
 func NewCreate(bootstrapper interfaces.Bootstrapper, provider providers.Provider,
 	clusterManager interfaces.ClusterManager, gitOpsManager interfaces.GitOpsManager,
 	writer filewriter.FileWriter, eksdInstaller interfaces.EksdInstaller,
 	packageInstaller interfaces.PackageInstaller,
-	clusterCreator interfaces.ClusterCreator,
+	clusterCreator interfaces.ClusterCreator, eksaInstaller interfaces.EksaInstaller,
 ) *Create {
 	return &Create{
 		bootstrapper:     bootstrapper,
@@ -38,6 +39,7 @@ func NewCreate(bootstrapper interfaces.Bootstrapper, provider providers.Provider
 		eksdInstaller:    eksdInstaller,
 		packageInstaller: packageInstaller,
 		clusterCreator:   clusterCreator,
+		eksaInstaller:    eksaInstaller,
 	}
 }
 
@@ -54,6 +56,7 @@ func (c *Create) Run(ctx context.Context, clusterSpec *cluster.Spec, validator i
 		EksdInstaller:    c.eksdInstaller,
 		PackageInstaller: c.packageInstaller,
 		ClusterCreator:   c.clusterCreator,
+		EksaInstaller:    c.eksaInstaller,
 	}
 
 	return task.NewTaskRunner(&setupAndValidateCreate{}, c.writer).RunTask(ctx, commandContext)

pkg/workflows/management/create_install_eksa.go

@@ -50,7 +50,20 @@ func installEKSAComponents(ctx context.Context, commandContext *task.CommandCont
 	}
 
 	logger.Info("Creating EKS-A CRDs instances")
-	err = commandContext.ClusterManager.CreateEKSAReleaseBundle(ctx, targetCluster, commandContext.ClusterSpec)
+
+	err = commandContext.EksaInstaller.CreateNamespaceIfNotPresent(ctx, logger.Get(), targetCluster, commandContext.ClusterSpec)
+	if err != nil {
+		commandContext.SetError(err)
+		return err
+	}
+
+	err = commandContext.EksaInstaller.ApplyBundles(ctx, logger.Get(), targetCluster, commandContext.ClusterSpec)
+	if err != nil {
+		commandContext.SetError(err)
+		return err
+	}
+
+	err = commandContext.EksaInstaller.ApplyReleases(ctx, logger.Get(), targetCluster, commandContext.ClusterSpec)
 	if err != nil {
 		commandContext.SetError(err)
 		return err