Skip to content

[fix] add logger func #558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yalosev merged 2 commits into from
Jan 31, 2025
Merged

[fix] add logger func #558

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53d98fc
add logger func
ldmonster Jan 28, 2025
a60415b
lint
ldmonster Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion pkg/helm/helm3lib/helm3lib.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"time"

"github.com/deckhouse/deckhouse/pkg/log"
logContext "github.com/deckhouse/deckhouse/pkg/log/context"
"helm.sh/helm/v3/pkg/action"
"helm.sh/helm/v3/pkg/chart/loader"
"helm.sh/helm/v3/pkg/chartutil"
Expand Down Expand Up @@ -127,7 +128,13 @@ func (h *LibClient) actionConfigInit() error {

// If env is empty - default storage backend ('secrets') will be used
helmDriver := os.Getenv("HELM_DRIVER")
err := ac.Init(getter, options.Namespace, helmDriver, h.Logger.Debug)

formattedLogFunc := func(format string, v ...interface{}) {
ctx := logContext.SetCustomKeyContext(context.Background())
h.Logger.Log(ctx, slog.LevelDebug, fmt.Sprintf(format, v))
}

err := ac.Init(getter, options.Namespace, helmDriver, formattedLogFunc)
if err != nil {
return fmt.Errorf("init helm action config: %v", err)
}
Expand Down
Loading