Merge pull request #1900 from RomanBednar/OCPBUGS-44374

OCPBUGS-44374: CSI controller conditions should provide reason and message
openshift · Dec 10, 2024 · 85e36bc · 85e36bc
2 parents 8d0b2ce + ccd9d2d
commit 85e36bc
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/pkg/operator/csi/csidrivernodeservicecontroller/csi_driver_node_service_controller.go b/pkg/operator/csi/csidrivernodeservicecontroller/csi_driver_node_service_controller.go
@@ -197,7 +197,11 @@ func (c *CSIDriverNodeServiceController) syncManaged(ctx context.Context, opSpec
 		WithStatus(opv1.ConditionTrue)
 
 	if daemonSet.Status.NumberAvailable > 0 {
-		availableCondition = availableCondition.WithStatus(opv1.ConditionTrue)
+		availableCondition = availableCondition.
+			WithStatus(opv1.ConditionTrue).
+			WithMessage("DaemonSet is available").
+			WithReason("AsExpected")
+
 	} else {
 		availableCondition = availableCondition.
 			WithStatus(opv1.ConditionFalse).
@@ -209,7 +213,9 @@ func (c *CSIDriverNodeServiceController) syncManaged(ctx context.Context, opSpec
 	// Set Progressing condition
 	progressingCondition := applyoperatorv1.OperatorCondition().
 		WithType(c.instanceName + opv1.OperatorStatusTypeProgressing).
-		WithStatus(opv1.ConditionFalse)
+		WithStatus(opv1.ConditionFalse).
+		WithMessage("DaemonSet is not progressing").
+		WithReason("AsExpected")
 
 	if ok, msg := isProgressing(opStatus, daemonSet); ok {
 		progressingCondition = progressingCondition.

diff --git a/pkg/operator/deploymentcontroller/deployment_controller.go b/pkg/operator/deploymentcontroller/deployment_controller.go
@@ -272,7 +272,11 @@ func (c *DeploymentController) syncManaged(ctx context.Context, opSpec *opv1.Ope
 		availableCondition := applyoperatorv1.
 			OperatorCondition().WithType(c.instanceName + opv1.OperatorStatusTypeAvailable)
 		if deployment.Status.AvailableReplicas > 0 {
-			availableCondition = availableCondition.WithStatus(opv1.ConditionTrue)
+			availableCondition = availableCondition.
+				WithStatus(opv1.ConditionTrue).
+				WithMessage("Deployment is available").
+				WithReason("AsExpected")
+
 		} else {
 			availableCondition = availableCondition.
 				WithStatus(opv1.ConditionFalse).
@@ -286,7 +290,10 @@ func (c *DeploymentController) syncManaged(ctx context.Context, opSpec *opv1.Ope
 	if slices.Contains(c.conditions, opv1.OperatorStatusTypeProgressing) {
 		progressingCondition := applyoperatorv1.OperatorCondition().
 			WithType(c.instanceName + opv1.OperatorStatusTypeProgressing).
-			WithStatus(opv1.ConditionFalse)
+			WithStatus(opv1.ConditionFalse).
+			WithMessage("Deployment is not progressing").
+			WithReason("AsExpected")
+
 		if ok, msg := isProgressing(deployment); ok {
 			progressingCondition = progressingCondition.
 				WithStatus(opv1.ConditionTrue).