From dbd8d714ef1ee7de65f729b716228a8ff219f8e3 Mon Sep 17 00:00:00 2001 From: Vaibhav Sharma <17532va@gmail.com> Date: Wed, 4 Jan 2023 18:23:09 +0530 Subject: [PATCH] Reusing getter Signed-off-by: Vaibhav Sharma <17532va@gmail.com> --- pkg/action/list.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkg/action/list.go b/pkg/action/list.go index b4782f4ef..0d293ad5b 100644 --- a/pkg/action/list.go +++ b/pkg/action/list.go @@ -22,14 +22,12 @@ import ( "strings" "k8s.io/apimachinery/pkg/labels" + "k8s.io/cli-runtime/pkg/genericclioptions" - "helm.sh/helm/v3/pkg/cli" "helm.sh/helm/v3/pkg/release" "helm.sh/helm/v3/pkg/releaseutil" ) -var settings = cli.New() - // ListStates represents zero or more status codes that a list item may have set // // Because this is used as a bitmask filter, more than one bit can be flipped @@ -340,7 +338,7 @@ func (l *List) SetStateMask() { func (cfg *Configuration) CloneWithNewNamespace(namespace string) (*Configuration, error) { newConf := &Configuration{} newConf.Releases = cfg.Releases - getter := settings.RESTClientGetter() + getter := cfg.RESTClientGetter.(genericclioptions.RESTClientGetter) helmDriver := strings.ToLower(cfg.Releases.Driver.Name()) //note: Driver.Name() returns capitalized driver names. err := newConf.Init(getter, namespace, helmDriver, cfg.Log)