From db757b8925660caa756d08b2940bef5aa7f9ad71 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Sat, 3 Mar 2018 23:34:07 -0700 Subject: [PATCH] Pass usermanager and dialer to UserContext --- config/context.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/config/context.go b/config/context.go index 25b2b97f..6948f52b 100644 --- a/config/context.go +++ b/config/context.go @@ -66,6 +66,16 @@ func (c *ScaledContext) controllers() []controller.Starter { } } +func (c *ScaledContext) NewManagementContext() (*ManagementContext, error) { + mgmt, err := NewManagementContext(c.RESTConfig) + if err != nil { + return nil, err + } + mgmt.Dialer = c.Dialer + mgmt.UserManager = c.UserManager + return mgmt, nil +} + func NewScaledContext(config rest.Config) (*ScaledContext, error) { var err error @@ -329,14 +339,14 @@ func (c *ManagementContext) StartAndWait() error { return ctx.Err() } -func NewUserContext(managementConfig, config rest.Config, clusterName string) (*UserContext, error) { +func NewUserContext(scaledContext *ScaledContext, config rest.Config, clusterName string) (*UserContext, error) { var err error context := &UserContext{ RESTConfig: config, ClusterName: clusterName, } - context.Management, err = NewManagementContext(managementConfig) + context.Management, err = scaledContext.NewManagementContext() if err != nil { return nil, err }