Set Progressing to False:Archived when revision is archived

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

Author: Per Goncalves da Silva

internal/operator-controller/controllers/clusterextensionrevision_controller.go

@@ -131,7 +131,10 @@ func (c *ClusterExtensionRevisionReconciler) reconcile(ctx context.Context, rev
 		return ctrl.Result{}, fmt.Errorf("error ensuring teardown finalizer: %v", err)
 	}
 
-	// If the Available condition is not present, we are still rolling out the objects
+	// If the Available condition is not present, we are still rolling out the objects.
+	// NOTE: This assumes that once the Available condition is set, it will always be present.
+	// If the Available condition is ever removed or reset during the lifecycle,
+	// this could lead to incorrect behavior.
 	inRollout := meta.FindStatusCondition(rev.Status.Conditions, ocv1.ClusterExtensionRevisionTypeAvailable) == nil
 	if inRollout {
 		if err := c.establishWatch(ctx, rev, revision); err != nil {
@@ -339,17 +342,26 @@ func (c *ClusterExtensionRevisionReconciler) teardown(ctx context.Context, rev *
 		return ctrl.Result{}, fmt.Errorf("error stopping informers: %v", err)
 	}
 
-	// Ensure Available condition is set to Unknown before removing the finalizer when archiving
-	if rev.Spec.LifecycleState == ocv1.ClusterExtensionRevisionLifecycleStateArchived &&
-		!meta.IsStatusConditionPresentAndEqual(rev.Status.Conditions, ocv1.ClusterExtensionRevisionTypeAvailable, metav1.ConditionUnknown) {
-		meta.SetStatusCondition(&rev.Status.Conditions, metav1.Condition{
+	// Ensure conditions are set before removing the finalizer when archiving
+	if rev.Spec.LifecycleState == ocv1.ClusterExtensionRevisionLifecycleStateArchived {
+		condUpdated := meta.SetStatusCondition(&rev.Status.Conditions, metav1.Condition{
 			Type:               ocv1.ClusterExtensionRevisionTypeAvailable,
 			Status:             metav1.ConditionUnknown,
 			Reason:             ocv1.ClusterExtensionRevisionReasonArchived,
 			Message:            "revision is archived",
 			ObservedGeneration: rev.Generation,
 		})
-		return ctrl.Result{}, nil
+		condUpdated = meta.SetStatusCondition(&rev.Status.Conditions, metav1.Condition{
+			Type:               ocv1.ClusterExtensionRevisionTypeProgressing,
+			Status:             metav1.ConditionFalse,
+			Reason:             ocv1.ClusterExtensionRevisionReasonArchived,
+			Message:            "revision is archived",
+			ObservedGeneration: rev.Generation,
+		}) || condUpdated
+
+		if condUpdated {
+			return ctrl.Result{}, nil
+		}
 	}
 
 	if err := c.removeFinalizer(ctx, rev, clusterExtensionRevisionTeardownFinalizer); err != nil {

internal/operator-controller/controllers/clusterextensionrevision_controller_test.go

@@ -673,7 +673,7 @@ func Test_ClusterExtensionRevisionReconciler_Reconcile_Deletion(t *testing.T) {
 			},
 		},
 		{
-			name:           "set Available condition to Unknown with reason Archived when archiving revision",
+			name:           "set Available:Archived:Unknown and Progressing:False:Unknown conditions when a revision is archived",
 			revisionResult: mockRevisionResult{},
 			existingObjs: func() []client.Object {
 				ext := newTestClusterExtension()
@@ -704,6 +704,13 @@ func Test_ClusterExtensionRevisionReconciler_Reconcile_Deletion(t *testing.T) {
 				require.Equal(t, ocv1.ClusterExtensionRevisionReasonArchived, cond.Reason)
 				require.Equal(t, "revision is archived", cond.Message)
 				require.Equal(t, int64(1), cond.ObservedGeneration)
+
+				cond = meta.FindStatusCondition(rev.Status.Conditions, ocv1.ClusterExtensionRevisionTypeProgressing)
+				require.NotNil(t, cond)
+				require.Equal(t, metav1.ConditionFalse, cond.Status)
+				require.Equal(t, ocv1.ClusterExtensionRevisionReasonArchived, cond.Reason)
+				require.Equal(t, "revision is archived", cond.Message)
+				require.Equal(t, int64(1), cond.ObservedGeneration)
 			},
 		},
 		{
@@ -723,6 +730,13 @@ func Test_ClusterExtensionRevisionReconciler_Reconcile_Deletion(t *testing.T) {
 					Message:            "revision is archived",
 					ObservedGeneration: rev1.Generation,
 				})
+				meta.SetStatusCondition(&rev1.Status.Conditions, metav1.Condition{
+					Type:               ocv1.ClusterExtensionRevisionTypeProgressing,
+					Status:             metav1.ConditionFalse,
+					Reason:             ocv1.ClusterExtensionRevisionReasonArchived,
+					Message:            "revision is archived",
+					ObservedGeneration: rev1.Generation,
+				})
 				require.NoError(t, controllerutil.SetControllerReference(ext, rev1, testScheme))
 				return []client.Object{rev1, ext}
 			},