From 82fc89459f5d0888fb01e9f3c6461b190dffa054 Mon Sep 17 00:00:00 2001 From: Marc Billow Date: Wed, 19 Nov 2025 10:58:32 -0600 Subject: [PATCH 1/2] feat(kubernetes): public new manager to enable external providers Signed-off-by: Marc Billow --- pkg/kubernetes/manager.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/kubernetes/manager.go b/pkg/kubernetes/manager.go index fe555c64..2ba8970e 100644 --- a/pkg/kubernetes/manager.go +++ b/pkg/kubernetes/manager.go @@ -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) { @@ -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") } From c535f59c8f0292c3728879122a4c3a8f6bfa6d56 Mon Sep 17 00:00:00 2001 From: Marc Nuri Date: Thu, 27 Nov 2025 15:15:08 +0100 Subject: [PATCH 2/2] test(kubernetes): public new manager to enable external providers Signed-off-by: Marc Nuri --- pkg/kubernetes/kubernetes_derived_test.go | 4 ++-- pkg/kubernetes/manager_test.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/kubernetes/kubernetes_derived_test.go b/pkg/kubernetes/kubernetes_derived_test.go index 485fef02..98331def 100644 --- a/pkg/kubernetes/kubernetes_derived_test.go +++ b/pkg/kubernetes/kubernetes_derived_test.go @@ -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 @@ -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 diff --git a/pkg/kubernetes/manager_test.go b/pkg/kubernetes/manager_test.go index 6d8b6ee7..aeed934e 100644 --- a/pkg/kubernetes/manager_test.go +++ b/pkg/kubernetes/manager_test.go @@ -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")