Add git ops manager task for workload cluster

pkg/workflows/workload/create_gitops.go

@@ -0,0 +1,34 @@
+package workload
+
+import (
+	"context"
+
+	"github.com/aws/eks-anywhere/pkg/cluster"
+	"github.com/aws/eks-anywhere/pkg/logger"
+	"github.com/aws/eks-anywhere/pkg/task"
+)
+
+type installGitOpsManagerTask struct{}
+
+func (s *installGitOpsManagerTask) Run(ctx context.Context, commandContext *task.CommandContext) task.Task {
+	logger.Info("Installing GitOps Toolkit on workload cluster")
+
+	managementComponents := cluster.ManagementComponentsFromBundles(commandContext.ClusterSpec.Bundles)
+	err := commandContext.GitOpsManager.InstallGitOps(ctx, commandContext.WorkloadCluster, managementComponents, commandContext.ClusterSpec, commandContext.Provider.DatacenterConfig(commandContext.ClusterSpec), commandContext.Provider.MachineConfigs(commandContext.ClusterSpec))
+	if err != nil {
+		logger.MarkFail("Error when installing GitOps toolkits on workload cluster; EKS-A will continue with cluster creation, but GitOps will not be enabled", "error", err)
+	}
+	return &writeClusterConfig{}
+}
+
+func (s *installGitOpsManagerTask) Name() string {
+	return "gitops-manager-install"
+}
+
+func (s *installGitOpsManagerTask) Restore(ctx context.Context, commandContext *task.CommandContext, completedTask *task.CompletedTask) (task.Task, error) {
+	return nil, nil
+}
+
+func (s *installGitOpsManagerTask) Checkpoint() *task.CompletedTask {
+	return nil
+}

pkg/workflows/workload/create_test.go

@@ -22,21 +22,22 @@ import (
 )
 
 type createTestSetup struct {
-	t                *testing.T
-	clusterManager   *mocks.MockClusterManager
-	gitOpsManager    *mocks.MockGitOpsManager
-	provider         *providermocks.MockProvider
-	writer           *writermocks.MockFileWriter
-	validator        *mocks.MockValidator
-	eksd             *mocks.MockEksdInstaller
-	packageInstaller *mocks.MockPackageInstaller
-	clusterCreator   *mocks.MockClusterCreator
-	datacenterConfig providers.DatacenterConfig
-	machineConfigs   []providers.MachineConfig
-	ctx              context.Context
-	clusterSpec      *cluster.Spec
-	workloadCluster  *types.Cluster
-	workload         *workload.Create
+	t                    *testing.T
+	clusterManager       *mocks.MockClusterManager
+	gitOpsManager        *mocks.MockGitOpsManager
+	provider             *providermocks.MockProvider
+	writer               *writermocks.MockFileWriter
+	validator            *mocks.MockValidator
+	eksd                 *mocks.MockEksdInstaller
+	packageInstaller     *mocks.MockPackageInstaller
+	clusterCreator       *mocks.MockClusterCreator
+	datacenterConfig     providers.DatacenterConfig
+	machineConfigs       []providers.MachineConfig
+	ctx                  context.Context
+	clusterSpec          *cluster.Spec
+	workloadCluster      *types.Cluster
+	workload             *workload.Create
+	managementComponents *cluster.ManagementComponents
 }
 
 func newCreateTest(t *testing.T) *createTestSetup {
@@ -56,6 +57,9 @@ func newCreateTest(t *testing.T) *createTestSetup {
 
 	validator := mocks.NewMockValidator(mockCtrl)
 
+	clusterSpec := test.NewClusterSpec(func(s *cluster.Spec) { s.Cluster.Name = "test-cluster" })
+	managementComponents := cluster.ManagementComponentsFromBundles(clusterSpec.Bundles)
+
 	workload := workload.NewCreate(
 		provider,
 		clusterManager,
@@ -89,7 +93,8 @@ func newCreateTest(t *testing.T) *createTestSetup {
 			s.Cluster.Spec.DatacenterRef.Kind = v1alpha1.VSphereDatacenterKind
 			s.ManagementCluster = &types.Cluster{Name: "management"}
 		}),
-		workloadCluster: &types.Cluster{Name: "workload"},
+		workloadCluster:      &types.Cluster{Name: "workload"},
+		managementComponents: managementComponents,
 	}
 }
 
