Updated for review comments

Signed-off-by: MichaelMorris <michael.morris@est.tech>

Author: MichaelMorrisEst

api/v2/helmrelease_types.go

@@ -795,9 +795,9 @@ type ChartNameChangeStrategy string
 
 const (
 	// Update the Helm release in place.
-	InPlaceUpdate ChartNameChangeStrategy = "InPlaceUpdate"
+	ChartNameChangeStrategyInPlaceUpdate ChartNameChangeStrategy = "InPlaceUpdate"
 	// Reinstall the Helm release, uninstalling the existing Helm release
-	Reinstall ChartNameChangeStrategy = "Reinstall"
+	ChartNameChangeStrategyReinstall ChartNameChangeStrategy = "Reinstall"
 )
 
 // Upgrade holds the configuration for Helm upgrade actions for this
@@ -904,6 +904,7 @@ type Upgrade struct {
 	//
 	// InPlaceUpdate: Update the Helm release in place.
 	//
+	// +kubebuilder:validation:Enum=InPlaceUpdate;Reinstall
 	// +optional
 	ChartNameChangeStrategy ChartNameChangeStrategy `json:"chartNameChangeStrategy,omitempty"`
 }

config/crd/bases/helm.toolkit.fluxcd.io_helmreleases.yaml

@@ -926,6 +926,9 @@ spec:
                       Reinstall: Reinstall the Helm release, uninstalling the existing Helm release.
 
                       InPlaceUpdate: Update the Helm release in place.
+                    enum:
+                    - InPlaceUpdate
+                    - Reinstall
                     type: string
                   cleanupOnFail:
                     description: |-

internal/controller/helmrelease_controller.go

@@ -372,7 +372,7 @@ func (r *HelmReleaseReconciler) reconcileRelease(ctx context.Context,
 	// If the release target configuration has changed, we need to uninstall the
 	// previous release target first. If we did not do this, the installation would
 	// fail due to resources already existing.
-	if reason, changed := action.ReleaseTargetChanged(obj, loadedChart.Name()); changed && (reason != action.TargetChartName || obj.Spec.Upgrade.ChartNameChangeStrategy == v2.Reinstall) {
+	if reason, changed := action.ReleaseTargetChanged(obj, loadedChart.Name()); changed && (reason != action.TargetChartName || obj.Spec.Upgrade.ChartNameChangeStrategy == v2.ChartNameChangeStrategyReinstall) {
 		log.Info(fmt.Sprintf("release target configuration changed (%s): running uninstall for current release", reason))
 		if err = r.reconcileUninstall(ctx, getter, obj); err != nil && !errors.Is(err, intreconcile.ErrNoLatest) {
 			return ctrl.Result{}, err