fix issue SBR can not be deleted if backend service has been deleted #832

Author: qibobo

pkg/controller/servicebinding/reconciler.go

@@ -113,6 +113,34 @@ func (r *reconciler) Reconcile(request reconcile.Request) (reconcile.Result, err
 		return doneOnNotFound(err)
 	}
 
+	if sbr.GetDeletionTimestamp() != nil && sbr.GetOwnerReferences() != nil {
+		logger := logger.WithName("Deleting SBR when it has ownerReference")
+		logger.Debug("Removing resource finalizers...")
+		removeFinalizer(sbr)
+		if _, err := updateServiceBinding(r.dynClient, sbr); err != nil {
+			return requeueError(err)
+		}
+		return done()
+	}
+	if sbr.GetDeletionTimestamp() != nil {
+		logger := logger.WithName("unbind")
+		logger.Info("Executing unbinding steps...")
+		// here just build a servicebinder with necessary fields to do unbind
+		ensureDefaults(sbr.Spec.Application)
+		sb := &serviceBinder{
+			dynClient: r.dynClient,
+			sbr:       sbr,
+			logger:    logger,
+			binder: &binder{
+				dynClient:  r.dynClient,
+				restMapper: r.restMapper,
+				sbr:        sbr,
+				logger:     logger,
+			},
+		}
+		return sb.unbind()
+	}
+
 	// validate namespaced ServiceBinding instance (this check has been disabled until test data has been
 	// adjusted to reflect the validation)
 	//
@@ -247,21 +275,6 @@ func (r *reconciler) Reconcile(request reconcile.Request) (reconcile.Result, err
 		}
 	}
 
-	if sbr.GetDeletionTimestamp() != nil && sbr.GetOwnerReferences() != nil {
-		logger := logger.WithName("Deleting SBR when it has ownerReference")
-		logger.Debug("Removing resource finalizers...")
-		removeFinalizer(sbr)
-		if _, err := updateServiceBinding(r.dynClient, sbr); err != nil {
-			return requeueError(err)
-		}
-		return done()
-	}
-	if sbr.GetDeletionTimestamp() != nil {
-		logger := logger.WithName("unbind")
-		logger.Info("Executing unbinding steps...")
-		return sb.unbind()
-	}
-
 	logger.Info("Binding applications with intermediary secret...")
 	return sb.bind()
 }