github/steve
1
0
Fork 0
mirror of https://github.com/niusmallnan/steve.git synced 2025-07-16 23:51:13 +00:00
Code Issues Projects Releases Wiki Activity

Allow factory options to be passed in

Browse Source
This commit is contained in:
Darren Shepherd 2020-05-16 22:25:31 -07:00
parent 685dea747a
commit 4d0c8c332c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/server/config.go
View File

@ -19,6 +19,7 @@ import (
corev1 "github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1" corev1 "github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1"
"github.com/rancher/wrangler-api/pkg/generated/controllers/rbac" "github.com/rancher/wrangler-api/pkg/generated/controllers/rbac"
rbacv1 "github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/v1" 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/ratelimit"
"github.com/rancher/wrangler/pkg/start" "github.com/rancher/wrangler/pkg/start"
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
@ -64,28 +65,28 @@ func RestConfigDefaults(cfg *rest.Config) *rest.Config {
return cfg return cfg
} }
func NewController(cfg *rest.Config) (*Controllers, error) { func NewController(cfg *rest.Config, opts *generic.FactoryOptions) (*Controllers, error) {
c := &Controllers{} c := &Controllers{}
core, err := core.NewFactoryFromConfig(cfg) core, err := core.NewFactoryFromConfigWithOptions(cfg, opts)
if err != nil { if err != nil {
return nil, err return nil, err
} }
c.starters = append(c.starters, core) c.starters = append(c.starters, core)
rbac, err := rbac.NewFactoryFromConfig(cfg) rbac, err := rbac.NewFactoryFromConfigWithOptions(cfg, opts)
if err != nil { if err != nil {
return nil, err return nil, err
} }
c.starters = append(c.starters, rbac) c.starters = append(c.starters, rbac)
api, err := apiregistration.NewFactoryFromConfig(cfg) api, err := apiregistration.NewFactoryFromConfigWithOptions(cfg, opts)
if err != nil { if err != nil {
return nil, err return nil, err
} }
c.starters = append(c.starters, api) c.starters = append(c.starters, api)
crd, err := apiextensions.NewFactoryFromConfig(cfg) crd, err := apiextensions.NewFactoryFromConfigWithOptions(cfg, opts)
if err != nil { if err != nil {
return nil, err return nil, err
} }

5
pkg/server/server.go
View File

@ -5,8 +5,6 @@ import (
"errors" "errors"
"net/http" "net/http"
"github.com/rancher/steve/pkg/server/resources/schemas"
"github.com/rancher/dynamiclistener/server" "github.com/rancher/dynamiclistener/server"
"github.com/rancher/steve/pkg/accesscontrol" "github.com/rancher/steve/pkg/accesscontrol"
"github.com/rancher/steve/pkg/client" "github.com/rancher/steve/pkg/client"
@ -18,6 +16,7 @@ import (
"github.com/rancher/steve/pkg/server/handler" "github.com/rancher/steve/pkg/server/handler"
"github.com/rancher/steve/pkg/server/resources" "github.com/rancher/steve/pkg/server/resources"
"github.com/rancher/steve/pkg/server/resources/common" "github.com/rancher/steve/pkg/server/resources/common"
"github.com/rancher/steve/pkg/server/resources/schemas"
) )
var ErrConfigRequired = errors.New("rest config is required") var ErrConfigRequired = errors.New("rest config is required")
@ -29,7 +28,7 @@ func setDefaults(server *Server) error {
if server.Controllers == nil { if server.Controllers == nil {
var err error var err error
server.Controllers, err = NewController(server.RestConfig) server.Controllers, err = NewController(server.RestConfig, nil)
if err != nil { if err != nil {
return err return err
} }