Check for no-op status update in resolveClusterReferences & resolveNa…

…mespacedReferences

pkg/controller/controller_instance.go

@@ -1216,15 +1216,15 @@ func (c *controller) resolveClusterReferences(instance *v1beta1.ServiceInstance)
 		if err != nil {
 			pcb := pretty.NewInstanceContextBuilder(instance)
 			glog.Warning(pcb.Message(err.Error()))
-			c.updateServiceInstanceCondition(
+			updatedInstance, _ := c.updateServiceInstanceCondition(
 				instance,
 				v1beta1.ServiceInstanceConditionReady,
 				v1beta1.ConditionFalse,
 				errorNonexistentClusterServiceClassReason,
 				"The instance references a ClusterServiceClass that does not exist. "+err.Error(),
 			)
 			c.recorder.Event(instance, corev1.EventTypeWarning, errorNonexistentClusterServiceClassReason, err.Error())
-			return false, err
+			return updatedInstance.ResourceVersion != instance.ResourceVersion, err
 		}
 	}
 
@@ -1240,19 +1240,19 @@ func (c *controller) resolveClusterReferences(instance *v1beta1.ServiceInstance)
 		if err != nil {
 			pcb := pretty.NewInstanceContextBuilder(instance)
 			glog.Warning(pcb.Message(err.Error()))
-			c.updateServiceInstanceCondition(
+			updatedInstance, _ := c.updateServiceInstanceCondition(
 				instance,
 				v1beta1.ServiceInstanceConditionReady,
 				v1beta1.ConditionFalse,
 				errorNonexistentClusterServicePlanReason,
 				"The instance references a ClusterServicePlan that does not exist. "+err.Error(),
 			)
 			c.recorder.Event(instance, corev1.EventTypeWarning, errorNonexistentClusterServicePlanReason, err.Error())
-			return false, err
+			return updatedInstance.ResourceVersion != instance.ResourceVersion, err
 		}
 	}
-	_, err = c.updateServiceInstanceReferences(instance)
-	return err == nil, err
+	updatedInstance, err := c.updateServiceInstanceReferences(instance)
+	return updatedInstance.ResourceVersion != instance.ResourceVersion, err
 }
 
 func (c *controller) resolveNamespacedReferences(instance *v1beta1.ServiceInstance) (bool, error) {
@@ -1267,15 +1267,15 @@ func (c *controller) resolveNamespacedReferences(instance *v1beta1.ServiceInstan
 		if err != nil {
 			pcb := pretty.NewInstanceContextBuilder(instance)
 			glog.Warning(pcb.Message(err.Error()))
-			c.updateServiceInstanceCondition(
+			updatedInstance, _ := c.updateServiceInstanceCondition(
 				instance,
 				v1beta1.ServiceInstanceConditionReady,
 				v1beta1.ConditionFalse,
 				errorNonexistentServiceClassReason,
 				"The instance references a ServiceClass that does not exist. "+err.Error(),
 			)
 			c.recorder.Event(instance, corev1.EventTypeWarning, errorNonexistentServiceClassReason, err.Error())
-			return false, err
+			return updatedInstance.ResourceVersion != instance.ResourceVersion, err
 		}
 	}
 
@@ -1291,19 +1291,19 @@ func (c *controller) resolveNamespacedReferences(instance *v1beta1.ServiceInstan
 		if err != nil {
 			pcb := pretty.NewInstanceContextBuilder(instance)
 			glog.Warning(pcb.Message(err.Error()))
-			c.updateServiceInstanceCondition(
+			updatedInstance, _ := c.updateServiceInstanceCondition(
 				instance,
 				v1beta1.ServiceInstanceConditionReady,
 				v1beta1.ConditionFalse,
 				errorNonexistentServicePlanReason,
 				"The instance references a ServicePlan that does not exist. "+err.Error(),
 			)
 			c.recorder.Event(instance, corev1.EventTypeWarning, errorNonexistentServicePlanReason, err.Error())
-			return false, err
+			return updatedInstance.ResourceVersion != instance.ResourceVersion, err
 		}
 	}
-	_, err = c.updateServiceInstanceReferences(instance)
-	return err == nil, err
+	updatedInstance, err := c.updateServiceInstanceReferences(instance)
+	return updatedInstance.ResourceVersion != instance.ResourceVersion, err
 }
 
 // resolveClusterServiceClassRef resolves a reference  to a ClusterServiceClass

pkg/controller/controller_instance_test.go

@@ -4542,8 +4542,8 @@ func TestResolveReferencesNoClusterServiceClass(t *testing.T) {
 		t.Fatalf("Did not get the expected error message %q got %q", e, a)
 	}
 
-	if modified {
-		t.Fatalf("Should have returned false")
+	if !modified {
+		t.Fatalf("Should have returned true")
 	}
 
 	// We should get the following actions:
@@ -4828,8 +4828,8 @@ func TestResolveReferencesNoClusterServicePlan(t *testing.T) {
 		t.Fatalf("Did not get the expected error message %q got %q", e, a)
 	}
 
-	if modified {
-		t.Fatalf("Should have returned false")
+	if !modified {
+		t.Fatalf("Should have returned true")
 	}
 
 	// We should get the following actions: