Skip to content

Commit bb17628

Browse files
mbillowmanusa
andauthored
feat(kubernetes): public new manager to enable external providers (#482)
* feat(kubernetes): public new manager to enable external providers Signed-off-by: Marc Billow <mbillow@indeed.com> * test(kubernetes): public new manager to enable external providers Signed-off-by: Marc Nuri <marc@marcnuri.com> --------- Signed-off-by: Marc Billow <mbillow@indeed.com> Signed-off-by: Marc Nuri <marc@marcnuri.com> Co-authored-by: Marc Nuri <marc@marcnuri.com>
1 parent d6a28d7 commit bb17628

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

pkg/kubernetes/kubernetes_derived_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ users:
158158
badConfig := test.Must(config.ReadToml([]byte(`
159159
kubeconfig = "` + strings.ReplaceAll(badKubeconfigPath, `\`, `\\`) + `"
160160
`)))
161-
badManager, _ := newManager(badConfig, testManager.accessControlClientset.cfg, testManager.accessControlClientset.clientCmdConfig)
161+
badManager, _ := NewManager(badConfig, testManager.accessControlClientset.cfg, testManager.accessControlClientset.clientCmdConfig)
162162
// Replace the clientCmdConfig with one that will fail
163163
pathOptions := clientcmd.NewDefaultPathOptions()
164164
pathOptions.LoadingRules.ExplicitPath = badKubeconfigPath
@@ -194,7 +194,7 @@ users:
194194
s.T().Cleanup(testManager.Close)
195195

196196
// Now create a bad manager with RequireOAuth=true
197-
badManager, _ := newManager(testStaticConfig, testManager.accessControlClientset.cfg, testManager.accessControlClientset.clientCmdConfig)
197+
badManager, _ := NewManager(testStaticConfig, testManager.accessControlClientset.cfg, testManager.accessControlClientset.clientCmdConfig)
198198
// Replace the clientCmdConfig with one that will fail
199199
pathOptions := clientcmd.NewDefaultPathOptions()
200200
pathOptions.LoadingRules.ExplicitPath = badKubeconfigPath

pkg/kubernetes/manager.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func NewKubeconfigManager(config *config.StaticConfig, kubeconfigContext string)
5353
return nil, fmt.Errorf("failed to create kubernetes rest config from kubeconfig: %v", err)
5454
}
5555

56-
return newManager(config, restConfig, clientCmdConfig)
56+
return NewManager(config, restConfig, clientCmdConfig)
5757
}
5858

5959
func NewInClusterManager(config *config.StaticConfig) (*Manager, error) {
@@ -85,10 +85,10 @@ func NewInClusterManager(config *config.StaticConfig) (*Manager, error) {
8585
}
8686
clientCmdConfig.CurrentContext = inClusterKubeConfigDefaultContext
8787

88-
return newManager(config, restConfig, clientcmd.NewDefaultClientConfig(*clientCmdConfig, nil))
88+
return NewManager(config, restConfig, clientcmd.NewDefaultClientConfig(*clientCmdConfig, nil))
8989
}
9090

91-
func newManager(config *config.StaticConfig, restConfig *rest.Config, clientCmdConfig clientcmd.ClientConfig) (*Manager, error) {
91+
func NewManager(config *config.StaticConfig, restConfig *rest.Config, clientCmdConfig clientcmd.ClientConfig) (*Manager, error) {
9292
if config == nil {
9393
return nil, errors.New("config cannot be nil")
9494
}

pkg/kubernetes/manager_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,28 +200,28 @@ func (s *ManagerTestSuite) TestNewKubeconfigManager() {
200200

201201
func (s *ManagerTestSuite) TestNewManager() {
202202
s.Run("with nil config returns error", func() {
203-
manager, err := newManager(nil, &rest.Config{}, clientcmd.NewDefaultClientConfig(clientcmdapi.Config{}, nil))
203+
manager, err := NewManager(nil, &rest.Config{}, clientcmd.NewDefaultClientConfig(clientcmdapi.Config{}, nil))
204204
s.Require().Error(err)
205205
s.EqualError(err, "config cannot be nil", "expected 'config cannot be nil' error")
206206
s.Nil(manager, "expected nil manager when config is nil")
207207
})
208208

209209
s.Run("with nil restConfig returns error", func() {
210-
manager, err := newManager(&config.StaticConfig{}, nil, clientcmd.NewDefaultClientConfig(clientcmdapi.Config{}, nil))
210+
manager, err := NewManager(&config.StaticConfig{}, nil, clientcmd.NewDefaultClientConfig(clientcmdapi.Config{}, nil))
211211
s.Require().Error(err)
212212
s.EqualError(err, "restConfig cannot be nil", "expected 'restConfig cannot be nil' error")
213213
s.Nil(manager, "expected nil manager when restConfig is nil")
214214
})
215215

216216
s.Run("with nil clientCmdConfig returns error", func() {
217-
manager, err := newManager(&config.StaticConfig{}, &rest.Config{}, nil)
217+
manager, err := NewManager(&config.StaticConfig{}, &rest.Config{}, nil)
218218
s.Require().Error(err)
219219
s.EqualError(err, "clientCmdConfig cannot be nil", "expected 'clientCmdConfig cannot be nil' error")
220220
s.Nil(manager, "expected nil manager when clientCmdConfig is nil")
221221
})
222222

223223
s.Run("with all nil parameters returns config error first", func() {
224-
manager, err := newManager(nil, nil, nil)
224+
manager, err := NewManager(nil, nil, nil)
225225
s.Require().Error(err)
226226
s.EqualError(err, "config cannot be nil", "expected 'config cannot be nil' error as first check")
227227
s.Nil(manager, "expected nil manager when all parameters are nil")

0 commit comments

Comments
 (0)