Improve condition's reason and message

openshift · Nov 5, 2024 · c1f693a · c1f693a
1 parent 0366e77
commit c1f693a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/pkg/cvo/upgradeable.go b/pkg/cvo/upgradeable.go
@@ -284,8 +284,8 @@ func (check *upgradeInProgressUpgradeable) Check() *configv1.ClusterOperatorStat
 
 	if progressingCondition := resourcemerge.FindOperatorStatusCondition(cv.Status.Conditions, configv1.OperatorProgressing); progressingCondition != nil &&
 		progressingCondition.Status == configv1.ConditionTrue {
-		cond.Reason = progressingCondition.Reason
-		cond.Message = progressingCondition.Message
+		cond.Reason = "UpdateInProgress"
+		cond.Message = fmt.Sprintf("An update is already in progress and the details are in the %s condition", configv1.OperatorProgressing)
 		return cond
 	}
 	return nil

diff --git a/pkg/cvo/upgradeable_test.go b/pkg/cvo/upgradeable_test.go
@@ -85,17 +85,17 @@ func TestUpgradeInProgressUpgradeable(t *testing.T) {
 						{
 							Type:    configv1.OperatorProgressing,
 							Status:  configv1.ConditionTrue,
-							Reason:  "a",
-							Message: "b",
+							Reason:  "UpdateInProgress",
+							Message: "An update is already in progress and the details are in the Progressing condition",
 						},
 					},
 				},
 			},
 			expected: &configv1.ClusterOperatorStatusCondition{
 				Type:    "UpgradeableUpgradeInProgress",
 				Status:  configv1.ConditionTrue,
-				Reason:  "a",
-				Message: "b",
+				Reason:  "UpdateInProgress",
+				Message: "An update is already in progress and the details are in the Progressing condition",
 			},
 		},
 		{