Reuse internal.UpdateType after rebase

Author: hongkailiu

pkg/risk/upgradeable/util.go

@@ -2,6 +2,8 @@ package upgradeable
 
 import (
 	"github.com/blang/semver/v4"
+
+	"github.com/openshift/cluster-version-operator/pkg/internal"
 )
 
 // MajorAndMinorUpdates returns all versions that are a major or minor
@@ -15,8 +17,7 @@ func MajorAndMinorUpdates(currentVersion semver.Version, versions []string) []st
 			majorAndMinorUpdates = append(majorAndMinorUpdates, vs)
 			continue
 		}
-		if vp.Major > currentVersion.Major ||
-			(vp.Major == currentVersion.Major && vp.Minor > currentVersion.Minor) {
+		if ut := internal.UpdateType(currentVersion, vp); ut == internal.UpdateTypeMajor || ut == internal.UpdateTypeMinor {
 			majorAndMinorUpdates = append(majorAndMinorUpdates, vs)
 		}
 	}