Fix

Signed-off-by: Aniruddha Basak <aniruddha.basak@syself.com>

internal/controller/clusterstack_controller.go

@@ -705,7 +705,7 @@ func (r *ClusterStackReconciler) SetupWithManager(ctx context.Context, mgr ctrl.
 
 // ClusterStackReleaseToClusterStack is a handler.ToRequestsFunc to be used to enqueue requests for reconciliation
 // for ClusterStacks that might get updated by changes in ClusterStackReleases.
-func (_ *ClusterStackReconciler) ClusterStackReleaseToClusterStack(ctx context.Context) handler.MapFunc {
+func (*ClusterStackReconciler) ClusterStackReleaseToClusterStack(ctx context.Context) handler.MapFunc {
 	logger := log.FromContext(ctx)
 	return func(ctx context.Context, o client.Object) []reconcile.Request {
 		result := []reconcile.Request{}

internal/controller/clusterstackrelease_controller.go

@@ -166,7 +166,7 @@ func (r *ClusterStackReleaseReconciler) Reconcile(ctx context.Context, req recon
 		return reconcile.Result{}, nil
 	}
 
-	shouldRequeue, err := r.templateAndApply(ctx, releaseAssets, clusterStackRelease, kubeClient)
+	shouldRequeue, err := r.templateAndApply(ctx, &releaseAssets, clusterStackRelease, kubeClient)
 	if err != nil {
 		return reconcile.Result{}, fmt.Errorf("failed to template and apply: %w", err)
 	}
@@ -195,7 +195,7 @@ func (r *ClusterStackReleaseReconciler) reconcileDelete(ctx context.Context, rel
 		}
 	}
 
-	template, err := r.templateClusterClassHelmChart(releaseAssets, clusterStackReleaseCR.Name, clusterStackReleaseCR.Namespace)
+	template, err := r.templateClusterClassHelmChart(&releaseAssets, clusterStackReleaseCR.Name, clusterStackReleaseCR.Namespace)
 	if err != nil {
 		return reconcile.Result{}, fmt.Errorf("failed to perform helm template: %w", err)
 	}
@@ -272,9 +272,9 @@ func (r *ClusterStackReleaseReconciler) updateProviderClusterStackRelease(ctx co
 	return ready, nil
 }
 
-func (r *ClusterStackReleaseReconciler) templateAndApply(ctx context.Context, releaseAssets release.Release, clusterStackRelease *csov1alpha1.ClusterStackRelease, kubeClient kube.Client) (bool, error) {
+func (r *ClusterStackReleaseReconciler) templateAndApply(ctx context.Context, releaseAssets *release.Release, clusterStackRelease *csov1alpha1.ClusterStackRelease, kubeClient kube.Client) (bool, error) {
 	// template helm chart and apply objects
-	template, err := r.templateClusterClassHelmChart(releaseAssets, clusterStackRelease.Name, clusterStackRelease.Namespace)
+	template, err := r.templateClusterClassHelmChart(&releaseAssets, clusterStackRelease.Name, clusterStackRelease.Namespace)
 	if err != nil {
 		return false, fmt.Errorf("failed to template clusterClass helm chart: %w", err)
 	}
@@ -295,7 +295,7 @@ func (r *ClusterStackReleaseReconciler) templateAndApply(ctx context.Context, re
 }
 
 // templateClusterClassHelmChart templates the clusterClass helm chart.
-func (_ *ClusterStackReleaseReconciler) templateClusterClassHelmChart(releaseAssets release.Release, name, namespace string) ([]byte, error) {
+func (*ClusterStackReleaseReconciler) templateClusterClassHelmChart(releaseAssets *release.Release, name, namespace string) ([]byte, error) {
 	clusterClassChart, err := releaseAssets.ClusterClassChartPath()
 	if err != nil {
 		return nil, fmt.Errorf("failed to get clusterClass helm chart path: %w", err)

internal/controller/utils.go

@@ -33,7 +33,8 @@ func getUsedClusterClasses(ctx context.Context, c client.Client, namespace strin
 	usedClusterClasses := make([]string, 0, len(clusterList.Items))
 
 	// list the names of all ClusterClasses that are referenced in Cluster objects
-	for _, cluster := range clusterList.Items {
+	for i := range clusterList.Items {
+		cluster := clusterList.Items[i]
 		if cluster.Spec.Topology == nil {
 			continue
 		}

pkg/clusterstack/clusterstack.go

@@ -128,7 +128,7 @@ func New(provider, name, kubernetesVersion, csVersion string) (ClusterStack, err
 }
 
 // Validate validates a given ClusterStack.
-func (cs ClusterStack) Validate() error {
+func (cs *ClusterStack) Validate() error {
 	if cs.Provider == "" {
 		return ErrInvalidProvider
 	}
@@ -147,7 +147,7 @@ func (cs ClusterStack) Validate() error {
 	return nil
 }
 
-func (cs ClusterStack) String() string {
+func (cs *ClusterStack) String() string {
 	// release tag: myprovider-myclusterstack-1-26-v1
 	return strings.Join([]string{cs.Provider, cs.Name, cs.KubernetesVersion.String(), cs.Version.String()}, Separator)
 }

pkg/kube/kube.go

@@ -57,7 +57,7 @@ func NewFactory() Factory {
 
 var _ Client = &kube{}
 
-func (_ *factory) NewClient(namespace string, resCfg *rest.Config) Client {
+func (*factory) NewClient(namespace string, resCfg *rest.Config) Client {
 	return &kube{
 		Namespace:  namespace,
 		RestConfig: resCfg,

pkg/version/version.go

@@ -45,7 +45,7 @@ func New(version string) (Version, error) {
 	var err error
 	channel := ChannelStable
 
-	re := regexp.MustCompile(`^v\d+(-\b\w+\b[-]\d+)?$`)
+	re := regexp.MustCompile(`^v\d+(-\b\w+\b-\d+)?$`)
 	match := re.FindStringSubmatch(version)
 
 	if len(match) == 0 {
@@ -118,19 +118,23 @@ func (csv Version) Compare(input Version) (int, error) {
 	if csv.Channel != input.Channel {
 		return 0, fmt.Errorf("cannot compare versions with different channels %s and %s", csv.Channel, input.Channel)
 	}
-	if csv.Major > input.Major {
+
+	switch {
+	case csv.Major > input.Major:
 		return 1, nil
-	} else if csv.Major < input.Major {
+	case csv.Major < input.Major:
 		return -1, nil
-	} else if csv.Major == input.Major {
-		if csv.Patch > input.Patch {
+	case csv.Major == input.Major:
+		switch {
+		case csv.Patch > input.Patch:
 			return 1, nil
-		} else if csv.Patch < input.Patch {
+		case csv.Patch < input.Patch:
 			return -1, nil
-		} else if csv.Patch == input.Patch {
+		case csv.Patch == input.Patch:
 			return 0, nil
 		}
 	}
+
 	return 0, nil
 }