fixed issue with controller always adding route bindable to OperandBi…

…ndInfo because Route type was a struct and not a point, so could not be nil

Signed-off-by: Henry H Li <[email protected]>

api/v1alpha1/operandbindinfo_types.go

@@ -38,7 +38,7 @@ const (
 	BindInfoFailed    BindInfoPhase = "Failed"
 	BindInfoInit      BindInfoPhase = "Initialized"
 	BindInfoUpdating  BindInfoPhase = "Updating"
-	BindInfoWaiting   BindInfoPhase = "Waiting for Secret and/or Configmap from provider"
+	BindInfoWaiting   BindInfoPhase = "Waiting for Bindable resource from provider. One of: Secret, ConfigMap, Route, or Service"
 )
 
 // OperandBindInfoSpec defines the desired state of OperandBindInfo.
@@ -75,7 +75,7 @@ type Bindable struct {
 	// Route data will shared by copying it into a configmap which is then
 	// created in the target namespace
 	// +optional
-	Route Route `json:"route,omitempty"`
+	Route *Route `json:"route,omitempty"`
 }
 
 // Route represents the name and data inside an OpenShift route.

controllers/operandbindinfo/operandbindinfo_controller.go

@@ -212,12 +212,14 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Re
 
 			if isRouteAPI {
 				// Copy Route data into configmap and share configmap
-				requeueRoute, err := r.copyRoute(ctx, binding.Route, "", operandNamespace, bindRequest.Namespace, key, bindInfoInstance, requestInstance)
-				if err != nil {
-					merr.Add(err)
-					continue
+				if binding.Route != nil {
+					requeueRoute, err := r.copyRoute(ctx, *binding.Route, "", operandNamespace, bindRequest.Namespace, key, bindInfoInstance, requestInstance)
+					if err != nil {
+						merr.Add(err)
+						continue
+					}
+					requeue = requeue || requeueRoute
 				}
-				requeue = requeue || requeueRoute
 			}
 		}
 	}