From 890d3ebb77a7ff9e584a6097471fffddc530c099 Mon Sep 17 00:00:00 2001 From: Suleiman Dibirov Date: Thu, 13 Jun 2024 16:58:09 +0300 Subject: [PATCH] chore(logs): update log messages for better clarity Signed-off-by: Suleiman Dibirov --- pkg/action/action.go | 7 ++++++- pkg/storage/driver/cfgmaps.go | 1 + pkg/storage/driver/secrets.go | 1 + pkg/storage/driver/sql.go | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkg/action/action.go b/pkg/action/action.go index ea2dc0dd7..3367668fa 100644 --- a/pkg/action/action.go +++ b/pkg/action/action.go @@ -383,9 +383,14 @@ func (cfg *Configuration) Init(getter genericclioptions.RESTClientGetter, namesp clientFn: kc.Factory.KubernetesClientSet, } + if helmDriver == "" { + helmDriver = "secrets" + } + + log("init: using %s storage driver", helmDriver) var store *storage.Storage switch helmDriver { - case "secret", "secrets", "": + case "secret", "secrets": d := driver.NewSecrets(newSecretClient(lazyClient)) d.Log = log store = storage.Init(d) diff --git a/pkg/storage/driver/cfgmaps.go b/pkg/storage/driver/cfgmaps.go index 2b84b7f82..8c032e527 100644 --- a/pkg/storage/driver/cfgmaps.go +++ b/pkg/storage/driver/cfgmaps.go @@ -172,6 +172,7 @@ func (cfgmaps *ConfigMaps) Create(key string, rls *rspb.Release) error { // push the configmap object out into the kubiverse if _, err := cfgmaps.impl.Create(context.Background(), obj, metav1.CreateOptions{}); err != nil { if apierrors.IsAlreadyExists(err) { + cfgmaps.Log("create: release %q already exists in configmaps", rls.Name) return ErrReleaseExists } diff --git a/pkg/storage/driver/secrets.go b/pkg/storage/driver/secrets.go index 2ab128c6b..8edbadcb7 100644 --- a/pkg/storage/driver/secrets.go +++ b/pkg/storage/driver/secrets.go @@ -162,6 +162,7 @@ func (secrets *Secrets) Create(key string, rls *rspb.Release) error { // push the secret object out into the kubiverse if _, err := secrets.impl.Create(context.Background(), obj, metav1.CreateOptions{}); err != nil { if apierrors.IsAlreadyExists(err) { + secrets.Log("create: release %q already exists in secrets", rls.Name) return ErrReleaseExists } diff --git a/pkg/storage/driver/sql.go b/pkg/storage/driver/sql.go index 12bdd3ff4..735457a4f 100644 --- a/pkg/storage/driver/sql.go +++ b/pkg/storage/driver/sql.go @@ -511,7 +511,7 @@ func (s *SQL) Create(key string, rls *rspb.Release) error { var record SQLReleaseWrapper if err := transaction.Get(&record, selectQuery, args...); err == nil { - s.Log("release %s already exists", key) + s.Log("release %s already exists in SQL database", key) return ErrReleaseExists }