Remove FetchFailed conditions from OCI

If implemented the Helmrepository_oci reconciler will have ready,
stalling and reconciling conditions only. The conditions will be
directly set by the subreconcilers.

Signed-off-by: Soule BA <[email protected]>

Author: souleb

controllers/helmrepository_controller_oci.go

@@ -39,6 +39,7 @@ import (
 	helmgetter "helm.sh/helm/v3/pkg/getter"
 	helmreg "helm.sh/helm/v3/pkg/registry"
 	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	kuberecorder "k8s.io/client-go/tools/record"
@@ -52,29 +53,20 @@ import (
 var helmRepositoryOCIReadyCondition = summarize.Conditions{
 	Target: meta.ReadyCondition,
 	Owned: []string{
-		sourcev1.FetchFailedCondition,
 		meta.ReadyCondition,
 		meta.ReconcilingCondition,
 		meta.StalledCondition,
 	},
 	Summarize: []string{
-		sourcev1.FetchFailedCondition,
 		meta.StalledCondition,
 		meta.ReconcilingCondition,
 	},
 	NegativePolarity: []string{
-		sourcev1.FetchFailedCondition,
 		meta.StalledCondition,
 		meta.ReconcilingCondition,
 	},
 }
 
-// helmRepositoryOCIFailConditions contains the conditions that represent a
-// failure.
-var helmRepositoryOCIFailConditions = []string{
-	sourcev1.FetchFailedCondition,
-}
-
 // +kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=helmrepositories,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=helmrepositories/status,verbs=get;update;patch
 // +kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=helmrepositories/finalizers,verbs=get;create;update;patch;delete
@@ -216,7 +208,28 @@ func (r *HelmRepositoryOCIReconciler) reconcileDelete(ctx context.Context, obj *
 func (r *HelmRepositoryOCIReconciler) notify(oldObj, newObj *sourcev1.HelmRepository, res sreconcile.Result, resErr error) {
 	// Notify successful recovery from any failure.
 	if resErr == nil && res == sreconcile.ResultSuccess {
-		if sreconcile.FailureRecovery(oldObj, newObj, helmRepositoryOCIFailConditions) {
+		// since the object is successfully reconciled without error,
+		// we can determine recovery by comparing the old and new object
+		// readyConditions status.
+		// We can use the readyConditions to determine if the object has
+		// recovered from a failure because, in this reconciliation loop
+		// the readyConditions is directly set by the subreconcilers and not calculated
+		// as a result of the subreconcilers.
+		var oldReadyStatus, newReadyStatus metav1.ConditionStatus
+		if cond := conditions.Get(oldObj, meta.ReadyCondition); cond != nil {
+			oldReadyStatus = cond.Status
+		}
+
+		if cond := conditions.Get(newObj, meta.ReadyCondition); cond != nil {
+			newReadyStatus = cond.Status
+		}
+
+		if oldReadyStatus == "" || newReadyStatus == "" {
+			// if the ready status is not set, it is not a recovery
+			return
+		}
+
+		if oldReadyStatus == metav1.ConditionFalse && newReadyStatus == metav1.ConditionTrue {
 			r.Eventf(newObj, corev1.EventTypeNormal,
 				meta.SucceededReason, "Helm repository %q has been successfully reconciled", newObj.Name)
 		}
@@ -271,7 +284,7 @@ func (r *HelmRepositoryOCIReconciler) reconcileSource(ctx context.Context, obj *
 				Err:    fmt.Errorf("failed to get secret '%s': %w", name.String(), err),
 				Reason: sourcev1.AuthenticationFailedReason,
 			}
-			conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, e.Err.Error())
+			conditions.MarkFalse(obj, meta.ReadyCondition, e.Reason, e.Err.Error())
 			return sreconcile.ResultEmpty, e
 		}
 
@@ -282,8 +295,7 @@ func (r *HelmRepositoryOCIReconciler) reconcileSource(ctx context.Context, obj *
 				Err:    fmt.Errorf("failed to configure Helm client with secret data: %w", err),
 				Reason: sourcev1.AuthenticationFailedReason,
 			}
-			conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, e.Err.Error())
-			// Return err as the content of the secret may change.
+			conditions.MarkFalse(obj, meta.ReadyCondition, e.Reason, e.Err.Error())
 			return sreconcile.ResultEmpty, e
 		}