fix: Update fakeDeleteCRDClient interface.

Author: ryotarai

internal/crd/crd.go

@@ -3,14 +3,12 @@ package crd
 
 import (
 	"context"
-	"fmt"
 
 	apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/client/config"
 
 	api "sigs.k8s.io/hierarchical-namespaces/api/v1alpha2"
 )
@@ -19,13 +17,13 @@ import (
 type fakeDeleteCRDClient struct{}
 
 // fakeDeleteCRDClient doesn't return any err on Get() because none of the reconciler test performs CRD deletion
-func (f fakeDeleteCRDClient) Get(context.Context, types.NamespacedName, client.Object) error {
+func (f fakeDeleteCRDClient) Get(context.Context, client.ObjectKey, client.Object, ...client.GetOption) error {
 	return nil
 }
 
 // crdClientType could be either a real client or fakeDeleteCRDClient
 type crdClientType interface {
-	Get(context.Context, types.NamespacedName, client.Object) error
+	Get(context.Context, client.ObjectKey, client.Object, ...client.GetOption) error
 }
 
 // crdClient is an uncached client for checking CRD deletion (or a fake for testing)
@@ -38,16 +36,7 @@ func Setup(mgr ctrl.Manager, fake bool) error {
 		return nil
 	}
 
-	//TODO(aludwin): can we just use mgr.GetClient()? If not, document why not
-	var err error
-	crdClient, err = client.New(config.GetConfigOrDie(), client.Options{
-		Scheme: mgr.GetScheme(),
-		// I'm not sure if this mapper is needed - @ginnyji Dec2020
-		Mapper: mgr.GetRESTMapper(),
-	})
-	if err != nil {
-		return fmt.Errorf("cannot create crdClient: %s", err.Error())
-	}
+	crdClient = mgr.GetClient()
 
 	return nil
 }