feat: remove useless steps

Signed-off-by: PoAn Yang <[email protected]>

Author: FrankYang0529

pkg/plan/bootstrap.go

@@ -119,34 +119,6 @@ func (p *plan) addInstructions(cfg *config.Config, dataDir string) error {
 		return err
 	}
 
-	if err := p.addInstruction(rancher.ToScaleDownFleetControllerInstruction(cfg.RancherInstallerImage, cfg.SystemDefaultRegistry, k8sVersion)); err != nil {
-		return err
-	}
-
-	if err := p.addInstruction(rancher.ToUpdateClientSecretInstruction(cfg.RancherInstallerImage, cfg.SystemDefaultRegistry, k8sVersion)); err != nil {
-		return err
-	}
-
-	if err := p.addInstruction(rancher.ToScaleUpFleetControllerInstruction(cfg.RancherInstallerImage, cfg.SystemDefaultRegistry, k8sVersion)); err != nil {
-		return err
-	}
-
-	// Above Rancher v2.9.x, we cannot patch provisioing cluster with empty rkeConfig,
-	// so we need to delete the webhook validation configuration.
-	if semver.Compare(cfg.RancherVersion, "v2.9.0") >= 0 {
-		if err := p.addInstruction(rancher.ToDeleteRancherWebhookValidationConfiguration(k8sVersion)); err != nil {
-			return err
-		}
-	}
-
-	// Patch local provisioning cluster status before installing bootstrap resources,
-	// so bundles can be created first and managed charts can be installed smoothly.
-	if semver.Compare(cfg.RancherVersion, "v2.8.0") >= 0 {
-		if err := p.addInstruction(rancher.PatchLocalProvisioningClusterStatus(cfg.RancherInstallerImage, cfg.SystemDefaultRegistry, k8sVersion)); err != nil {
-			return err
-		}
-	}
-
 	// If clusterrepo check fails, it waits 5 minutes and retries.
 	// Install harvester-cluster-repo deployment before clusterrepo,
 	// so we can avoid the 5 minutes waiting time.
@@ -162,12 +134,6 @@ func (p *plan) addInstructions(cfg *config.Config, dataDir string) error {
 		return err
 	}
 
-	if semver.Compare(cfg.RancherVersion, "v2.9.0") >= 0 {
-		if err := p.addInstruction(rancher.ToRestartRancherWebhookInstruction(k8sVersion)); err != nil {
-			return err
-		}
-	}
-
 	if err := p.addInstruction(rancher.ToWaitSUCInstruction(cfg.RancherInstallerImage, cfg.SystemDefaultRegistry, k8sVersion)); err != nil {
 		return err
 	}

pkg/rancher/wait.go

@@ -82,76 +82,6 @@ func ToWaitClusterClientSecretInstruction(_, _, k8sVersion string) (*applyinator
 	return instruction, nil
 }
 
