test

Author: thetechnick

internal/operator-controller/controllers/clusterextension_controller.go

@@ -550,31 +550,36 @@ func (d *BoxcutterRevisionStatesGetter) GetRevisionStates(ctx context.Context, e
 		return nil, fmt.Errorf("listing revisions: %w", err)
 	}
 	slices.SortFunc(existingRevisionList.Items, func(a, b ocv1.ClusterExtensionRevision) int {
-		return cmp.Compare(b.Spec.Revision, a.Spec.Revision)
+		return cmp.Compare(a.Spec.Revision, b.Spec.Revision)
 	})
 
 	rs := &RevisionStates{}
 	for _, rev := range existingRevisionList.Items {
-		if rev.Spec.LifecycleState == ocv1.ClusterExtensionRevisionLifecycleStateActive {
-			// TODO: the setting of these annotations (happens in boxcutter applier when we pass in "storageLabels")
-			//   is fairly decoupled from this code where we get the annotations back out. We may want to co-locate
-			//   the set/get logic a bit better to make it more maintainable and less likely to get out of sync.
-			rm := &RevisionMetadata{
-				Package: rev.Labels[labels.PackageNameKey],
-				Image:   rev.Annotations[labels.BundleReferenceKey],
-				BundleMetadata: ocv1.BundleMetadata{
-					Name:    rev.Annotations[labels.BundleNameKey],
-					Version: rev.Annotations[labels.BundleVersionKey],
-				},
-			}
+		switch rev.Spec.LifecycleState {
+		case ocv1.ClusterExtensionRevisionLifecycleStateActive,
+			ocv1.ClusterExtensionRevisionLifecycleStatePaused:
+		default:
+			// Skip anything not active or paused, which should only be "Archived".
+			continue
+		}
 
-			// TODO: we should make constants for the ClusterExtensionRevision condition types.
-			if installedCondition := apimeta.FindStatusCondition(rev.Status.Conditions, "Succeeded"); installedCondition == nil || installedCondition.Status != metav1.ConditionTrue {
-				rs.RollingOut = append(rs.RollingOut, rm)
-			} else {
-				rs.Installed = rm
-				break
-			}
+		// TODO: the setting of these annotations (happens in boxcutter applier when we pass in "storageLabels")
+		//   is fairly decoupled from this code where we get the annotations back out. We may want to co-locate
+		//   the set/get logic a bit better to make it more maintainable and less likely to get out of sync.
+		rm := &RevisionMetadata{
+			Package: rev.Labels[labels.PackageNameKey],
+			Image:   rev.Annotations[labels.BundleReferenceKey],
+			BundleMetadata: ocv1.BundleMetadata{
+				Name:    rev.Annotations[labels.BundleNameKey],
+				Version: rev.Annotations[labels.BundleVersionKey],
+			},
+		}
+
+		// TODO: we should make constants for the ClusterExtensionRevision condition types.
+		if apimeta.IsStatusConditionTrue(rev.Status.Conditions, "Succeeded") {
+			rs.Installed = rm
+		} else {
+			rs.RollingOut = append(rs.RollingOut, rm)
 		}
 	}