Move setting Progressing condition around a little

Signed-off-by: Per G. da Silva <pegoncal@redhat.com>

Author: Per G. da Silva

internal/operator-controller/controllers/clusterextensionrevision_controller.go

@@ -10,7 +10,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/operator-framework/operator-controller/internal/operator-controller/labels"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
@@ -35,6 +34,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
 	ocv1 "github.com/operator-framework/operator-controller/api/v1"
+	"github.com/operator-framework/operator-controller/internal/operator-controller/labels"
 )
 
 const (
@@ -140,7 +140,7 @@ func (c *ClusterExtensionRevisionReconciler) reconcile(ctx context.Context, rev
 			rev.MarkAsProgressing(ocv1.ClusterExtensionRevisionReasonReconcileFailure, werr.Error())
 			return ctrl.Result{}, werr
 		}
-		rev.MarkAsProgressing(ocv1.ClusterExtensionRevisionReasonRolloutInProgress, fmt.Sprintf("Revision %s is being rolled out.", revVersion))
+		// rev.MarkAsProgressing(ocv1.ClusterExtensionRevisionReasonRolloutInProgress, fmt.Sprintf("Revision %s is being rolled out.", revVersion))
 	}
 
 	rres, err := c.RevisionEngine.Reconcile(ctx, *revision, opts...)
@@ -184,6 +184,7 @@ func (c *ClusterExtensionRevisionReconciler) reconcile(ctx context.Context, rev
 		return ctrl.Result{RequeueAfter: 10 * time.Second}, nil
 	}
 
+	var mutations = 0
 	for i, pres := range rres.GetPhases() {
 		if verr := pres.GetValidationError(); verr != nil {
 			l.Info("preflight error, retrying after 10s", "err", verr.String())
@@ -207,8 +208,11 @@ func (c *ClusterExtensionRevisionReconciler) reconcile(ctx context.Context, rev
 
 		var collidingObjs []string
 		for _, ores := range pres.GetObjects() {
-			if ores.Action() == machinery.ActionCollision {
+			switch ores.Action() {
+			case machinery.ActionCollision:
 				collidingObjs = append(collidingObjs, ores.String())
+			case machinery.ActionCreated, machinery.ActionUpdated, machinery.ActionProgressed, machinery.ActionRecovered:
+				mutations++
 			}
 		}
 
@@ -225,13 +229,14 @@ func (c *ClusterExtensionRevisionReconciler) reconcile(ctx context.Context, rev
 		}
 	}
 
-	if !rres.InTransistion() {
-		// we have rolled out all objects in all phases, not interested in probes here
-		rev.MarkAsNotProgressing(ocv1.ClusterExtensionRevisionReasonRolledOut, fmt.Sprintf("Revision %s is rolled out.", revVersion))
-	}
+	//if !rres.InTransistion() {
+	//	// we have rolled out all objects in all phases, not interested in probes here
+	//	rev.MarkAsNotProgressing(ocv1.ClusterExtensionRevisionReasonRolledOut, fmt.Sprintf("Revision %s is rolled out.", revVersion))
+	//}
 
 	//nolint:nestif
 	if rres.IsComplete() {
+		rev.MarkAsNotProgressing(ocv1.ClusterExtensionRevisionReasonRolledOut, fmt.Sprintf("Revision %s is rolled out.", revVersion))
 		// Archive other revisions.
 		for _, a := range previous {
 			patch := []byte(`{"spec":{"lifecycleState":"Archived"}}`)
@@ -258,6 +263,7 @@ func (c *ClusterExtensionRevisionReconciler) reconcile(ctx context.Context, rev
 			ObservedGeneration: rev.Generation,
 		})
 	} else {
+		rev.MarkAsProgressing(ocv1.ClusterExtensionRevisionReasonRolloutInProgress, fmt.Sprintf("Revision %s is being rolled out.", revVersion))
 		var probeFailureMsgs []string
 		for _, pres := range rres.GetPhases() {
 			if pres.IsComplete() {