pkg: Update Upgradeable condition to explicitly mention major version updates (v2)

Additional locations caught by David and Claude's collaboration [1,2].

[1]: #1276 (comment)
[2]: #1276 (comment)

Author: wking

install/0000_90_cluster-version-operator_02_servicemonitor.yaml

@@ -87,7 +87,7 @@ spec:
     rules:
     - alert: ClusterNotUpgradeable
       annotations:
-        summary: One or more cluster operators have been blocking minor version cluster upgrades for at least an hour.
+        summary: One or more cluster operators have been blocking minor or major version cluster updates for at least an hour.
         description: In most cases, you will still be able to apply patch releases. Reason {{ "{{ with $cluster_operator_conditions := \"cluster_operator_conditions\" | query}}{{range $value := .}}{{if and (eq (label \"name\" $value) \"version\") (eq (label \"condition\" $value) \"Upgradeable\") (eq (label \"endpoint\" $value) \"metrics\") (eq (value $value) 0.0) (ne (len (label \"reason\" $value)) 0) }}{{label \"reason\" $value}}.{{end}}{{end}}{{end}}"}} For more information refer to 'oc adm upgrade'{{ "{{ with $console_url := \"console_url\" | query }}{{ if ne (len (label \"url\" (first $console_url ) ) ) 0}} or {{ label \"url\" (first $console_url ) }}/settings/cluster/{{ end }}{{ end }}" }}.
       expr: |
         max by (namespace, name, condition, endpoint) (cluster_operator_conditions{name="version", condition="Upgradeable", endpoint="metrics"} == 0)

pkg/internal/constants.go

@@ -56,18 +56,18 @@ const (
 	ImplicitlyEnabledCapabilities configv1.ClusterStatusConditionType = "ImplicitlyEnabledCapabilities"
 
 	// UpgradeableAdminAckRequired is False if there is API removed from the Kubernetes API server which requires admin
-	// consideration, and thus update to the next minor version is blocked.
+	// consideration, and thus update to the next minor or major version is blocked.
 	UpgradeableAdminAckRequired configv1.ClusterStatusConditionType = "UpgradeableAdminAckRequired"
-	// UpgradeableDeletesInProgress is False if deleting resources is in progress, and thus update to the next minor
+	// UpgradeableDeletesInProgress is False if deleting resources is in progress, and thus update to the next minor or major
 	// version is blocked.
 	UpgradeableDeletesInProgress configv1.ClusterStatusConditionType = "UpgradeableDeletesInProgress"
-	// UpgradeableClusterOperators is False if something is wrong with Cluster Operators, and thus update to the next minor
+	// UpgradeableClusterOperators is False if something is wrong with Cluster Operators, and thus update to the next minor or major
 	// version is blocked.
 	UpgradeableClusterOperators configv1.ClusterStatusConditionType = "UpgradeableClusterOperators"
-	// UpgradeableClusterVersionOverrides is False if there are overrides in the Cluster Version, and thus update to the next minor
+	// UpgradeableClusterVersionOverrides is False if there are overrides in the Cluster Version, and thus update to the next minor or major
 	// version is blocked.
 	UpgradeableClusterVersionOverrides configv1.ClusterStatusConditionType = "UpgradeableClusterVersionOverrides"
 
-	// UpgradeableUpgradeInProgress is True if an update is in progress
+	// UpgradeableUpgradeInProgress is True if an update is in progress.
 	UpgradeableUpgradeInProgress configv1.ClusterStatusConditionType = "UpgradeableUpgradeInProgress"
 )

pkg/payload/precondition/clusterversion/upgradeable.go

@@ -98,7 +98,7 @@ func (pf *Upgradeable) Run(ctx context.Context, releaseContext precondition.Rele
 	patchOnly := targetVersion.Major == currentVersion.Major && targetVersion.Minor == currentVersion.Minor
 	if targetVersion.LTE(currentVersion) || patchOnly {
 		// When Upgradeable==False, a patch level update with the same minor version is allowed unless overrides are set.
-		// However, minor or major version updates are blocked when Upgradeable==False (handled below at line 124).
+		// However, minor or major version updates are blocked when Upgradeable==False.
 		// This Upgradeable precondition is only concerned about moving forward, i.e., do not care about downgrade which is taken care of by the Rollback precondition
 		if condition := ClusterVersionOverridesCondition(cv); condition != nil {
 			klog.V(2).Infof("Retarget from %s to %s is blocked by %s: %s", currentVersion.String(), targetVersion.String(), condition.Reason, condition.Message)