Rename helmChartName to Name

aniruddha2000 · janiskemper · commit a508af55d2b4 · 2024-06-24T17:23:55.000+02:00
Signed-off-by: Aniruddha Basak &lt;aniruddha.basak@syself.com&gt;
diff --git a/api/v1alpha1/clusteraddon_types.go b/api/v1alpha1/clusteraddon_types.go
@@ -63,7 +63,7 @@ var (
 type StageStatus struct {
 	// Name represent name of the helm chart
 	// +optional
-	Name string `json:"helmChartName"`
+	Name string `json:"name"`
 
 	// Action is the action of the helm chart. e.g. - apply and delete.
 	// +optional
@@ -133,9 +133,9 @@ type ClusterAddon struct {
 }
 
 // GetStagePhase returns helm chart status for the helm chart.
-func (r *ClusterAddon) GetStagePhase(helmChartName string, action clusteraddon.Action) StagePhase {
+func (r *ClusterAddon) GetStagePhase(stageName string, action clusteraddon.Action) StagePhase {
 	for _, stage := range r.Status.Stages {
-		if stage.Name == helmChartName && stage.Action == action {
+		if stage.Name == stageName && stage.Action == action {
 			return stage.Phase
 		}
 	}
@@ -145,9 +145,9 @@ func (r *ClusterAddon) GetStagePhase(helmChartName string, action clusteraddon.A
 }
 
 // SetStagePhase sets the helm chart status phase.
-func (r *ClusterAddon) SetStagePhase(helmChartName string, action clusteraddon.Action, phase StagePhase) {
+func (r *ClusterAddon) SetStagePhase(stageName string, action clusteraddon.Action, phase StagePhase) {
 	for i := range r.Status.Stages {
-		if r.Status.Stages[i].Name == helmChartName && r.Status.Stages[i].Action == action {
+		if r.Status.Stages[i].Name == stageName && r.Status.Stages[i].Action == action {
 			r.Status.Stages[i].Phase = phase
 		}
 	}
diff --git a/config/crd/bases/clusterstack.x-k8s.io_clusteraddons.yaml b/config/crd/bases/clusterstack.x-k8s.io_clusteraddons.yaml
@@ -217,7 +217,7 @@ spec:
                       description: Action is the action of the helm chart. e.g. -
                         apply and delete.
                       type: string
-                    helmChartName:
+                    name:
                       description: Name represent name of the helm chart
                       type: string
                     phase:
diff --git a/internal/controller/clusteraddon_controller.go b/internal/controller/clusteraddon_controller.go
@@ -322,7 +322,7 @@ func (r *ClusterAddonReconciler) Reconcile(ctx context.Context, req reconcile.Re
 		if clusterAddon.Status.Ready || len(clusterAddon.Status.Stages) == 0 {
 			clusterAddon.Status.Stages = make([]csov1alpha1.StageStatus, len(clusterAddonConfig.AddonStages[clusterAddon.Spec.Hook]))
 			for i, stage := range clusterAddonConfig.AddonStages[clusterAddon.Spec.Hook] {
-				clusterAddon.Status.Stages[i].Name = stage.HelmChartName
+				clusterAddon.Status.Stages[i].Name = stage.Name
 				clusterAddon.Status.Stages[i].Action = stage.Action
 				clusterAddon.Status.Stages[i].Phase = csov1alpha1.StagePhasePending
 			}
@@ -337,7 +337,7 @@ func (r *ClusterAddonReconciler) Reconcile(ctx context.Context, req reconcile.Re
 			if clusterAddon.Status.Ready || len(clusterAddon.Status.Stages) == 0 {
 				clusterAddon.Status.Stages = make([]csov1alpha1.StageStatus, len(clusterAddonConfig.AddonStages["BeforeClusterUpgrade"]))
 				for i, stage := range clusterAddonConfig.AddonStages["BeforeClusterUpgrade"] {
-					clusterAddon.Status.Stages[i].Name = stage.HelmChartName
+					clusterAddon.Status.Stages[i].Name = stage.Name
 					clusterAddon.Status.Stages[i].Action = stage.Action
 					clusterAddon.Status.Stages[i].Phase = csov1alpha1.StagePhasePending
 				}
@@ -361,6 +361,7 @@ func (r *ClusterAddonReconciler) Reconcile(ctx context.Context, req reconcile.Re
 	// we just take the Helm charts that are supposed to be installed in the BeforeClusterUpgrade hook and apply them.
 	if oldRelease != nil && oldRelease.Meta.Versions.Kubernetes == releaseAsset.Meta.Versions.Kubernetes {
 		clusterAddon.Spec.Hook = "BeforeClusterUpgrade"
+
 		for _, stage := range clusterAddonConfig.AddonStages["BeforeClusterUpgrade"] {
 			shouldRequeue, err := r.executeStage(ctx, stage, in)
 			if err != nil {
@@ -428,7 +429,7 @@ func (r *ClusterAddonReconciler) Reconcile(ctx context.Context, req reconcile.Re
 	for _, stage := range clusterAddonConfig.AddonStages[clusterAddon.Spec.Hook] {
 		shouldRequeue, err := r.executeStage(ctx, stage, in)
 		if err != nil {
-			return reconcile.Result{}, fmt.Errorf("failed to execute stage: %q: %w", stage.HelmChartName, err)
+			return reconcile.Result{}, fmt.Errorf("failed to execute stage: %q: %w", stage.Name, err)
 		}
 		if shouldRequeue {
 			return reconcile.Result{RequeueAfter: 20 * time.Second}, nil
@@ -490,14 +491,14 @@ func (r *ClusterAddonReconciler) getNewReleaseObjects(ctx context.Context, in *t
 	)
 
 	for _, stage := range clusterAddonConfig.AddonStages[in.clusterAddon.Spec.Hook] {
-		if _, err := os.Stat(filepath.Join(in.newDestinationClusterAddonChartDir, stage.HelmChartName, release.OverwriteYaml)); err == nil {
-			newBuildTemplate, err = buildTemplateFromClusterAddonValues(ctx, filepath.Join(in.newDestinationClusterAddonChartDir, stage.HelmChartName, release.OverwriteYaml), in.cluster, r.Client)
+		if _, err := os.Stat(filepath.Join(in.newDestinationClusterAddonChartDir, stage.Name, release.OverwriteYaml)); err == nil {
+			newBuildTemplate, err = buildTemplateFromClusterAddonValues(ctx, filepath.Join(in.newDestinationClusterAddonChartDir, stage.Name, release.OverwriteYaml), in.cluster, r.Client)
 			if err != nil {
 				return nil, fmt.Errorf("failed to build template from new cluster addon values of the latest cluster stack: %w", err)
 			}
 		}
 
-		helmTemplate, err := helmTemplateClusterAddon(filepath.Join(in.newDestinationClusterAddonChartDir, stage.HelmChartName), newBuildTemplate)
+		helmTemplate, err := helmTemplateClusterAddon(filepath.Join(in.newDestinationClusterAddonChartDir, stage.Name), newBuildTemplate)
 		if err != nil {
 			return nil, fmt.Errorf("failed to template new helm chart of the latest cluster stack: %w", err)
 		}
@@ -566,14 +567,14 @@ func (r *ClusterAddonReconciler) getOldReleaseObjects(ctx context.Context, in *t
 	}
 
 	for _, stage := range clusterAddonConfig.AddonStages[hook] {
-		if _, err := os.Stat(filepath.Join(in.oldDestinationClusterAddonChartDir, stage.HelmChartName, release.OverwriteYaml)); err == nil {
-			newBuildTemplate, err = buildTemplateFromClusterAddonValues(ctx, filepath.Join(in.oldDestinationClusterAddonChartDir, stage.HelmChartName, release.OverwriteYaml), in.cluster, r.Client)
+		if _, err := os.Stat(filepath.Join(in.oldDestinationClusterAddonChartDir, stage.Name, release.OverwriteYaml)); err == nil {
+			newBuildTemplate, err = buildTemplateFromClusterAddonValues(ctx, filepath.Join(in.oldDestinationClusterAddonChartDir, stage.Name, release.OverwriteYaml), in.cluster, r.Client)
 			if err != nil {
 				return nil, fmt.Errorf("failed to build template from new cluster addon values: %w", err)
 			}
 		}
 
-		helmTemplate, err := helmTemplateClusterAddon(filepath.Join(in.oldDestinationClusterAddonChartDir, stage.HelmChartName), newBuildTemplate)
+		helmTemplate, err := helmTemplateClusterAddon(filepath.Join(in.oldDestinationClusterAddonChartDir, stage.Name), newBuildTemplate)
 		if err != nil {
 			return nil, fmt.Errorf("failed to template new helm chart: %w", err)
 		}
@@ -737,7 +738,7 @@ func (r *ClusterAddonReconciler) executeStage(ctx context.Context, stage *cluste
 		err           error
 	)
 
-	_, exists := in.chartMap[stage.HelmChartName]
+	_, exists := in.chartMap[stage.Name]
 	if !exists {
 		// do not reconcile by returning error, just create an event.
 		conditions.MarkFalse(
@@ -746,44 +747,44 @@ func (r *ClusterAddonReconciler) executeStage(ctx context.Context, stage *cluste
 			csov1alpha1.HelmChartMissingReason,
 			clusterv1.ConditionSeverityInfo,
 			"helm chart name doesn't exists in the cluster addon helm chart: %q",
-			stage.HelmChartName,
+			stage.Name,
 		)
 		return false, nil
 	}
 
 check:
-	switch in.clusterAddon.GetStagePhase(stage.HelmChartName, stage.Action) {
+	switch in.clusterAddon.GetStagePhase(stage.Name, stage.Action) {
 	case csov1alpha1.StagePhasePending, csov1alpha1.StagePhaseWaitingForPreCondition:
 		// If WaitForPreCondition is mentioned.
 		if !reflect.DeepEqual(stage.WaitForPreCondition, clusteraddon.WaitForCondition{}) {
 			// Evaluate the condition.
-			logger.V(1).Info("starting to evaluate pre condition", "clusterStack", in.clusterAddon.Spec.ClusterStack, "helm chart", stage.HelmChartName, "hook", in.clusterAddon.Spec.Hook)
+			logger.V(1).Info("starting to evaluate pre condition", "clusterStack", in.clusterAddon.Spec.ClusterStack, "name", stage.Name, "hook", in.clusterAddon.Spec.Hook)
 			if err := getDynamicResourceAndEvaluateCEL(ctx, in.dynamicClient, in.discoverClient, stage.WaitForPreCondition); err != nil {
 				if errors.Is(err, clusteraddon.ErrConditionNotMatch) {
 					conditions.MarkFalse(
 						in.clusterAddon,
 						csov1alpha1.EvaluatedCELCondition,
 						csov1alpha1.FailedToEvaluatePreConditionReason,
 						clusterv1.ConditionSeverityInfo,
-						"failed to successfully evaluate pre condition: %q: %s", stage.HelmChartName, err.Error(),
+						"failed to successfully evaluate pre condition: %q: %s", stage.Name, err.Error(),
 					)
 
-					in.clusterAddon.SetStagePhase(stage.HelmChartName, stage.Action, csov1alpha1.StagePhaseWaitingForPreCondition)
+					in.clusterAddon.SetStagePhase(stage.Name, stage.Action, csov1alpha1.StagePhaseWaitingForPreCondition)
 
 					return true, nil
 				}
 				return false, fmt.Errorf("failed to get dynamic resource and evaluate cel expression for pre condition: %w", err)
 			}
-			logger.V(1).Info("finished evaluating pre condition", "clusterStack", in.clusterAddon.Spec.ClusterStack, "helm chart", stage.HelmChartName, "hook", in.clusterAddon.Spec.Hook)
+			logger.V(1).Info("finished evaluating pre condition", "clusterStack", in.clusterAddon.Spec.ClusterStack, "name", stage.Name, "hook", in.clusterAddon.Spec.Hook)
 		}
 
-		in.clusterAddon.SetStagePhase(stage.HelmChartName, stage.Action, csov1alpha1.StagePhaseApplyingOrDeleting)
+		in.clusterAddon.SetStagePhase(stage.Name, stage.Action, csov1alpha1.StagePhaseApplyingOrDeleting)
 		goto check
 
 	case csov1alpha1.StagePhaseApplyingOrDeleting:
 		if stage.Action == clusteraddon.Apply {
-			logger.V(1).Info("starting to apply helm chart", "clusterStack", in.clusterAddon.Spec.ClusterStack, "helm chart", stage.HelmChartName, "hook", in.clusterAddon.Spec.Hook)
-			shouldRequeue, err = r.templateAndApplyNewClusterStackAddonHelmChart(ctx, in, stage.HelmChartName)
+			logger.V(1).Info("starting to apply helm chart", "clusterStack", in.clusterAddon.Spec.ClusterStack, "name", stage.Name, "hook", in.clusterAddon.Spec.Hook)
+			shouldRequeue, err = r.templateAndApplyNewClusterStackAddonHelmChart(ctx, in, stage.Name)
 			if err != nil {
 				return false, fmt.Errorf("failed to helm template and apply: %w", err)
 			}
@@ -793,22 +794,22 @@ check:
 					csov1alpha1.HelmChartAppliedCondition,
 					csov1alpha1.FailedToApplyObjectsReason,
 					clusterv1.ConditionSeverityInfo,
-					"failed to successfully apply helm chart: %q", stage.HelmChartName,
+					"failed to successfully apply helm chart: %q", stage.Name,
 				)
 
 				return true, nil
 			}
-			logger.V(1).Info("finished applying helm chart", "clusterStack", in.clusterAddon.Spec.ClusterStack, "helm chart", stage.HelmChartName, "hook", in.clusterAddon.Spec.Hook)
+			logger.V(1).Info("finished applying helm chart", "clusterStack", in.clusterAddon.Spec.ClusterStack, "name", stage.Name, "hook", in.clusterAddon.Spec.Hook)
 
 			// remove status resource if applied successfully
 			in.clusterAddon.Status.Resources = make([]*csov1alpha1.Resource, 0)
 
-			in.clusterAddon.SetStagePhase(stage.HelmChartName, stage.Action, csov1alpha1.StagePhaseWaitingForPostCondition)
+			in.clusterAddon.SetStagePhase(stage.Name, stage.Action, csov1alpha1.StagePhaseWaitingForPostCondition)
 			goto check
 		} else {
 			// Delete part
-			logger.V(1).Info("starting to delete helm chart", "clusterStack", in.clusterAddon.Spec.ClusterStack, "helm chart", stage.HelmChartName, "hook", in.clusterAddon.Spec.Hook)
-			shouldRequeue, err = helmTemplateAndDeleteNewClusterStack(ctx, in, stage.HelmChartName)
+			logger.V(1).Info("starting to delete helm chart", "clusterStack", in.clusterAddon.Spec.ClusterStack, "name", stage.Name, "hook", in.clusterAddon.Spec.Hook)
+			shouldRequeue, err = helmTemplateAndDeleteNewClusterStack(ctx, in, stage.Name)
 			if err != nil {
 				return false, fmt.Errorf("failed to delete helm chart: %w", err)
 			}
@@ -818,43 +819,43 @@ check:
 					csov1alpha1.HelmChartDeletedCondition,
 					csov1alpha1.FailedToDeleteObjectsReason,
 					clusterv1.ConditionSeverityInfo,
-					"failed to successfully delete helm chart: %q", stage.HelmChartName,
+					"failed to successfully delete helm chart: %q", stage.Name,
 				)
 
 				return true, nil
 			}
-			logger.V(1).Info("finished deleting helm chart", "clusterStack", in.clusterAddon.Spec.ClusterStack, "helm chart", stage.HelmChartName, "hook", in.clusterAddon.Spec.Hook)
+			logger.V(1).Info("finished deleting helm chart", "clusterStack", in.clusterAddon.Spec.ClusterStack, "name", stage.Name, "hook", in.clusterAddon.Spec.Hook)
 
 			// remove status resource if deleted successfully
 			in.clusterAddon.Status.Resources = make([]*csov1alpha1.Resource, 0)
 
-			in.clusterAddon.SetStagePhase(stage.HelmChartName, stage.Action, csov1alpha1.StagePhaseWaitingForPostCondition)
+			in.clusterAddon.SetStagePhase(stage.Name, stage.Action, csov1alpha1.StagePhaseWaitingForPostCondition)
 			goto check
 		}
 
 	case csov1alpha1.StagePhaseWaitingForPostCondition:
 		// If WaitForPostCondition is mentioned.
 		if !reflect.DeepEqual(stage.WaitForPostCondition, clusteraddon.WaitForCondition{}) {
 			// Evaluate the condition.
-			logger.V(1).Info("starting to evaluate post condition", "clusterStack", in.clusterAddon.Spec.ClusterStack, "helm chart", stage.HelmChartName, "hook", in.clusterAddon.Spec.Hook)
+			logger.V(1).Info("starting to evaluate post condition", "clusterStack", in.clusterAddon.Spec.ClusterStack, "name", stage.Name, "hook", in.clusterAddon.Spec.Hook)
 			if err := getDynamicResourceAndEvaluateCEL(ctx, in.dynamicClient, in.discoverClient, stage.WaitForPostCondition); err != nil {
 				if errors.Is(err, clusteraddon.ErrConditionNotMatch) {
 					conditions.MarkFalse(
 						in.clusterAddon,
 						csov1alpha1.EvaluatedCELCondition,
 						csov1alpha1.FailedToEvaluatePostConditionReason,
 						clusterv1.ConditionSeverityInfo,
-						"failed to successfully evaluate post condition: %q: %s", stage.HelmChartName, err.Error(),
+						"failed to successfully evaluate post condition: %q: %s", stage.Name, err.Error(),
 					)
 
 					return true, nil
 				}
 				return false, fmt.Errorf("failed to get dynamic resource and evaluate cel expression for post condition: %w", err)
 			}
-			logger.V(1).Info("finished evaluating post condition", "clusterStack", in.clusterAddon.Spec.ClusterStack, "helm chart", stage.HelmChartName, "hook", in.clusterAddon.Spec.Hook)
+			logger.V(1).Info("finished evaluating post condition", "clusterStack", in.clusterAddon.Spec.ClusterStack, "name", stage.Name, "hook", in.clusterAddon.Spec.Hook)
 		}
 
-		in.clusterAddon.SetStagePhase(stage.HelmChartName, stage.Action, csov1alpha1.StagePhaseDone)
+		in.clusterAddon.SetStagePhase(stage.Name, stage.Action, csov1alpha1.StagePhaseDone)
 	}
 
 	return false, nil
@@ -926,7 +927,7 @@ func (r *ClusterAddonReconciler) downloadOldClusterStackRelease(ctx context.Cont
 	return &releaseAsset, false, nil
 }
 
-func (r *ClusterAddonReconciler) templateAndApplyNewClusterStackAddonHelmChart(ctx context.Context, in *templateAndApplyClusterAddonInput, helmChartName string) (bool, error) {
+func (r *ClusterAddonReconciler) templateAndApplyNewClusterStackAddonHelmChart(ctx context.Context, in *templateAndApplyClusterAddonInput, name string) (bool, error) {
 	var (
 		oldHelmTemplate  []byte
 		oldBuildTemplate []byte
@@ -935,7 +936,7 @@ func (r *ClusterAddonReconciler) templateAndApplyNewClusterStackAddonHelmChart(c
 	)
 
 	if in.oldDestinationClusterAddonChartDir != "" {
-		oldClusterStackSubDirPath := filepath.Join(in.oldDestinationClusterAddonChartDir, helmChartName)
+		oldClusterStackSubDirPath := filepath.Join(in.oldDestinationClusterAddonChartDir, name)
 
 		// we skip helm templating if last cluster stack don't follow the new convention.
 		if _, err := os.Stat(filepath.Join(oldClusterStackSubDirPath, release.OverwriteYaml)); err == nil {
@@ -951,7 +952,7 @@ func (r *ClusterAddonReconciler) templateAndApplyNewClusterStackAddonHelmChart(c
 		}
 	}
 
-	newClusterStackSubDirPath := filepath.Join(in.newDestinationClusterAddonChartDir, helmChartName)
+	newClusterStackSubDirPath := filepath.Join(in.newDestinationClusterAddonChartDir, name)
 
 	if _, err := os.Stat(filepath.Join(newClusterStackSubDirPath, release.OverwriteYaml)); err == nil {
 		newBuildTemplate, err = buildTemplateFromClusterAddonValues(ctx, filepath.Join(newClusterStackSubDirPath, release.OverwriteYaml), in.cluster, r.Client)
@@ -976,13 +977,13 @@ func (r *ClusterAddonReconciler) templateAndApplyNewClusterStackAddonHelmChart(c
 	return shouldRequeue, nil
 }
 
-func helmTemplateAndDeleteNewClusterStack(ctx context.Context, in *templateAndApplyClusterAddonInput, helmChartName string) (bool, error) {
+func helmTemplateAndDeleteNewClusterStack(ctx context.Context, in *templateAndApplyClusterAddonInput, name string) (bool, error) {
 	var (
 		buildTemplate []byte
 		err           error
 	)
 
-	newClusterStackSubDirPath := filepath.Join(in.newDestinationClusterAddonChartDir, helmChartName)
+	newClusterStackSubDirPath := filepath.Join(in.newDestinationClusterAddonChartDir, name)
 	newHelmTemplate, err := helmTemplateClusterAddon(newClusterStackSubDirPath, buildTemplate)
 	if err != nil {
 		return false, fmt.Errorf("failed to template new helm chart: %w", err)
diff --git a/internal/test/integration/workloadcluster/controller_suite_test.go b/internal/test/integration/workloadcluster/controller_suite_test.go
@@ -31,14 +31,16 @@ import (
 )
 
 const (
-	timeout  = time.Second * 3
+	timeout  = time.Second * 2
 	interval = 100 * time.Millisecond
 
 	testClusterStackName   = "docker-ferrol-1-27-v1"
 	testClusterStackNameV2 = "docker-ferrol-1-27-v2"
 	testClusterStackNameV3 = "docker-ferrol-1-27-v3"
 
+	// cluster stack.
 	testNewWayClusterStackName = "docker-ferrol-1-27-v0-sha-hipstsw"
+	// cluster class.
 	testNewWayClusterClassName = "docker-ferrol-1-27-v0-sha.hipstsw"
 )
 
diff --git a/pkg/clusteraddon/clusteraddon.go b/pkg/clusteraddon/clusteraddon.go
@@ -57,7 +57,7 @@ type WaitForCondition struct {
 
 // Stage is a stage of a hook in which a certain Helm chart is applied and pre- and post-conditions are evaluated if they exist.
 type Stage struct {
-	HelmChartName        string           `yaml:"helmChartName"`
+	Name                 string           `yaml:"name"`
 	Action               Action           `yaml:"action"`
 	WaitForPreCondition  WaitForCondition `yaml:"waitForPreCondition,omitempty"`
 	WaitForPostCondition WaitForCondition `yaml:"waitForPostCondition,omitempty"`
diff --git a/test/cluster-stacks/1/docker/ferrol/1-27/clusteraddon.yaml b/test/cluster-stacks/1/docker/ferrol/1-27/clusteraddon.yaml
@@ -2,12 +2,12 @@ apiVersion: clusteraddonconfig.x-k8s.io/v1alpha1
 clusterAddonVersion: clusteraddons.clusterstack.x-k8s.io/v1alpha1
 addonStages:
   AfterControlPlaneInitialized:
-    - helmChartName: cni
+    - name: cni
       action: apply
-    - helmChartName: metrics-server
+    - name: metrics-server
       action: apply
-  BeforeClusterUpgrade:
-    - helmChartName: ngnix
+  name:
+    - name: ngnix
       action: apply
       waitForPostCondition:
         objects:
diff --git a/test/cluster-stacks/2/docker/ferrol/1-27/clusteraddon.yaml b/test/cluster-stacks/2/docker/ferrol/1-27/clusteraddon.yaml
@@ -2,16 +2,16 @@ apiVersion: clusteraddonconfig.x-k8s.io/v1alpha1
 clusterAddonVersion: clusteraddons.clusterstack.x-k8s.io/v1alpha1
 addonStages:
   AfterControlPlaneInitialized:
-    - helmChartName: cni
+    - name: cni
       action: apply
-    - helmChartName: metrics-server
+    - name: metrics-server
       action: apply
-  BeforeClusterUpgrade:
-      - helmChartName: cni
+  name:
+    - name: cni
       action: apply
-    - helmChartName: metrics-server
+    - name: metrics-server
       action: apply
-    - helmChartName: ngnix
+    - name: ngnix
       action: apply
       waitForPostCondition:
         objects:
diff --git a/test/releases/cluster-stacks/docker-ferrol-1-27-v0-sha-hipstsw/clusteraddon.yaml b/test/releases/cluster-stacks/docker-ferrol-1-27-v0-sha-hipstsw/clusteraddon.yaml
@@ -2,10 +2,10 @@ apiVersion: clusteraddonconfig.x-k8s.io/v1alpha1
 clusterAddonVersion: clusteraddons.clusterstack.x-k8s.io/v1alpha1
 addonStages:
   AfterControlPlaneInitialized:
-    - helmChartName: metrics-server
+    - name: metrics-server
       action: apply
   BeforeClusterUpgrade:
-    - helmChartName: ngnix
+    - name: ngnix
       action: apply
       waitForPostCondition:
         objects:

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ var (`
`63`	`63`	`type StageStatus struct {`
`64`	`64`	`// Name represent name of the helm chart`
`65`	`65`	`// +optional`
`66`		- Name string `json:"helmChartName"`
	`66`	+ Name string `json:"name"`
`67`	`67`
`68`	`68`	`// Action is the action of the helm chart. e.g. - apply and delete.`
`69`	`69`	`// +optional`
`@@ -133,9 +133,9 @@ type ClusterAddon struct {`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`// GetStagePhase returns helm chart status for the helm chart.`
`136`		`-func (r *ClusterAddon) GetStagePhase(helmChartName string, action clusteraddon.Action) StagePhase {`
	`136`	`+func (r *ClusterAddon) GetStagePhase(stageName string, action clusteraddon.Action) StagePhase {`
`137`	`137`	`for _, stage := range r.Status.Stages {`
`138`		`- if stage.Name == helmChartName && stage.Action == action {`
	`138`	`+ if stage.Name == stageName && stage.Action == action {`
`139`	`139`	`return stage.Phase`
`140`	`140`	`}`
`141`	`141`	`}`
`@@ -145,9 +145,9 @@ func (r *ClusterAddon) GetStagePhase(helmChartName string, action clusteraddon.A`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`// SetStagePhase sets the helm chart status phase.`
`148`		`-func (r *ClusterAddon) SetStagePhase(helmChartName string, action clusteraddon.Action, phase StagePhase) {`
	`148`	`+func (r *ClusterAddon) SetStagePhase(stageName string, action clusteraddon.Action, phase StagePhase) {`
`149`	`149`	`for i := range r.Status.Stages {`
`150`		`- if r.Status.Stages[i].Name == helmChartName && r.Status.Stages[i].Action == action {`
	`150`	`+ if r.Status.Stages[i].Name == stageName && r.Status.Stages[i].Action == action {`
`151`	`151`	`r.Status.Stages[i].Phase = phase`
`152`	`152`	`}`
`153`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,14 +31,16 @@ import (`
`31`	`31`	`)`
`32`	`32`
`33`	`33`	`const (`
`34`		`- timeout = time.Second * 3`
	`34`	`+ timeout = time.Second * 2`
`35`	`35`	`interval = 100 * time.Millisecond`
`36`	`36`
`37`	`37`	`testClusterStackName = "docker-ferrol-1-27-v1"`
`38`	`38`	`testClusterStackNameV2 = "docker-ferrol-1-27-v2"`
`39`	`39`	`testClusterStackNameV3 = "docker-ferrol-1-27-v3"`
`40`	`40`
	`41`	`+ // cluster stack.`
`41`	`42`	`testNewWayClusterStackName = "docker-ferrol-1-27-v0-sha-hipstsw"`
	`43`	`+ // cluster class.`
`42`	`44`	`testNewWayClusterClassName = "docker-ferrol-1-27-v0-sha.hipstsw"`
`43`	`45`	`)`
`44`	`46`