From 4d0c8c332c3b1fa691be0a0903ef02de026cfb54 Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@rancher.com>
Date: Sat, 16 May 2020 22:25:31 -0700
Subject: [PATCH] Allow factory options to be passed in

---
 pkg/server/config.go | 11 ++++++-----
 pkg/server/server.go |  5 ++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkg/server/config.go b/pkg/server/config.go
index 8f6547d..6033f35 100644
--- a/pkg/server/config.go
+++ b/pkg/server/config.go
@@ -19,6 +19,7 @@ import (
 	corev1 "github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1"
 	"github.com/rancher/wrangler-api/pkg/generated/controllers/rbac"
 	rbacv1 "github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/v1"
+	"github.com/rancher/wrangler/pkg/generic"
 	"github.com/rancher/wrangler/pkg/ratelimit"
 	"github.com/rancher/wrangler/pkg/start"
 	"k8s.io/client-go/kubernetes"
@@ -64,28 +65,28 @@ func RestConfigDefaults(cfg *rest.Config) *rest.Config {
 	return cfg
 }
 
-func NewController(cfg *rest.Config) (*Controllers, error) {
+func NewController(cfg *rest.Config, opts *generic.FactoryOptions) (*Controllers, error) {
 	c := &Controllers{}
 
-	core, err := core.NewFactoryFromConfig(cfg)
+	core, err := core.NewFactoryFromConfigWithOptions(cfg, opts)
 	if err != nil {
 		return nil, err
 	}
 	c.starters = append(c.starters, core)
 
-	rbac, err := rbac.NewFactoryFromConfig(cfg)
+	rbac, err := rbac.NewFactoryFromConfigWithOptions(cfg, opts)
 	if err != nil {
 		return nil, err
 	}
 	c.starters = append(c.starters, rbac)
 
-	api, err := apiregistration.NewFactoryFromConfig(cfg)
+	api, err := apiregistration.NewFactoryFromConfigWithOptions(cfg, opts)
 	if err != nil {
 		return nil, err
 	}
 	c.starters = append(c.starters, api)
 
-	crd, err := apiextensions.NewFactoryFromConfig(cfg)
+	crd, err := apiextensions.NewFactoryFromConfigWithOptions(cfg, opts)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/server/server.go b/pkg/server/server.go
index a57adc6..ba55b5a 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -5,8 +5,6 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/rancher/steve/pkg/server/resources/schemas"
-
 	"github.com/rancher/dynamiclistener/server"
 	"github.com/rancher/steve/pkg/accesscontrol"
 	"github.com/rancher/steve/pkg/client"
@@ -18,6 +16,7 @@ import (
 	"github.com/rancher/steve/pkg/server/handler"
 	"github.com/rancher/steve/pkg/server/resources"
 	"github.com/rancher/steve/pkg/server/resources/common"
+	"github.com/rancher/steve/pkg/server/resources/schemas"
 )
 
 var ErrConfigRequired = errors.New("rest config is required")
@@ -29,7 +28,7 @@ func setDefaults(server *Server) error {
 
 	if server.Controllers == nil {
 		var err error
-		server.Controllers, err = NewController(server.RestConfig)
+		server.Controllers, err = NewController(server.RestConfig, nil)
 		if err != nil {
 			return err
 		}