Allow modifying host via opts while getting and listing data packagin…

…g resources
carvel-dev · Jan 9, 2024 · d80a83c · d80a83c
1 parent a796c7a
commit d80a83c
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 13 deletions.
diff --git a/cli/pkg/kctrl/cmd/core/config_factory.go b/cli/pkg/kctrl/cmd/core/config_factory.go
@@ -18,7 +18,7 @@ type ConfigFactory interface {
 	ConfigureContextResolver(func() (string, error))
 	ConfigureYAMLResolver(func() (string, error))
 	ConfigureClient(float32, int)
-	RESTConfig() (*rest.Config, error)
+	RESTConfig(*ConfigOpts) (*rest.Config, error)
 	DefaultNamespace() (string, error)
 }
 
@@ -34,6 +34,10 @@ type ConfigFactoryImpl struct {
 	defaultKubeconfigOverrideContext string
 }
 
+type ConfigOpts struct {
+	HostNameMod func(string) string
+}
+
 var _ ConfigFactory = &ConfigFactoryImpl{}
 
 func NewConfigFactoryImpl() *ConfigFactoryImpl {
@@ -62,7 +66,7 @@ func (f *ConfigFactoryImpl) ConfigureClient(qps float32, burst int) {
 	f.burst = burst
 }
 
-func (f *ConfigFactoryImpl) RESTConfig() (*rest.Config, error) {
+func (f *ConfigFactoryImpl) RESTConfig(opts *ConfigOpts) (*rest.Config, error) {
 	isExplicitYAMLConfig, config, err := f.clientConfig()
 	if err != nil {
 		return nil, err
@@ -86,6 +90,10 @@ func (f *ConfigFactoryImpl) RESTConfig() (*rest.Config, error) {
 		return nil, fmt.Errorf("Building Kubernetes config%s: %s%s", prefixMsg, err, hintMsg)
 	}
 
+	if opts != nil && opts.HostNameMod != nil {
+		restConfig.Host = opts.HostNameMod(restConfig.Host)
+	}
+
 	if f.qps > 0.0 {
 		restConfig.QPS = f.qps
 		restConfig.Burst = f.burst

diff --git a/cli/pkg/kctrl/cmd/core/deps_factory.go b/cli/pkg/kctrl/cmd/core/deps_factory.go
@@ -22,7 +22,7 @@ type DepsFactory interface {
 	DynamicClient(opts DynamicClientOpts) (dynamic.Interface, error)
 	CoreClient() (kubernetes.Interface, error)
 	KappCtrlClient() (kcclient.Interface, error)
-	PackageClient() (pkgclient.Interface, error)
+	PackageClient(*ConfigOpts) (pkgclient.Interface, error)
 }
 
 type DepsFactoryImpl struct {
@@ -44,15 +44,15 @@ type DynamicClientOpts struct{}
 
 // RESTHost ideally should be on ConfigFactory (TODO remove)
 func (f *DepsFactoryImpl) RESTHost() (string, error) {
-	config, err := f.configFactory.RESTConfig()
+	config, err := f.configFactory.RESTConfig(nil)
 	if err != nil {
 		return "", err
 	}
 	return config.Host, nil
 }
 
 func (f *DepsFactoryImpl) DynamicClient(opts DynamicClientOpts) (dynamic.Interface, error) {
-	config, err := f.configFactory.RESTConfig()
+	config, err := f.configFactory.RESTConfig(nil)
 	if err != nil {
 		return nil, err
 	}
@@ -72,7 +72,7 @@ func (f *DepsFactoryImpl) DynamicClient(opts DynamicClientOpts) (dynamic.Interfa
 }
 
 func (f *DepsFactoryImpl) CoreClient() (kubernetes.Interface, error) {
-	config, err := f.configFactory.RESTConfig()
+	config, err := f.configFactory.RESTConfig(nil)
 	if err != nil {
 		return nil, err
 	}
@@ -88,7 +88,7 @@ func (f *DepsFactoryImpl) CoreClient() (kubernetes.Interface, error) {
 }
 
 func (f *DepsFactoryImpl) KappCtrlClient() (kcclient.Interface, error) {
-	config, err := f.configFactory.RESTConfig()
+	config, err := f.configFactory.RESTConfig(nil)
 	if err != nil {
 		return nil, err
 	}
@@ -103,8 +103,8 @@ func (f *DepsFactoryImpl) KappCtrlClient() (kcclient.Interface, error) {
 	return clientset, nil
 }
 
-func (f *DepsFactoryImpl) PackageClient() (pkgclient.Interface, error) {
-	config, err := f.configFactory.RESTConfig()
+func (f *DepsFactoryImpl) PackageClient(configOpts *ConfigOpts) (pkgclient.Interface, error) {
+	config, err := f.configFactory.RESTConfig(configOpts)
 	if err != nil {
 		return nil, err
 	}

diff --git a/cli/pkg/kctrl/cmd/core/examples.go b/cli/pkg/kctrl/cmd/core/examples.go
@@ -17,6 +17,7 @@ type PackageCommandTreeOpts struct {
 
 	DefaultKubeconfigOverridePath    string
 	DefaultKubeconfigOverrideContext string
+	KubeconfigHostNameMod            func(string) string
 
 	DefaultServiceAcccountName string
 	WaitByDefault              bool

diff --git a/cli/pkg/kctrl/cmd/package/available/get.go b/cli/pkg/kctrl/cmd/package/available/get.go
@@ -96,7 +96,9 @@ func (o *GetOptions) Run(args []string) error {
 		return fmt.Errorf("Package name should be of the format 'name' or 'name/version'")
 	}
 
-	client, err := o.depsFactory.PackageClient()
+	client, err := o.depsFactory.PackageClient(&cmdcore.ConfigOpts{
+		HostNameMod: o.pkgCmdTreeOpts.KubeconfigHostNameMod,
+	})
 	if err != nil {
 		return err
 	}

diff --git a/cli/pkg/kctrl/cmd/package/available/list.go b/cli/pkg/kctrl/cmd/package/available/list.go
@@ -104,7 +104,9 @@ func (o *ListOptions) listPackageMetadatas() error {
 		nsHeader.Hidden = false
 	}
 
-	client, err := o.depsFactory.PackageClient()
+	client, err := o.depsFactory.PackageClient(&cmdcore.ConfigOpts{
+		HostNameMod: o.pkgCmdTreeOpts.KubeconfigHostNameMod,
+	})
 	if err != nil {
 		return err
 	}
@@ -159,7 +161,9 @@ func (o *ListOptions) listPackages() error {
 		nsHeader.Hidden = false
 	}
 
-	client, err := o.depsFactory.PackageClient()
+	client, err := o.depsFactory.PackageClient(&cmdcore.ConfigOpts{
+		HostNameMod: o.pkgCmdTreeOpts.KubeconfigHostNameMod,
+	})
 	if err != nil {
 		return err
 	}

diff --git a/cli/pkg/kctrl/cmd/package/installed/create_or_update.go b/cli/pkg/kctrl/cmd/package/installed/create_or_update.go
@@ -237,7 +237,7 @@ func (o *CreateOrUpdateOptions) RunCreate(args []string) error {
 	}
 
 	if len(o.version) == 0 {
-		pkgClient, err := o.depsFactory.PackageClient()
+		pkgClient, err := o.depsFactory.PackageClient(nil)
 		if err != nil {
 			return err
 		}