Updates to handle changes to handle.MapObject and Reconcile()

handle.MapObject was removed in controller-runtime v0.7.0 and has
been replaced with client.Object.
Reconcile() now takes the context as its 1st arguement. This is also
required to start using controller-runtime v0.7.0.

pkg/controller/machineset/machineset_controller_test.go

@@ -349,7 +349,7 @@ func TestScale(t *testing.T) {
 	}
 
 	// Run reconciliation
-	_, err = reconciler.Reconcile(reconcile.Request{NamespacedName: machinesetKey1})
+	_, err = reconciler.Reconcile(context.TODO(), reconcile.Request{NamespacedName: machinesetKey1})
 	if err != nil {
 		t.Errorf("%v", err)
 	}
@@ -374,7 +374,7 @@ func TestScale(t *testing.T) {
 		t.Errorf("%v", err)
 	}
 
-	_, err = reconciler.Reconcile(reconcile.Request{NamespacedName: machinesetKey1})
+	_, err = reconciler.Reconcile(context.TODO(), reconcile.Request{NamespacedName: machinesetKey1})
 	if err != nil {
 		t.Errorf("%v", err)
 	}
@@ -432,7 +432,7 @@ func TestIgnore(t *testing.T) {
 	}
 
 	// Run reconciliation
-	_, err = reconciler.Reconcile(reconcile.Request{NamespacedName: machinesetKey2})
+	_, err = reconciler.Reconcile(context.TODO(), reconcile.Request{NamespacedName: machinesetKey2})
 	if err != nil {
 		t.Errorf("%v", err)
 	}

pkg/controller/machineset/mapper_test.go

@@ -26,11 +26,12 @@ import (
 	machinev1beta1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 	fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake"
-	"sigs.k8s.io/controller-runtime/pkg/handler"
 )
 
 func TestMapper(t *testing.T) {
+	var mo client.Object
 	scheme := runtime.NewScheme()
 	machinev1beta1.AddToScheme(scheme)
 	bmoapis.AddToScheme(scheme)
@@ -87,10 +88,7 @@ func TestMapper(t *testing.T) {
 		c := fakeclient.NewFakeClientWithScheme(scheme, ms, tc.Host)
 		mapper := msmapper{client: c}
 
-		mo := handler.MapObject{
-			Object: tc.Host,
-			Meta:   &tc.Host.ObjectMeta,
-		}
+		mo = tc.Host
 		requests := mapper.Map(mo)
 
 		if tc.ExpectRequest {

pkg/manager/wrapper/bmh_mapper_test.go

@@ -7,7 +7,7 @@ import (
 	machinev1beta1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"sigs.k8s.io/controller-runtime/pkg/handler"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 func TestMap(t *testing.T) {