@@ -100,7 +105,7 @@ func (c *createTestSetup) expectSetup() {
 }
 
 func (c *createTestSetup) expectCreateWorkloadCluster(err error) {
-	c.clusterCreator.EXPECT().CreateSync(c.ctx, c.clusterSpec, c.clusterSpec.ManagementCluster).Return(nil, err)
+	c.clusterCreator.EXPECT().CreateSync(c.ctx, c.clusterSpec, c.clusterSpec.ManagementCluster).Return(c.workloadCluster, err)
 }
 
 func (c *createTestSetup) expectWriteWorkloadClusterConfig(err error) {
@@ -134,6 +139,11 @@ func (c *createTestSetup) expectSaveLogsManagement() {
 	c.expectWrite()
 }
 
+func (c *createTestSetup) expectInstallGitOpsManager(err error) {
+	c.gitOpsManager.EXPECT().InstallGitOps(
+		c.ctx, c.workloadCluster, c.managementComponents, c.clusterSpec, c.datacenterConfig, c.machineConfigs).Return(err)
+}
+
 func (c *createTestSetup) expectWrite() {
 	c.writer.EXPECT().Write(gomock.Any(), gomock.Any(), gomock.Any()).Return("", nil)
 }
@@ -147,6 +157,7 @@ func TestCreateRunSuccess(t *testing.T) {
 	test.expectDatacenterConfig()
 	test.expectMachineConfigs()
 	test.expectCreateWorkloadCluster(nil)
+	test.expectInstallGitOpsManager(nil)
 	test.expectWriteWorkloadClusterConfig(nil)
 
 	err := test.run()
@@ -188,6 +199,24 @@ func TestCreateRunValidateFail(t *testing.T) {
 	}
 }
 
+func TestCreateRunGitOpsConfigFail(t *testing.T) {
+	features.ClearCache()
+	os.Setenv(features.UseControllerForCli, "true")
+	test := newCreateTest(t)
+	test.expectSetup()
+	test.expectPreflightValidationsToPass()
+	test.expectDatacenterConfig()
+	test.expectMachineConfigs()
+	test.expectCreateWorkloadCluster(nil)
+	test.expectInstallGitOpsManager(fmt.Errorf("Failure"))
+	test.expectWriteWorkloadClusterConfig(nil)
+
+	err := test.run()
+	if err != nil {
+		t.Fatalf("Create.Run() err = %v, want err = nil", err)
+	}
+}
+
 func TestCreateRunWriteClusterConfigFail(t *testing.T) {
 	features.ClearCache()
 	os.Setenv(features.UseControllerForCli, "true")
@@ -197,6 +226,7 @@ func TestCreateRunWriteClusterConfigFail(t *testing.T) {
 	test.expectDatacenterConfig()
 	test.expectMachineConfigs()
 	test.expectCreateWorkloadCluster(nil)
+	test.expectInstallGitOpsManager(nil)
 	test.expectWriteWorkloadClusterConfig(fmt.Errorf("Failure"))
 	test.expectWrite()
 

pkg/workflows/workload/createcluster.go

@@ -13,12 +13,14 @@ type createCluster struct{}
 // Run createCluster performs actions needed to create the management cluster.
 func (c *createCluster) Run(ctx context.Context, commandContext *task.CommandContext) task.Task {
 	logger.Info("Creating workload cluster")
-	if _, err := commandContext.ClusterCreator.CreateSync(ctx, commandContext.ClusterSpec, commandContext.ManagementCluster); err != nil {
+	workloadCluster, err := commandContext.ClusterCreator.CreateSync(ctx, commandContext.ClusterSpec, commandContext.ManagementCluster)
+	if err != nil {
 		commandContext.SetError(err)
 		return &workflows.CollectMgmtClusterDiagnosticsTask{}
 	}
+	commandContext.WorkloadCluster = workloadCluster
 
-	return &writeClusterConfig{}
+	return &installGitOpsManagerTask{}
 }
 
 func (c *createCluster) Name() string {
@@ -32,5 +34,5 @@ func (c *createCluster) Checkpoint() *task.CompletedTask {
 }
 
 func (c *createCluster) Restore(ctx context.Context, commandContext *task.CommandContext, completedTask *task.CompletedTask) (task.Task, error) {
-	return &writeClusterConfig{}, nil
+	return &installGitOpsManagerTask{}, nil
 }