Skip to content

feat(kubernetes): public new manager to enable external providers #482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 27, 2025
Merged

feat(kubernetes): public new manager to enable external providers #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82fc894
feat(kubernetes): public new manager to enable external providers
mbillow Nov 19, 2025
c535f59
test(kubernetes): public new manager to enable external providers
manusa Nov 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/kubernetes/kubernetes_derived_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ users:
badConfig := test.Must(config.ReadToml([]byte(`
kubeconfig = "` + strings.ReplaceAll(badKubeconfigPath, `\`, `\\`) + `"
`)))
badManager, _ := newManager(badConfig, testManager.accessControlClientset.cfg, testManager.accessControlClientset.clientCmdConfig)
badManager, _ := NewManager(badConfig, testManager.accessControlClientset.cfg, testManager.accessControlClientset.clientCmdConfig)
// Replace the clientCmdConfig with one that will fail
pathOptions := clientcmd.NewDefaultPathOptions()
pathOptions.LoadingRules.ExplicitPath = badKubeconfigPath
Expand Down Expand Up @@ -194,7 +194,7 @@ users:
s.T().Cleanup(testManager.Close)

// Now create a bad manager with RequireOAuth=true
badManager, _ := newManager(testStaticConfig, testManager.accessControlClientset.cfg, testManager.accessControlClientset.clientCmdConfig)
badManager, _ := NewManager(testStaticConfig, testManager.accessControlClientset.cfg, testManager.accessControlClientset.clientCmdConfig)
// Replace the clientCmdConfig with one that will fail
pathOptions := clientcmd.NewDefaultPathOptions()
pathOptions.LoadingRules.ExplicitPath = badKubeconfigPath
Expand Down
6 changes: 3 additions & 3 deletions pkg/kubernetes/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func NewKubeconfigManager(config *config.StaticConfig, kubeconfigContext string)
return nil, fmt.Errorf("failed to create kubernetes rest config from kubeconfig: %v", err)
}

return newManager(config, restConfig, clientCmdConfig)
return NewManager(config, restConfig, clientCmdConfig)
}

func NewInClusterManager(config *config.StaticConfig) (*Manager, error) {
Expand Down Expand Up @@ -85,10 +85,10 @@ func NewInClusterManager(config *config.StaticConfig) (*Manager, error) {
}
clientCmdConfig.CurrentContext = inClusterKubeConfigDefaultContext

return newManager(config, restConfig, clientcmd.NewDefaultClientConfig(*clientCmdConfig, nil))
return NewManager(config, restConfig, clientcmd.NewDefaultClientConfig(*clientCmdConfig, nil))
}

func newManager(config *config.StaticConfig, restConfig *rest.Config, clientCmdConfig clientcmd.ClientConfig) (*Manager, error) {
func NewManager(config *config.StaticConfig, restConfig *rest.Config, clientCmdConfig clientcmd.ClientConfig) (*Manager, error) {
if config == nil {
return nil, errors.New("config cannot be nil")
}
Expand Down
8 changes: 4 additions & 4 deletions pkg/kubernetes/manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,28 +200,28 @@ func (s *ManagerTestSuite) TestNewKubeconfigManager() {

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

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

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

s.Run("with all nil parameters returns config error first", func() {
manager, err := newManager(nil, nil, nil)
manager, err := NewManager(nil, nil, nil)
s.Require().Error(err)
s.EqualError(err, "config cannot be nil", "expected 'config cannot be nil' error as first check")
s.Nil(manager, "expected nil manager when all parameters are nil")
Expand Down