Do not use custom dynamicrestmapper (#1138)

kudobuilder · Dec 6, 2019 · 5e38fb3 · 5e38fb3
1 parent 73f9699
commit 5e38fb3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 131 deletions.
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -23,7 +23,6 @@ import (
 	"github.com/kudobuilder/kudo/pkg/controller/instance"
 	"github.com/kudobuilder/kudo/pkg/controller/operator"
 	"github.com/kudobuilder/kudo/pkg/controller/operatorversion"
-	util "github.com/kudobuilder/kudo/pkg/test/utils"
 	"github.com/kudobuilder/kudo/pkg/version"
 	apiextenstionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 
@@ -42,9 +41,7 @@ func main() {
 
 	// create new controller-runtime manager
 	log.Info("setting up manager")
-	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
-		MapperProvider: util.NewDynamicRESTMapper,
-	})
+	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{})
 	if err != nil {
 		log.Error(err, "unable to start manager")
 		os.Exit(1)

diff --git a/pkg/test/harness.go b/pkg/test/harness.go
@@ -251,8 +251,7 @@ func (h *Harness) RunKUDO() error {
 	}
 
 	mgr, err := manager.New(config, manager.Options{
-		Scheme:         testutils.Scheme(),
-		MapperProvider: testutils.NewDynamicRESTMapper,
+		Scheme: testutils.Scheme(),
 	})
 	if err != nil {
 		return err

diff --git a/pkg/test/utils/dynamicrestmapper.go b/pkg/test/utils/dynamicrestmapper.go
diff --git a/pkg/test/utils/kubernetes.go b/pkg/test/utils/kubernetes.go
@@ -19,6 +19,8 @@ import (
 	"testing"
 	"time"
 
+	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
+
 	"github.com/google/shlex"
 	"github.com/kudobuilder/kudo/pkg/apis"
 	kudo "github.com/kudobuilder/kudo/pkg/apis/kudo/v1beta1"
@@ -142,7 +144,7 @@ func NewRetryClient(cfg *rest.Config, opts client.Options) (*RetryClient, error)
 	}
 
 	if opts.Mapper == nil {
-		opts.Mapper, err = NewDynamicRESTMapper(cfg)
+		opts.Mapper, err = apiutil.NewDynamicRESTMapper(cfg)
 		if err != nil {
 			return nil, err
 		}