fixup! fix: Properly specify release name for CA addon

Author: jimmidyson

pkg/handlers/generic/lifecycle/addons/helmaddon.go

@@ -76,8 +76,9 @@ func NewHelmAddonApplier(
 }
 
 type applyOptions struct {
-	valueTemplater func(cluster *clusterv1.Cluster, valuesTemplate string) (string, error)
-	targetCluster  *clusterv1.Cluster
+	valueTemplater  func(cluster *clusterv1.Cluster, valuesTemplate string) (string, error)
+	targetCluster   *clusterv1.Cluster
+	helmReleaseName string
 }
 
 type applyOption func(*applyOptions)
@@ -100,6 +101,14 @@ func (a *helmAddonApplier) WithTargetCluster(cluster *clusterv1.Cluster) *helmAd
 	return a
 }
 
+func (a *helmAddonApplier) WithHelmReleaseName(name string) *helmAddonApplier {
+	a.opts = append(a.opts, func(o *applyOptions) {
+		o.helmReleaseName = name
+	})
+
+	return a
+}
+
 func (a *helmAddonApplier) Apply(
 	ctx context.Context,
 	cluster *clusterv1.Cluster,
@@ -145,6 +154,11 @@ func (a *helmAddonApplier) Apply(
 		targetCluster = applyOpts.targetCluster
 	}
 
+	helmReleaseName := a.config.defaultHelmReleaseName
+	if applyOpts.helmReleaseName != "" {
+		helmReleaseName = applyOpts.helmReleaseName
+	}
+
 	chartProxy := &caaphv1.HelmChartProxy{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: caaphv1.GroupVersion.String(),
@@ -161,7 +175,7 @@ func (a *helmAddonApplier) Apply(
 				MatchLabels: map[string]string{clusterv1.ClusterNameLabel: targetCluster.Name},
 			},
 			ReleaseNamespace: a.config.defaultHelmReleaseNamespace,
-			ReleaseName:      a.config.defaultHelmReleaseName,
+			ReleaseName:      helmReleaseName,
 			Version:          a.helmChart.Version,
 			ValuesTemplate:   values,
 		},

pkg/handlers/generic/lifecycle/clusterautoscaler/handler.go

@@ -24,7 +24,7 @@ import (
 )
 
 const (
-	addonName = "cluster-autoscaler"
+	addonName = "ca"
 )
 
 type addonStrategy interface {

pkg/handlers/generic/lifecycle/clusterautoscaler/strategy_helmaddon.go

@@ -60,7 +60,10 @@ func (s helmAddonStrategy) apply(
 		),
 		s.client,
 		s.helmChart,
-	).WithTargetCluster(targetCluster).WithValueTemplater(templateValues)
+	).
+		WithTargetCluster(targetCluster).
+		WithValueTemplater(templateValues).
+		WithHelmReleaseName(addonResourceNameForCluster(cluster))
 
 	if err = applier.Apply(ctx, cluster, defaultsNamespace, log); err != nil {
 		return fmt.Errorf("failed to apply cluster-autoscaler installation HelmChartProxy: %w", err)

test/e2e/clusterautoscaler_helpers.go

@@ -23,7 +23,7 @@ import (
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/utils"
 )
 
-const clusterAutoscalerReleaseName = "cluster-autoscaler"
+const clusterAutoscalerReleaseName = "ca"
 
 type WaitForClusterAutoscalerToBeReadyForWorkloadClusterInput struct {
 	ClusterAutoscaler           *v1alpha1.ClusterAutoscaler
@@ -110,8 +110,7 @@ func WaitForClusterAutoscalerToBeReadyForWorkloadCluster(
 				ObjectMeta: metav1.ObjectMeta{
 					Namespace: input.WorkloadCluster.Namespace,
 					Name: fmt.Sprintf(
-						"%s-%s",
-						clusterAutoscalerReleaseName,
+						"cluster-autoscaler-%s",
 						input.WorkloadCluster.Annotations[v1alpha1.ClusterUUIDAnnotationKey],
 					),
 				},