Manage proposals

- Create proposals for each direct update path.
- Clean up the proposals if needed.

ReadinessJson will be implemented with another pull.

Author: hongkailiu

.openshift-tests-extension/openshift_payload_cluster-version-operator.json

@@ -101,6 +101,7 @@
     "name": "[Jira:\"Cluster Version Operator\"] cluster-version-operator should create proposals",
     "labels": {
       "Lifecycle:informing": {},
+      "OTA-1966": {},
       "Serial": {}
     },
     "resources": {

pkg/cvo/availableupdates_test.go

@@ -211,6 +211,12 @@ func newOperator(url string, cluster release, promqlMock clusterconditions.Condi
 		fake.NewClientBuilder().Build(), func(_ string) (*configv1.ClusterVersion, error) {
 			return &configv1.ClusterVersion{}, nil
 		},
+		func(_ context.Context, namespace, name string, _ metav1.GetOptions) (*corev1.ConfigMap, error) {
+			return &corev1.ConfigMap{}, nil
+		},
+		func() string {
+			return operator.release.Version
+		},
 	)
 	return availableUpdates, operator
 }

pkg/cvo/cvo.go

@@ -324,13 +324,23 @@ func New(
 
 	optr.configuration = configuration.NewClusterVersionOperatorConfiguration(operatorClient, operatorInformerFactory)
 
-	optr.proposalController = proposal.NewController(func() ([]configv1.Release, []configv1.ConditionalUpdate, error) {
-		availableUpdates := optr.getAvailableUpdates()
-		if availableUpdates == nil {
-			return nil, nil, nil
-		}
-		return availableUpdates.Updates, availableUpdates.ConditionalUpdates, nil
-	}, rtClient, cvInformer.Lister().Get)
+	optr.proposalController = proposal.NewController(
+		func() ([]configv1.Release, []configv1.ConditionalUpdate, error) {
+			availableUpdates := optr.getAvailableUpdates()
+			if availableUpdates == nil {
+				return nil, nil, nil
+			}
+			return availableUpdates.Updates, availableUpdates.ConditionalUpdates, nil
+		},
+		rtClient,
+		cvInformer.Lister().Get,
+		func(ctx context.Context, namespace, name string, opts metav1.GetOptions) (*corev1.ConfigMap, error) {
+			return kubeClient.CoreV1().ConfigMaps(namespace).Get(ctx, name, opts)
+		},
+		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(_ context.Context, namespace, name string, _ metav1.GetOptions) (*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 "", ""