Implement more functions

Author: hongkailiu

pkg/cvo/availableupdates_test.go

@@ -248,6 +248,10 @@ func TestSyncAvailableUpdates(t *testing.T) {
 		return nil, nil, nil
 	}, fake.NewClientBuilder().Build(), func(_ string) (*configv1.ClusterVersion, error) {
 		return &configv1.ClusterVersion{}, nil
+	}, func(name, namespace string) (*corev1.ConfigMap, error) {
+		return &corev1.ConfigMap{}, nil
+	}, func() string {
+		return optr.release.Version
 	})
 	err := optr.syncAvailableUpdates(context.Background(), cvFixture)
 
@@ -342,6 +346,10 @@ func TestSyncAvailableUpdates_ConditionalUpdateRecommendedConditions(t *testing.
 				return nil, nil, nil
 			}, fake.NewClientBuilder().Build(), func(_ string) (*configv1.ClusterVersion, error) {
 				return &configv1.ClusterVersion{}, nil
+			}, func(name, namespace string) (*corev1.ConfigMap, error) {
+				return &corev1.ConfigMap{}, nil
+			}, func() string {
+				return optr.release.Version
 			})
 			err := optr.syncAvailableUpdates(context.Background(), cv)
 
@@ -783,6 +791,10 @@ func TestSyncAvailableUpdatesDesiredUpdate(t *testing.T) {
 				return nil, nil, nil
 			}, fake.NewClientBuilder().Build(), func(_ string) (*configv1.ClusterVersion, error) {
 				return &configv1.ClusterVersion{}, nil
+			}, func(name, namespace string) (*corev1.ConfigMap, error) {
+				return &corev1.ConfigMap{}, nil
+			}, func() string {
+				return optr.release.Version
 			})
 			if err := optr.syncAvailableUpdates(context.Background(), cv); err != nil {
 				t.Fatalf("syncAvailableUpdates() unexpected error: %v", err)

pkg/cvo/cvo.go

@@ -330,7 +330,11 @@ func New(
 			return nil, nil, nil
 		}
 		return availableUpdates.Updates, availableUpdates.ConditionalUpdates, nil
-	}, rtClient, cvInformer.Lister().Get)
+	}, rtClient, cvInformer.Lister().Get, func(namespace, name string) (*corev1.ConfigMap, error) {
+		return cmConfigManagedInformer.Lister().ConfigMaps(namespace).Get(name)
+	}, func() string {
+		return optr.release.Version
+	})
 
 	return optr, nil
 }

pkg/cvo/cvo_test.go

@@ -2764,6 +2764,10 @@ func TestOperator_availableUpdatesSync(t *testing.T) {
 				return nil, nil, nil
 			}, ctrlruntimefake.NewClientBuilder().Build(), func(_ string) (*configv1.ClusterVersion, error) {
 				return &configv1.ClusterVersion{}, nil
+			}, func(name, namespace string) (*corev1.ConfigMap, error) {
+				return &corev1.ConfigMap{}, nil
+			}, func() string {
+				return optr.release.Version
 			})
 			err := optr.availableUpdatesSync(ctx, optr.queueKey())
 			if err != nil && tt.wantErr == nil {

pkg/internal/constants.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/blang/semver/v4"
+
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/klog/v2"
 
@@ -131,3 +133,24 @@ func IsAlertConditionReason(reason string) bool {
 func AlertConditionMessage(alertName, severity, state, impact, details string) string {
 	return fmt.Sprintf("%s alert %s %s, %s. %s", severity, alertName, state, impact, details)
 }
+
+const (
+	UpdateTypeMajor   = "Major"
+	UpdateTypeMinor   = "Minor"
+	UpdateTypePatch   = "Patch"
+	UpdateTypeUnknown = "Unknown"
+)
+
+// UpdateType returns the type of the update from the source to the target versions
+func UpdateType(source, target semver.Version) string {
+	if source.Major < target.Major {
+		return UpdateTypeMajor
+	}
+	if source.Major == target.Major && source.Minor < target.Minor {
+		return UpdateTypeMinor
+	}
+	if source.LT(target) {
+		return UpdateTypePatch
+	}
+	return UpdateTypeUnknown
+}

pkg/payload/precondition/clusterversion/upgradeable.go

@@ -150,11 +150,8 @@ func majorOrMinorUpdateFrom(status configv1.ClusterVersionStatus, currentVersion
 	}
 	if cond := resourcemerge.FindOperatorStatusCondition(status.Conditions, configv1.OperatorProgressing); cond != nil &&
 		cond.Status == configv1.ConditionTrue {
-		if v.Major < currentVersion.Major {
-			return completedVersion, "Major"
-		}
-		if v.Major == currentVersion.Major && v.Minor < currentVersion.Minor {
-			return completedVersion, "Minor"
+		if ut := internal.UpdateType(v, currentVersion); ut == internal.UpdateTypeMajor || ut == internal.UpdateTypeMinor {
+			return completedVersion, ut
 		}
 	}
 	return "", ""