Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion controllers/binding_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,9 @@ func (r *BindingReconciler) Reconcile(request ctrl.Request) (ctrl.Result, error)
var serviceClassType string
var session *session.Session
{
ibmCloudInfo, err := r.GetIBMCloudInfo(logt, r.Client, serviceInstance)
serviceInstanceInBindingNamespace := serviceInstance.DeepCopy()
serviceInstanceInBindingNamespace.Namespace = instance.Namespace
ibmCloudInfo, err := r.GetIBMCloudInfo(logt, r.Client, serviceInstanceInBindingNamespace)
if err != nil {
logt.Info("Unable to get IBM Cloud info", "ibmcloudInfo", instance.Name)
if errors.IsNotFound(err) && containsBindingFinalizer(instance) &&
Expand Down
57 changes: 57 additions & 0 deletions controllers/binding_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,63 @@ func TestBindingGetIBMCloudInfoFailed(t *testing.T) {
})
}

func TestBindingIBMCloudInfoUsesBindingNamespace(t *testing.T) {
t.Parallel()
scheme := schemas(t)
const (
bindingNamespace = "binding-namespace"
bindingName = "mybinding"
serviceNamespace = "service-namespace"
serviceName = "myservice"
instanceID = "some-instance-id"
)
objects := []runtime.Object{
&ibmcloudv1.Binding{
TypeMeta: metav1.TypeMeta{Kind: "Binding", APIVersion: "ibmcloud.ibm.com/v1"},
ObjectMeta: metav1.ObjectMeta{
Name: bindingName,
Namespace: bindingNamespace,
},
Spec: ibmcloudv1.BindingSpec{
ServiceName: serviceName,
ServiceNamespace: serviceNamespace,
},
Status: ibmcloudv1.BindingStatus{State: bindingStatePending},
},
&ibmcloudv1.Service{
TypeMeta: metav1.TypeMeta{Kind: "Service", APIVersion: "ibmcloud.ibm.com/v1"},
ObjectMeta: metav1.ObjectMeta{Name: serviceName, Namespace: serviceNamespace},
Status: ibmcloudv1.ServiceStatus{
InstanceID: instanceID,
},
},
}

var cloudInfoService *ibmcloudv1.Service
r := &BindingReconciler{
Client: newMockClient(fake.NewFakeClientWithScheme(scheme, objects...), MockConfig{}),
Log: testLogger(t),
Scheme: scheme,
SetOwnerReference: func(owner, controlled metav1.Object, scheme *runtime.Scheme) error {
return nil
},
GetIBMCloudInfo: func(logt logr.Logger, r client.Client, instance *ibmcloudv1.Service) (*ibmcloud.Info, error) {
cloudInfoService = instance.DeepCopy()
return nil, fmt.Errorf("stop after recording service")
},
}

result, err := r.Reconcile(ctrl.Request{
NamespacedName: types.NamespacedName{Name: bindingName, Namespace: bindingNamespace},
})
assert.Equal(t, ctrl.Result{Requeue: true, RequeueAfter: config.Get().SyncPeriod}, result)
assert.NoError(t, err)
require.NotNil(t, cloudInfoService)
assert.Equal(t, bindingNamespace, cloudInfoService.Namespace)
assert.Equal(t, serviceName, cloudInfoService.Name)
assert.Equal(t, instanceID, cloudInfoService.Status.InstanceID)
}

func TestBindingDeletesWithFinalizerFailed(t *testing.T) {
t.Parallel()
now := metav1Now(t)
Expand Down