Handle panic with nil map on reconcile (#2884)

Author: polskikiel

pkg/controller/controller_instance.go

@@ -3007,6 +3007,9 @@ func (c *controller) triggerServiceBindingReconciliation(instance *v1beta1.Servi
 		}
 		klog.V(4).Infof("ServiceBinding %s/%s triggered to reconciliation", binding.Namespace, binding.Name)
 		toUpdate := binding.DeepCopy()
+		if toUpdate.Annotations == nil {
+			toUpdate.Annotations = make(map[string]string, 0)
+		}
 		toUpdate.ObjectMeta.Annotations["reconciliationTriggered"] = metav1.Now().String()
 		if _, err := c.serviceCatalogClient.ServiceBindings(toUpdate.Namespace).Update(context.Background(), toUpdate, metav1.UpdateOptions{}); err != nil {
 			klog.Errorf("Couldn't update ServiceBinding %q status for instance %q. Bindings will be triggered after set delay. error: %v", binding.Name, binding.Spec.InstanceRef.Name, err)

pkg/controller/controller_instance_test.go

@@ -624,6 +624,8 @@ func TestReconcileServiceInstanceWithParameters(t *testing.T) {
 			sharedInformers.ClusterServiceBrokers().Informer().GetStore().Add(getTestClusterServiceBroker())
 			sharedInformers.ClusterServiceClasses().Informer().GetStore().Add(getTestClusterServiceClass())
 			sharedInformers.ClusterServicePlans().Informer().GetStore().Add(getTestClusterServicePlan())
+			credentials := getTestServiceBinding()
+			sharedInformers.ServiceBindings().Informer().GetStore().Add(credentials)
 
 			for _, s := range tc.secrets {
 				fakeKubeClient.PrependReactor("get", "secrets", func(action clientgotesting.Action) (bool, runtime.Object, error) {
@@ -739,7 +741,8 @@ func TestReconcileServiceInstanceWithParameters(t *testing.T) {
 			})
 
 			actions = fakeCatalogClient.Actions()
-			assertNumberOfActions(t, actions, 1)
+			assertNumberOfActions(t, actions, 2)
+			assertUpdate(t, actions[1], credentials)
 			updatedServiceInstance = assertUpdateStatus(t, actions[0], instance)
 			assertServiceInstanceOperationSuccessWithParameters(t,
 				updatedServiceInstance,