feat: added --post-apply-phases flag

cmd/apply.go

@@ -28,7 +28,10 @@ import (
 
 const WrappedErrMessage = "%w: %s"
 
-var ErrDownloadDependenciesFailed = errors.New("dependencies download failed")
+var (
+	ErrDownloadDependenciesFailed = errors.New("dependencies download failed")
+	ErrPhaseInvalid               = errors.New("phase is not valid")
+)
 
 type Timeouts struct {
 	ProcessTimeout         int
@@ -60,6 +63,7 @@ type ClusterCmdFlags struct {
 	UpgradePathLocation   string
 	UpgradeNode           string
 	DistroPatchesLocation string
+	PostApplyPhases       []string
 	ClusterSkipsCmdFlags
 }
 
@@ -222,6 +226,7 @@ func NewApplyCommand(tracker *analytics.Tracker) *cobra.Command {
 				flags.Upgrade,
 				flags.UpgradePathLocation,
 				flags.UpgradeNode,
+				flags.PostApplyPhases,
 			)
 			if err != nil {
 				cmdEvent.AddErrorMessage(err)
@@ -414,6 +419,15 @@ func getCreateClusterCmdFlags(cmd *cobra.Command, tracker *analytics.Tracker, cm
 		return ClusterCmdFlags{}, fmt.Errorf("%w: %s", ErrParsingFlag, "distro-patches")
 	}
 
+	postApplyPhases, err := cmdutil.StringSliceFlag(cmd, "post-apply-phases", tracker, cmdEvent)
+	if err != nil {
+		return ClusterCmdFlags{}, fmt.Errorf("%w: %s", ErrParsingFlag, "post-apply-phases")
+	}
+
+	if err := validatePostApplyPhasesFlag(postApplyPhases); err != nil {
+		return ClusterCmdFlags{}, fmt.Errorf("%w: %s %w", ErrParsingFlag, "post-apply-phases", err)
+	}
+
 	return ClusterCmdFlags{
 		Debug:          debug,
 		FuryctlPath:    furyctlPath,
@@ -436,9 +450,20 @@ func getCreateClusterCmdFlags(cmd *cobra.Command, tracker *analytics.Tracker, cm
 		UpgradeNode:           upgradeNode,
 		DistroPatchesLocation: distroPatchesLocation,
 		ClusterSkipsCmdFlags:  skips,
+		PostApplyPhases:       postApplyPhases,
 	}, nil
 }
 
+func validatePostApplyPhasesFlag(phases []string) error {
+	for _, phase := range phases {
+		if err := cluster.ValidateMainPhases(phase); err != nil {
+			return fmt.Errorf("%w: %s", ErrPhaseInvalid, phase)
+		}
+	}
+
+	return nil
+}
+
 func setupCreateClusterCmdFlags(cmd *cobra.Command) {
 	cmd.Flags().StringP(
 		"config",
@@ -532,6 +557,12 @@ func setupCreateClusterCmdFlags(cmd *cobra.Command) {
 		"WARNING: furyctl won't ask for confirmation and will proceed applying upgrades and reducers. Options are: all, upgrades, migrations, pods-running-check",
 	)
 
+	cmd.Flags().StringSlice(
+		"post-apply-phases",
+		[]string{},
+		"Phases to run after the apply command. Options are: infrastructure, kubernetes, distribution, plugins",
+	)
+
 	//nolint:gomnd,revive // ignore magic number linters
 	cmd.Flags().Int(
 		"timeout",

cmd/diff.go

@@ -237,6 +237,7 @@ func getPhasePath(
 		true,
 		upgradePathLocation,
 		"",
+		[]string{},
 	)
 	if err != nil {
 		return "", fmt.Errorf("error while initializing cluster creator: %w", err)

internal/apis/kfd/v1alpha2/ekscluster/create/distribution.go

@@ -377,6 +377,10 @@ func (d *Distribution) runReducers(
 	return nil
 }
 
+func (d *Distribution) SetUpgrade(upgradeEnabled bool) {
+	d.upgrade.Enabled = upgradeEnabled
+}
+
 func (d *Distribution) Stop() error {
 	errCh := make(chan error)
 	doneCh := make(chan bool)

internal/apis/kfd/v1alpha2/ekscluster/create/infrastructure.go

@@ -215,6 +215,10 @@ func (i *Infrastructure) postInfrastructure(
 	return nil
 }
 
+func (i *Infrastructure) SetUpgrade(upgradeEnabled bool) {
+	i.upgrade.Enabled = upgradeEnabled
+}
+
 func (i *Infrastructure) Stop() error {
 	logrus.Debug("Stopping terraform...")
 

internal/apis/kfd/v1alpha2/ekscluster/create/kubernetes.go

@@ -282,6 +282,10 @@ func (k *Kubernetes) postKubernetes(
 	return nil
 }
 
+func (k *Kubernetes) SetUpgrade(upgradeEnabled bool) {
+	k.upgrade.Enabled = upgradeEnabled
+}
+
 func (k *Kubernetes) Stop() error {
 	errCh := make(chan error)
 	doneCh := make(chan bool)

internal/apis/kfd/v1alpha2/ekscluster/creator.go

@@ -62,6 +62,7 @@ type ClusterCreator struct {
 	force                []string
 	upgrade              bool
 	externalUpgradesPath string
+	postApplyPhases      []string
 }
 
 type Phases struct {
@@ -160,6 +161,11 @@ func (v *ClusterCreator) SetProperty(name string, value any) {
 		if s, ok := value.(string); ok {
 			v.externalUpgradesPath = s
 		}
+
+	case cluster.CreatorPropertyPostApplyPhases:
+		if s, ok := value.([]string); ok {
+			v.postApplyPhases = s
+		}
 	}
 }
 
@@ -639,6 +645,14 @@ func (v *ClusterCreator) allPhases(
 		return err
 	}
 
+	if len(v.postApplyPhases) > 0 {
+		logrus.Info("Executing extra phases...")
+
+		if err := v.extraPhases(phases, upgradeState, upgr); err != nil {
+			return fmt.Errorf("error while executing extra phases: %w", err)
+		}
+	}
+
 	if v.dryRun {
 		logrus.Info("Kubernetes Fury cluster created successfully (dry-run mode)")
 
@@ -672,6 +686,52 @@ func (v *ClusterCreator) allPhases(
 	return nil
 }
 
+func (v *ClusterCreator) extraPhases(phases *Phases, upgradeState *upgrade.State, upgr *upgrade.Upgrade) error {
+	initialUpgrade := upgr.Enabled
+
+	defer func() {
+		upgr.Enabled = initialUpgrade
+	}()
+
+	for _, phase := range v.postApplyPhases {
+		switch phase {
+		case cluster.OperationPhaseInfrastructure:
+			phases.Infrastructure.SetUpgrade(false)
+
+			if err := phases.Infrastructure.Exec(StartFromFlagNotSet, upgradeState); err != nil {
+				return fmt.Errorf("error while executing post infrastructure phase: %w", err)
+			}
+
+		case cluster.OperationPhaseKubernetes:
+			phases.Kubernetes.SetUpgrade(false)
+
+			if err := phases.Kubernetes.Exec(StartFromFlagNotSet, upgradeState); err != nil {
+				return fmt.Errorf("error while executing post kubernetes phase: %w", err)
+			}
+
+		case cluster.OperationPhaseDistribution:
+			phases.Distribution.SetUpgrade(false)
+
+			if err := phases.Distribution.Exec(
+				v1alpha2.Reducers{},
+				StartFromFlagNotSet,
+				upgradeState,
+			); err != nil {
+				return fmt.Errorf("error while executing post distribution phase: %w", err)
+			}
+
+		case cluster.OperationPhasePlugins:
+			if distribution.HasFeature(v.kfdManifest, distribution.FeaturePlugins) {
+				if err := phases.Plugins.Exec(); err != nil {
+					return fmt.Errorf("error while executing plugins phase: %w", err)
+				}
+			}
+		}
+	}
+
+	return nil
+}
+
 func (v *ClusterCreator) allPhasesExec(
 	startFrom string,
 	phases *Phases,

internal/apis/kfd/v1alpha2/kfddistribution/create/distribution.go

@@ -364,6 +364,10 @@ func (d *Distribution) Stop() error {
 	return nil
 }
 
+func (d *Distribution) SetUpgrade(upgradeEnabled bool) {
+	d.upgrade.Enabled = upgradeEnabled
+}
+
 func (d *Distribution) runReducers(
 	reducers v1alpha2.Reducers,
 	cfg template.Config,

internal/apis/kfd/v1alpha2/kfddistribution/creator.go

@@ -51,6 +51,7 @@ type ClusterCreator struct {
 	force                []string
 	upgrade              bool
 	externalUpgradesPath string
+	postApplyPhases      []string
 }
 
 func (c *ClusterCreator) SetProperties(props []cluster.CreatorProperty) {
@@ -129,6 +130,11 @@ func (c *ClusterCreator) SetProperty(name string, value any) {
 		if s, ok := value.(string); ok {
 			c.externalUpgradesPath = s
 		}
+
+	case cluster.CreatorPropertyPostApplyPhases:
+		if s, ok := value.([]string); ok {
+			c.postApplyPhases = s
+		}
 	}
 }
 
@@ -368,6 +374,47 @@ func (c *ClusterCreator) allPhases(
 		}
 	}
 
+	if len(c.postApplyPhases) > 0 {
+		logrus.Info("Executing extra phases...")
+
+		if err := c.extraPhases(distributionPhase, pluginsPhase, upgradeState, upgr); err != nil {
+			return fmt.Errorf("error while executing extra phases: %w", err)
+		}
+	}
+
+	return nil
+}
+
+func (c *ClusterCreator) extraPhases(
+	distributionPhase upgrade.ReducersOperatorPhase[v1alpha2.Reducers],
+	pluginsPhase *commcreate.Plugins,
+	upgradeState *upgrade.State,
+	upgr *upgrade.Upgrade,
+) error {
+	initialUpgrade := upgr.Enabled
+
+	defer func() {
+		upgr.Enabled = initialUpgrade
+	}()
+
+	for _, phase := range c.postApplyPhases {
+		switch phase {
+		case cluster.OperationPhaseDistribution:
+			distributionPhase.SetUpgrade(false)
+
+			if err := distributionPhase.Exec(v1alpha2.Reducers{}, StartFromFlagNotSet, upgradeState); err != nil {
+				return fmt.Errorf("error while executing distribution phase: %w", err)
+			}
+
+		case cluster.OperationPhasePlugins:
+			if distribution.HasFeature(c.kfdManifest, distribution.FeaturePlugins) {
+				if err := pluginsPhase.Exec(); err != nil {
+					return fmt.Errorf("error while executing plugins phase: %w", err)
+				}
+			}
+		}
+	}
+
 	return nil
 }
 

internal/apis/kfd/v1alpha2/onpremises/create/distribution.go

@@ -289,6 +289,10 @@ func (d *Distribution) injectStoredConfig(cfg template.Config) (template.Config,
 	return cfg, nil
 }
 
+func (d *Distribution) SetUpgrade(upgradeEnabled bool) {
+	d.upgrade.Enabled = upgradeEnabled
+}
+
 func NewDistribution(
 	furyctlConf public.OnpremisesKfdV1Alpha2,
 	kfdManifest config.KFD,

internal/apis/kfd/v1alpha2/onpremises/create/kubernetes.go

@@ -212,6 +212,10 @@ func (k *Kubernetes) postKubernetes(
 	return nil
 }
 
+func (k *Kubernetes) SetUpgrade(upgradeEnabled bool) {
+	k.upgrade.Enabled = upgradeEnabled
+}
+
 func NewKubernetes(
 	furyctlConf public.OnpremisesKfdV1Alpha2,
 	kfdManifest config.KFD,

internal/apis/kfd/v1alpha2/onpremises/creator.go

@@ -54,6 +54,7 @@ type ClusterCreator struct {
 	upgrade              bool
 	externalUpgradesPath string
 	upgradeNode          string
+	postApplyPhases      []string
 }
 
 func (c *ClusterCreator) SetProperties(props []cluster.CreatorProperty) {
@@ -142,6 +143,11 @@ func (c *ClusterCreator) SetProperty(name string, value any) {
 		if s, ok := value.(string); ok {
 			c.upgradeNode = s
 		}
+
+	case cluster.CreatorPropertyPostApplyPhases:
+		if s, ok := value.([]string); ok {
+			c.postApplyPhases = s
+		}
 	}
 }
 
@@ -429,6 +435,61 @@ func (c *ClusterCreator) allPhases(
 		}
 	}
 
+	if len(c.postApplyPhases) > 0 {
+		logrus.Info("Executing extra phases...")
+
+		if err := c.extraPhases(
+			kubernetesPhase,
+			distributionPhase,
+			pluginsPhase,
+			upgr,
+			upgradeState,
+		); err != nil {
+			return fmt.Errorf("error while executing extra phases: %w", err)
+		}
+	}
+
+	return nil
+}
+
+func (c *ClusterCreator) extraPhases(
+	kubernetesPhase upgrade.OperatorPhase,
+	distributionPhase upgrade.ReducersOperatorPhase[v1alpha2.Reducers],
+	pluginsPhase *commcreate.Plugins,
+	upgr *upgrade.Upgrade,
+	upgradeState *upgrade.State,
+) error {
+	initialUpgrade := upgr.Enabled
+
+	defer func() {
+		upgr.Enabled = initialUpgrade
+	}()
+
+	for _, phase := range c.postApplyPhases {
+		switch phase {
+		case cluster.OperationPhaseKubernetes:
+			kubernetesPhase.SetUpgrade(false)
+
+			if err := kubernetesPhase.Exec(StartFromFlagNotSet, upgradeState); err != nil {
+				return fmt.Errorf("error while executing kubernetes phase: %w", err)
+			}
+
+		case cluster.OperationPhaseDistribution:
+			distributionPhase.SetUpgrade(false)
+
+			if err := distributionPhase.Exec(nil, StartFromFlagNotSet, upgradeState); err != nil {
+				return fmt.Errorf("error while executing distribution phase: %w", err)
+			}
+
+		case cluster.OperationPhasePlugins:
+			if distribution.HasFeature(c.kfdManifest, distribution.FeaturePlugins) {
+				if err := pluginsPhase.Exec(); err != nil {
+					return fmt.Errorf("error while executing plugins phase: %w", err)
+				}
+			}
+		}
+	}
+
 	return nil
 }