Skip to content
This repository was archived by the owner on Nov 27, 2023. It is now read-only.

Commit e3f1bc9

Browse files
committed
Init helm action by default with no logger, don’t require callers to initialise it.
Signed-off-by: Guillaume Tardif <[email protected]>
1 parent 7d0be7a commit e3f1bc9

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

kube/helm/helm.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ type Actions struct {
3636
initialize func(f func(format string, v ...interface{})) error
3737
}
3838

39+
const helmDriver = "configmap"
40+
3941
// NewActions new helm action
4042
func NewActions(getter genericclioptions.RESTClientGetter) (*Actions, error) {
4143
if getter == nil {
@@ -55,12 +57,16 @@ func NewActions(getter genericclioptions.RESTClientGetter) (*Actions, error) {
5557
}
5658

5759
actions.initialize = func(f func(format string, v ...interface{})) error {
58-
err := actions.Config.Init(getter, namespace, "configmap", f)
60+
err := actions.Config.Init(getter, namespace, helmDriver, f)
5961
if err != nil {
6062
return err
6163
}
6264
return actions.Config.KubeClient.IsReachable()
6365
}
66+
err := actions.initialize(nil) // by default no logger, users might re-initialize with another logger function
67+
if err != nil {
68+
return nil, err
69+
}
6470
return actions, nil
6571
}
6672

@@ -105,10 +111,6 @@ func (hc *Actions) Get(name string) (*release.Release, error) {
105111

106112
// ListReleases lists chart releases
107113
func (hc *Actions) ListReleases() ([]compose.Stack, error) {
108-
err := hc.initialize(nil)
109-
if err != nil {
110-
return nil, err
111-
}
112114
actList := action.NewList(hc.Config)
113115
releases, err := actList.Run()
114116
if err != nil {

0 commit comments

Comments
 (0)