From 882a210c12f5285ba6f89515842b52f0e30ae728 Mon Sep 17 00:00:00 2001 From: Simon Alling Date: Thu, 13 Jan 2022 17:49:02 +0100 Subject: [PATCH] Undo breaking change to Init Signed-off-by: Simon Alling --- cmd/helm/helm.go | 3 ++- cmd/helm/list.go | 2 +- pkg/action/action.go | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/helm/helm.go b/cmd/helm/helm.go index 123cb8608..65c934964 100644 --- a/cmd/helm/helm.go +++ b/cmd/helm/helm.go @@ -76,9 +76,10 @@ func main() { // run when each command's execute method is called cobra.OnInitialize(func() { helmDriver := os.Getenv("HELM_DRIVER") - if err := actionConfig.Init(settings.RESTClientGetter(), settings.Namespace(), helmDriver, debug, actionConfig.GetHookLogFromRealCluster); err != nil { + if err := actionConfig.Init(settings.RESTClientGetter(), settings.Namespace(), helmDriver, debug); err != nil { log.Fatal(err) } + actionConfig.HookLogGetter = actionConfig.GetHookLogFromRealCluster if helmDriver == "memory" { loadReleasesInMemory(actionConfig) } diff --git a/cmd/helm/list.go b/cmd/helm/list.go index 21396dbfc..2f0e3da0b 100644 --- a/cmd/helm/list.go +++ b/cmd/helm/list.go @@ -71,7 +71,7 @@ func newListCmd(cfg *action.Configuration, out io.Writer) *cobra.Command { ValidArgsFunction: noCompletions, RunE: func(cmd *cobra.Command, args []string) error { if client.AllNamespaces { - if err := cfg.Init(settings.RESTClientGetter(), "", os.Getenv("HELM_DRIVER"), debug, cfg.GetHookLogFromRealCluster); err != nil { + if err := cfg.Init(settings.RESTClientGetter(), "", os.Getenv("HELM_DRIVER"), debug); err != nil { return err } } diff --git a/pkg/action/action.go b/pkg/action/action.go index 65537cb97..5ed45fc8a 100644 --- a/pkg/action/action.go +++ b/pkg/action/action.go @@ -395,7 +395,7 @@ func (cfg *Configuration) recordRelease(r *release.Release) { } // Init initializes the action configuration -func (cfg *Configuration) Init(getter genericclioptions.RESTClientGetter, namespace, helmDriver string, log DebugLog, hookLogGetter HookLogGetter) error { +func (cfg *Configuration) Init(getter genericclioptions.RESTClientGetter, namespace, helmDriver string, log DebugLog) error { kc := kube.New(getter) kc.Log = log @@ -448,7 +448,6 @@ func (cfg *Configuration) Init(getter genericclioptions.RESTClientGetter, namesp cfg.KubeClient = kc cfg.Releases = store cfg.Log = log - cfg.HookLogGetter = hookLogGetter return nil }