-func ToUpdateClientSecretInstruction(_, _, k8sVersion string) (*applyinator.OneTimeInstruction, error) {
-	cmd, err := self.Self()
-	if err != nil {
-		return nil, fmt.Errorf("resolving location of %s: %w", os.Args[0], err)
-	}
-	instruction := &applyinator.OneTimeInstruction{}
-	instruction.Name = "update-client-secret"
-	instruction.SaveOutput = true
-	instruction.Args = []string{"update-client-secret"}
-	instruction.Env = kubectl.Env(k8sVersion)
-	instruction.Command = cmd
-	return instruction, nil
-}
-
-func ToScaleDownFleetControllerInstruction(_, _, k8sVersion string) (*applyinator.OneTimeInstruction, error) {
-	cmd, err := self.Self()
-	if err != nil {
-		return nil, fmt.Errorf("resolving location of %s: %w", os.Args[0], err)
-	}
-	instruction := &applyinator.OneTimeInstruction{}
-	instruction.Name = "scale-down-fleet-controller"
-	instruction.SaveOutput = true
-	instruction.Args = []string{"retry", kubectl.Command(k8sVersion), "-n", "cattle-fleet-system", "scale", "--replicas", "0", "deploy/fleet-controller"}
-	instruction.Env = kubectl.Env(k8sVersion)
-	instruction.Command = cmd
-	return instruction, nil
-}
-
-func ToScaleUpFleetControllerInstruction(_, _, k8sVersion string) (*applyinator.OneTimeInstruction, error) {
-	cmd, err := self.Self()
-	if err != nil {
-		return nil, fmt.Errorf("resolving location of %s: %w", os.Args[0], err)
-	}
-	instruction := &applyinator.OneTimeInstruction{}
-	instruction.Name = "scale-up-fleet-controller"
-	instruction.SaveOutput = true
-	instruction.Args = []string{"retry", kubectl.Command(k8sVersion), "-n", "cattle-fleet-system", "scale", "--replicas", "1", "deploy/fleet-controller"}
-	instruction.Env = kubectl.Env(k8sVersion)
-	instruction.Command = cmd
-	return instruction, nil
-}
-
-func ToDeleteRancherWebhookValidationConfiguration(k8sVersion string) (*applyinator.OneTimeInstruction, error) {
-	cmd, err := self.Self()
-	if err != nil {
-		return nil, fmt.Errorf("resolving location of %s: %w", os.Args[0], err)
-	}
-	instruction := &applyinator.OneTimeInstruction{}
-	instruction.Name = "delete-rancher-webhook-validation-configuration"
-	instruction.SaveOutput = true
-	instruction.Args = []string{"retry", kubectl.Command(k8sVersion), "delete", "validatingwebhookconfiguration", "rancher.cattle.io"}
-	instruction.Env = kubectl.Env(k8sVersion)
-	instruction.Command = cmd
-	return instruction, nil
-}
-
-func ToRestartRancherWebhookInstruction(k8sVersion string) (*applyinator.OneTimeInstruction, error) {
-	cmd, err := self.Self()
-	if err != nil {
-		return nil, fmt.Errorf("resolving location of %s: %w", os.Args[0], err)
-	}
-	instruction := &applyinator.OneTimeInstruction{}
-	instruction.Name = "restart-rancher-webhook"
-	instruction.SaveOutput = true
-	instruction.Args = []string{"retry", kubectl.Command(k8sVersion), "-n", "cattle-system", "rollout", "restart", "deploy/rancher-webhook"}
-	instruction.Env = kubectl.Env(k8sVersion)
-	instruction.Command = cmd
-	return instruction, nil
-}
-
 func ToCreateStvAggregationSecret(k8sVersion string) (*applyinator.OneTimeInstruction, error) {
 	cmd, err := self.Self()
 	if err != nil {
@@ -165,19 +95,3 @@ func ToCreateStvAggregationSecret(k8sVersion string) (*applyinator.OneTimeInstru
 	instruction.Command = cmd
 	return instruction, nil
 }
-
-// Needs to patch status subresource
-// k patch cluster.provisioning local -n fleet-local --subresource=status --type=merge --patch '{"status":{"fleetWorkspaceName": "fleet-local"}}'
-func PatchLocalProvisioningClusterStatus(_, _, k8sVersion string) (*applyinator.OneTimeInstruction, error) {
-	cmd, err := self.Self()
-	if err != nil {
-		return nil, fmt.Errorf("resolving location of %s: %w", os.Args[0], err)
-	}
-	instruction := &applyinator.OneTimeInstruction{}
-	instruction.Name = "patch-provisioning-cluster-status"
-	instruction.SaveOutput = true
-	instruction.Args = []string{"retry", kubectl.Command(k8sVersion), "-n", "fleet-local", "patch", "cluster.provisioning", "local", "--subresource=status", "--type=merge", "--patch", "{\"status\":{\"fleetWorkspaceName\": \"fleet-local\"}}"}
-	instruction.Env = kubectl.Env(k8sVersion)
-	instruction.Command = cmd
-	return instruction, nil
-}