Correct the reasons and messages set on the ready condition during as…

…ync polling (openshift#1235)
jboyd01 · Sep 18, 2017 · b0f3222 · b0f3222
1 parent d2bb82f
commit b0f3222
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/pkg/controller/controller_instance.go b/pkg/controller/controller_instance.go
@@ -883,14 +883,15 @@ func (c *controller) pollServiceInstance(serviceClass *v1alpha1.ServiceClass, se
 			var message string
 			var reason string
 			if deleting {
-				reason = asyncDeprovisioningMessage
+				reason = asyncDeprovisioningReason
+				message = asyncDeprovisioningMessage
 			} else {
 				reason = asyncProvisioningReason
+				message = asyncProvisioningMessage
 			}
+
 			if response.Description != nil {
-				message = fmt.Sprintf("%s (%s)", asyncProvisioningMessage, *response.Description)
-			} else {
-				message = asyncProvisioningMessage
+				message = fmt.Sprintf("%s (%s)", message, *response.Description)
 			}
 			c.updateServiceInstanceCondition(
 				toUpdate,

diff --git a/pkg/controller/controller_instance_test.go b/pkg/controller/controller_instance_test.go
@@ -1319,7 +1319,7 @@ func TestPollServiceInstanceInProgressDeprovisioningWithOperationNoFinalizer(t *
 	assertNumberOfActions(t, actions, 1)
 	action := actions[0]
 	updatedServiceInstance := assertUpdateStatus(t, action, instance)
-	assertServiceInstanceReadyFalse(t, updatedServiceInstance, asyncDeprovisioningMessage)
+	assertServiceInstanceReadyFalse(t, updatedServiceInstance, asyncDeprovisioningReason)
 
 	// verify no kube resources created.
 	// No actions