solve lint

Author: camilamacedo86

internal/operator-controller/controllers/clusterextension_reconcile_steps.go

@@ -148,90 +148,89 @@ func ResolveBundle(r resolve.Resolver, c client.Client) ReconcileStepFunc {
 func handleResolutionError(ctx context.Context, c client.Client, state *reconcileState, ext *ocv1.ClusterExtension, err error) (*ctrl.Result, error) {
 	l := log.FromContext(ctx)
 
-	// If we have an installed bundle, check if we can fall back to it
-	if state.revisionStates.Installed != nil {
-		// Check if the spec is requesting a specific version that differs from installed
-		specVersion := ""
-		if ext.Spec.Source.Catalog != nil {
-			specVersion = ext.Spec.Source.Catalog.Version
-		}
-		installedVersion := state.revisionStates.Installed.Version
-
-		// If spec requests a different version, we cannot fall back - must fail and retry
-		if specVersion != "" && specVersion != installedVersion {
-			msg := fmt.Sprintf("unable to upgrade to version %s: %v (currently installed: %s)", specVersion, err, installedVersion)
-			l.Error(err, "resolution failed and spec requests version change - cannot fall back",
-				"requestedVersion", specVersion,
-				"installedVersion", installedVersion)
-			setStatusProgressing(ext, err)
-			setInstalledStatusFromRevisionStates(ext, state.revisionStates)
-			ensureAllConditionsWithReason(ext, ocv1.ReasonRetrying, msg)
-			return nil, err
-		}
+	// No installed bundle and resolution failed - cannot proceed
+	if state.revisionStates.Installed == nil {
+		msg := fmt.Sprintf("failed to resolve bundle: %v", err)
+		setStatusProgressing(ext, err)
+		setInstalledStatusFromRevisionStates(ext, state.revisionStates)
+		ensureAllConditionsWithReason(ext, ocv1.ReasonRetrying, msg)
+		return nil, err
+	}
 
-		// No version change requested - check if ClusterCatalogs exist
-		// Only fall back if ClusterCatalogs have been deleted
-		catalogsExist, catalogCheckErr := CheckCatalogsExist(ctx, c, ext)
-		if catalogCheckErr != nil {
-			msg := fmt.Sprintf("failed to resolve bundle: %v", err)
-			var catalogName string
-			if ext.Spec.Source.Catalog != nil {
-				catalogName = getCatalogNameFromSelector(ext.Spec.Source.Catalog.Selector)
-			}
-			l.Error(catalogCheckErr, "error checking if ClusterCatalogs exist, will retry resolution",
-				"resolutionError", err,
-				"packageName", getPackageName(ext),
-				"catalogName", catalogName)
-			setStatusProgressing(ext, err)
-			setInstalledStatusFromRevisionStates(ext, state.revisionStates)
-			ensureAllConditionsWithReason(ext, ocv1.ReasonRetrying, msg)
-			return nil, err
-		}
+	// Check if the spec is requesting a specific version that differs from installed
+	specVersion := ""
+	if ext.Spec.Source.Catalog != nil {
+		specVersion = ext.Spec.Source.Catalog.Version
+	}
+	installedVersion := state.revisionStates.Installed.Version
+
+	// If spec requests a different version, we cannot fall back - must fail and retry
+	if specVersion != "" && specVersion != installedVersion {
+		msg := fmt.Sprintf("unable to upgrade to version %s: %v (currently installed: %s)", specVersion, err, installedVersion)
+		l.Error(err, "resolution failed and spec requests version change - cannot fall back",
+			"requestedVersion", specVersion,
+			"installedVersion", installedVersion)
+		setStatusProgressing(ext, err)
+		setInstalledStatusFromRevisionStates(ext, state.revisionStates)
+		ensureAllConditionsWithReason(ext, ocv1.ReasonRetrying, msg)
+		return nil, err
+	}
 
-		if catalogsExist {
-			// ClusterCatalogs exist but resolution failed - likely a transient issue (ClusterCatalog updating, cache stale, etc.)
-			// Retry resolution instead of falling back
-			msg := fmt.Sprintf("failed to resolve bundle, retrying: %v", err)
-			var catalogName string
-			if ext.Spec.Source.Catalog != nil {
-				catalogName = getCatalogNameFromSelector(ext.Spec.Source.Catalog.Selector)
-			}
-			l.Error(err, "resolution failed but matching ClusterCatalogs exist - retrying instead of falling back",
-				"packageName", getPackageName(ext),
-				"catalogName", catalogName)
-			setStatusProgressing(ext, err)
-			setInstalledStatusFromRevisionStates(ext, state.revisionStates)
-			ensureAllConditionsWithReason(ext, ocv1.ReasonRetrying, msg)
-			return nil, err
+	// No version change requested - check if ClusterCatalogs exist
+	// Only fall back if ClusterCatalogs have been deleted
+	catalogsExist, catalogCheckErr := CheckCatalogsExist(ctx, c, ext)
+	if catalogCheckErr != nil {
+		msg := fmt.Sprintf("failed to resolve bundle: %v", err)
+		var catalogName string
+		if ext.Spec.Source.Catalog != nil {
+			catalogName = getCatalogNameFromSelector(ext.Spec.Source.Catalog.Selector)
 		}
+		l.Error(catalogCheckErr, "error checking if ClusterCatalogs exist, will retry resolution",
+			"resolutionError", err,
+			"packageName", getPackageName(ext),
+			"catalogName", catalogName)
+		setStatusProgressing(ext, err)
+		setInstalledStatusFromRevisionStates(ext, state.revisionStates)
+		ensureAllConditionsWithReason(ext, ocv1.ReasonRetrying, msg)
+		return nil, err
+	}
 
-		// ClusterCatalogs don't exist (deleted) - fall back to installed bundle to maintain current state.
-		// The controller watches ClusterCatalog resources, so when ClusterCatalogs become available again,
-		// a reconcile will be triggered automatically, allowing the extension to upgrade.
-		msg := fmt.Sprintf("continuing to maintain current installation at version %s due to catalog unavailability", state.revisionStates.Installed.Version)
+	if catalogsExist {
+		// ClusterCatalogs exist but resolution failed - likely a transient issue (ClusterCatalog updating, cache stale, etc.)
+		// Retry resolution instead of falling back
+		msg := fmt.Sprintf("failed to resolve bundle, retrying: %v", err)
 		var catalogName string
 		if ext.Spec.Source.Catalog != nil {
 			catalogName = getCatalogNameFromSelector(ext.Spec.Source.Catalog.Selector)
 		}
-		l.Error(err, "matching ClusterCatalogs unavailable or deleted - falling back to installed bundle to maintain workload",
+		l.Error(err, "resolution failed but matching ClusterCatalogs exist - retrying instead of falling back",
 			"packageName", getPackageName(ext),
-			"catalogName", catalogName,
-			"installedBundle", state.revisionStates.Installed.Name,
-			"installedVersion", state.revisionStates.Installed.Version)
+			"catalogName", catalogName)
 		setStatusProgressing(ext, err)
 		setInstalledStatusFromRevisionStates(ext, state.revisionStates)
 		ensureAllConditionsWithReason(ext, ocv1.ReasonRetrying, msg)
-		state.resolvedRevisionMetadata = state.revisionStates.Installed
-		// Return no error to allow Apply step to run and maintain resources.
-		return nil, nil
+		return nil, err
 	}
 
-	// No installed bundle and resolution failed - cannot proceed
-	msg := fmt.Sprintf("failed to resolve bundle: %v", err)
+	// ClusterCatalogs don't exist (deleted) - fall back to installed bundle to maintain current state.
+	// The controller watches ClusterCatalog resources, so when ClusterCatalogs become available again,
+	// a reconcile will be triggered automatically, allowing the extension to upgrade.
+	msg := fmt.Sprintf("continuing to maintain current installation at version %s due to catalog unavailability", state.revisionStates.Installed.Version)
+	var catalogName string
+	if ext.Spec.Source.Catalog != nil {
+		catalogName = getCatalogNameFromSelector(ext.Spec.Source.Catalog.Selector)
+	}
+	l.Error(err, "matching ClusterCatalogs unavailable or deleted - falling back to installed bundle to maintain workload",
+		"packageName", getPackageName(ext),
+		"catalogName", catalogName,
+		"installedBundle", state.revisionStates.Installed.Name,
+		"installedVersion", state.revisionStates.Installed.Version)
 	setStatusProgressing(ext, err)
 	setInstalledStatusFromRevisionStates(ext, state.revisionStates)
 	ensureAllConditionsWithReason(ext, ocv1.ReasonRetrying, msg)
-	return nil, err
+	state.resolvedRevisionMetadata = state.revisionStates.Installed
+	// Return no error to allow Apply step to run and maintain resources.
+	return nil, nil
 }
 
 // getCatalogNameFromSelector extracts the catalog name from the selector if available.