From e3f1bc99d32533284e9e5665bdc86baae3ecfe7d Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Wed, 3 Feb 2021 14:20:22 +0100 Subject: [PATCH] =?UTF-8?q?Init=20helm=20action=20by=20default=20with=20no?= =?UTF-8?q?=20logger,=20don=E2=80=99t=20require=20callers=20to=20initialis?= =?UTF-8?q?e=20it.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guillaume Tardif --- kube/helm/helm.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/kube/helm/helm.go b/kube/helm/helm.go index 87d97a174..a8eeb1358 100644 --- a/kube/helm/helm.go +++ b/kube/helm/helm.go @@ -36,6 +36,8 @@ type Actions struct { initialize func(f func(format string, v ...interface{})) error } +const helmDriver = "configmap" + // NewActions new helm action func NewActions(getter genericclioptions.RESTClientGetter) (*Actions, error) { if getter == nil { @@ -55,12 +57,16 @@ func NewActions(getter genericclioptions.RESTClientGetter) (*Actions, error) { } actions.initialize = func(f func(format string, v ...interface{})) error { - err := actions.Config.Init(getter, namespace, "configmap", f) + err := actions.Config.Init(getter, namespace, helmDriver, f) if err != nil { return err } return actions.Config.KubeClient.IsReachable() } + err := actions.initialize(nil) // by default no logger, users might re-initialize with another logger function + if err != nil { + return nil, err + } return actions, nil } @@ -105,10 +111,6 @@ func (hc *Actions) Get(name string) (*release.Release, error) { // ListReleases lists chart releases func (hc *Actions) ListReleases() ([]compose.Stack, error) { - err := hc.initialize(nil) - if err != nil { - return nil, err - } actList := action.NewList(hc.Config) releases, err := actList.Run() if err != nil {