Revert "Make the createRelease value actually not install the release…

…. Also, change the chart version code to match up with what exists in the helm repo"

This reverts commit 929a4ca.

config/dev/hmc_values.yaml

@@ -4,5 +4,5 @@ image:
 controller:
   defaultRegistryURL: oci://hmc-local-registry:5000/charts
   insecureRegistry: true
-  createRelease: true
+  createRelease: false
   createTemplates: false

internal/controller/release_controller.go

@@ -106,14 +106,10 @@ func (r *ReleaseReconciler) ensureManagement(ctx context.Context) error {
 	if !apierrors.IsNotFound(err) {
 		return fmt.Errorf("failed to get %s Management object: %w", hmc.TemplateManagementName, err)
 	}
-
-	if r.CreateRelease {
-		mgmtObj.Spec.Release, err = r.getCurrentReleaseName(ctx)
-		if err != nil {
-			return err
-		}
+	mgmtObj.Spec.Release, err = r.getCurrentReleaseName(ctx)
+	if err != nil {
+		return err
 	}
-
 	if err := mgmtObj.Spec.SetProvidersDefaults(); err != nil {
 		return err
 	}
@@ -161,7 +157,7 @@ func (r *ReleaseReconciler) reconcileHMCTemplates(ctx context.Context, req ctrl.
 		l.Info("Templates creation is disabled")
 		return nil
 	}
-	if !r.CreateRelease || initialReconcile(req) {
+	if initialReconcile(req) && !r.CreateRelease {
 		l.Info("Initial creation of HMC Release is skipped")
 		return nil
 	}
@@ -210,7 +206,7 @@ func (r *ReleaseReconciler) reconcileHMCTemplates(ctx context.Context, req ctrl.
 		helmChart.Labels[hmc.HMCManagedLabelKey] = hmc.HMCManagedLabelValue
 		helmChart.Spec = sourcev1.HelmChartSpec{
 			Chart:   r.HMCTemplatesChartName,
-			Version: utils.ChartVersionFromVersion(version),
+			Version: version,
 			SourceRef: sourcev1.LocalHelmChartSourceReference{
 				Kind: sourcev1.HelmRepositoryKind,
 				Name: defaultRepoName,

internal/utils/release.go

@@ -20,15 +20,6 @@ func ReleaseNameFromVersion(version string) string {
 	return "hmc-" + strings.ReplaceAll(strings.TrimPrefix(version, "v"), ".", "-")
 }
 
-func ChartVersionFromVersion(version string) string {
-	index := strings.Index(version, "-")
-	cut := strings.TrimPrefix(version, "v")
-	if index >= 1 {
-		cut = cut[:index-1]
-	}
-	return cut
-}
-
 func TemplatesChartFromReleaseName(releaseName string) string {
 	return releaseName + "-tpl"
 }