Fix ServiceBinding removal when service not exist

Signed-off-by: qibobo <[email protected]>

Author: qibobo

controllers/reconciler.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"context"
 	"errors"
+
 	"k8s.io/apimachinery/pkg/api/meta"
 
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
@@ -113,41 +114,43 @@ func (r *ServiceBindingReconciler) doReconcile(request reconcile.Request) (recon
 		// being worked in https://github.com/redhat-developer/service-binding-operator/pull/442.
 		return requeueError(errEmptyServices)
 	}
-
-	serviceCtxs, err := buildServiceContexts(
-		logger.WithName("buildServiceContexts"),
-		r.dynClient,
-		sbr.GetNamespace(),
-		sbr.Spec.Services,
-		sbr.Spec.DetectBindingResources,
-		r.restMapper,
-	)
-	if err != nil {
-		//handle service not found error
-		if k8serrors.IsNotFound(err) {
-			err = updateSBRConditions(r.dynClient, sbr,
-				metav1.Condition{
-					Type:    v1alpha1.CollectionReady,
-					Status:  metav1.ConditionFalse,
-					Reason:  v1alpha1.ServiceNotFoundReason,
-					Message: err.Error(),
-				},
-				metav1.Condition{
-					Type:   v1alpha1.InjectionReady,
-					Reason: v1alpha1.ServiceNotFoundReason,
-					Status: metav1.ConditionFalse,
-				},
-				metav1.Condition{
-					Type:   v1alpha1.BindingReady,
-					Reason: v1alpha1.ServiceNotFoundReason,
-					Status: metav1.ConditionFalse,
-				},
-			)
-			if err != nil {
-				logger.Error(err, "Failed to update SBR conditions", "sbr", sbr)
+	serviceCtxs := serviceContextList{}
+	// we only need to build the service context if SBR is not deleted
+	if sbr.GetDeletionTimestamp() == nil {
+		serviceCtxs, err = buildServiceContexts(
+			logger.WithName("buildServiceContexts"),
+			r.dynClient,
+			sbr.GetNamespace(),
+			sbr.Spec.Services,
+			sbr.Spec.DetectBindingResources,
+			r.restMapper,
+		)
+		if err != nil {
+			//handle service not found error
+			if k8serrors.IsNotFound(err) {
+				err = updateSBRConditions(r.dynClient, sbr,
+					metav1.Condition{
+						Type:    v1alpha1.CollectionReady,
+						Status:  metav1.ConditionFalse,
+						Reason:  v1alpha1.ServiceNotFoundReason,
+						Message: err.Error(),
+					},
+					metav1.Condition{
+						Type:   v1alpha1.InjectionReady,
+						Status: metav1.ConditionFalse,
+					},
+					metav1.Condition{
+						Type:   v1alpha1.BindingReady,
+						Status: metav1.ConditionFalse,
+					},
+				)
+				if err != nil {
+					logger.Error(err, "Failed to update SBR conditions", "sbr", sbr)
+				}
 			}
+			return requeueError(err)
+
 		}
-		return requeueError(err)
 	}
 	binding, err := buildBinding(
 		r.dynClient,

test/acceptance/features/unbindAppToService.feature

@@ -49,3 +49,60 @@ Feature: Unbind an application from a service
 
         Then The env var "BACKEND_HOST" is not available to the application
         And The env var "BACKEND_USERNAME" is not available to the application
+
+
+    Scenario: Unbind a generic test application from the backing service when the backing service has been deleted
+        Given OLM Operator "backend" is running
+        * The Custom Resource is present
+            """
+            apiVersion: "stable.example.com/v1"
+            kind: Backend
+            metadata:
+                name: example-backend
+                annotations:
+                    service.binding/host: path={.spec.host}
+                    service.binding/username: path={.spec.username}
+            spec:
+                host: example.com
+                username: foo
+            """
+        * Generic test application "generic-app-a-d-u" is running
+        * Service Binding is applied
+            """
+            apiVersion: operators.coreos.com/v1alpha1
+            kind: ServiceBinding
+            metadata:
+                name: binding-request-a-d-u
+            spec:
+                application:
+                    name: generic-app-a-d-u
+                    group: apps
+                    version: v1
+                    resource: deployments
+                services:
+                -   group: stable.example.com
+                    version: v1
+                    kind: Backend
+                    name: example-backend
+                    id: backend
+            """
+        * The application env var "BACKEND_HOST" has value "example.com"
+        * The application env var "BACKEND_USERNAME" has value "foo"
+
+        When BackingService is deleted
+          """
+          apiVersion: "stable.example.com/v1"
+          kind: Backend
+          metadata:
+              name: example-backend
+              annotations:
+                  service.binding/host: path={.spec.host}
+                  service.binding/username: path={.spec.username}
+          spec:
+              host: example.com
+              username: foo
+          """
+        When Service binding "binding-request-a-d-u" is deleted
+
+        Then The env var "BACKEND_HOST" is not available to the application
+        And The env var "BACKEND_USERNAME" is not available to the application