Merge pull request #437 from danehans/bz_1866568

Bug 1866568: Removes RestMapper since DynamicRestMapper is now the pkg default
openshift · Aug 18, 2020 · 4c59487 · 4c59487
2 parents 8aa1ce2 + 179dcbc
commit 4c59487
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 117 deletions.
diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go
@@ -15,7 +15,6 @@ import (
 	dnscontroller "github.com/openshift/cluster-ingress-operator/pkg/operator/controller/dns"
 	ingresscontroller "github.com/openshift/cluster-ingress-operator/pkg/operator/controller/ingress"
 	statuscontroller "github.com/openshift/cluster-ingress-operator/pkg/operator/controller/status"
-	operatorutil "github.com/openshift/cluster-ingress-operator/pkg/util"
 
 	operatorv1 "github.com/openshift/api/operator/v1"
 
@@ -57,9 +56,8 @@ func New(config operatorconfig.Config, kubeConfig *rest.Config) (*Operator, erro
 	scheme := operatorclient.GetScheme()
 	// Set up an operator manager for the operator namespace.
 	mgr, err := manager.New(kubeConfig, manager.Options{
-		Namespace:      config.Namespace,
-		Scheme:         scheme,
-		MapperProvider: operatorutil.NewDynamicRESTMapper,
+		Namespace: config.Namespace,
+		Scheme:    scheme,
 		NewCache: cache.MultiNamespacedCacheBuilder([]string{
 			config.Namespace,
 			manifests.DefaultOperandNamespace,

diff --git a/pkg/util/restmapper.go b/pkg/util/restmapper.go