Reusing getter

Signed-off-by: Vaibhav Sharma <17532va@gmail.com>
pull/11674/head
Vaibhav Sharma 3 years ago
parent 55f35060cb
commit 5cefab1b4b

@ -22,14 +22,12 @@ import (
"strings" "strings"
"k8s.io/apimachinery/pkg/labels" "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/release"
"helm.sh/helm/v3/pkg/releaseutil" "helm.sh/helm/v3/pkg/releaseutil"
) )
var settings = cli.New()
// ListStates represents zero or more status codes that a list item may have set // 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 // 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) { func (cfg *Configuration) CloneWithNewNamespace(namespace string) (*Configuration, error) {
newConf := &Configuration{} newConf := &Configuration{}
newConf.Releases = cfg.Releases 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. helmDriver := strings.ToLower(cfg.Releases.Driver.Name()) //note: Driver.Name() returns capitalized driver names.
err := newConf.Init(getter, namespace, helmDriver, cfg.Log) err := newConf.Init(getter, namespace, helmDriver, cfg.Log)

@ -21,6 +21,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"helm.sh/helm/v3/pkg/cli"
"helm.sh/helm/v3/pkg/release" "helm.sh/helm/v3/pkg/release"
"helm.sh/helm/v3/pkg/storage" "helm.sh/helm/v3/pkg/storage"
@ -84,6 +85,7 @@ func TestList_AllNamespaces(t *testing.T) {
originalCfg := lister.cfg originalCfg := lister.cfg
lister.cfg.Releases.Driver = driver.NewMemory() lister.cfg.Releases.Driver = driver.NewMemory()
lister.AllNamespaces = true lister.AllNamespaces = true
lister.cfg.RESTClientGetter = cli.New().RESTClientGetter()
makeMeSomeReleasesWithDifferentNamespaces(lister.cfg.Releases, t) makeMeSomeReleasesWithDifferentNamespaces(lister.cfg.Releases, t)
list, err := lister.Run() list, err := lister.Run()
is.NoError(err) is.NoError(err)

Loading…
Cancel
Save