From 0bcfe6f9bdae6cdbca2594d53d6b1f6bd631f1fc Mon Sep 17 00:00:00 2001 From: hannatao <413024870@qq.com> Date: Mon, 6 Nov 2023 10:31:49 +0800 Subject: [PATCH] Fix format in helm (#799) Co-authored-by: hanpengfei01 --- ami/kube/kube.go | 14 +++++++------- ami/kube/kube_helm.go | 20 ++++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ami/kube/kube.go b/ami/kube/kube.go index de74c757..d6f1165b 100644 --- a/ami/kube/kube.go +++ b/ami/kube/kube.go @@ -1,12 +1,12 @@ package kube import ( - log2 "log" + "log" "os" "github.com/baetyl/baetyl-go/v2/context" "github.com/baetyl/baetyl-go/v2/errors" - "github.com/baetyl/baetyl-go/v2/log" + logv2 "github.com/baetyl/baetyl-go/v2/log" specv1 "github.com/baetyl/baetyl-go/v2/spec/v1" bh "github.com/timshannon/bolthold" "helm.sh/helm/v3/pkg/action" @@ -22,7 +22,7 @@ type kubeImpl struct { helm *action.Configuration store *bh.Store conf *config.KubeConfig - log *log.Logger + log *logv2.Logger } func init() { @@ -39,7 +39,7 @@ func newKubeImpl(cfg config.AmiConfig) (ami.AMI, error) { // init helm for just list actionConfig := new(action.Configuration) - if err = actionConfig.Init(&genericclioptions.ConfigFlags{}, "", os.Getenv(HelmDriver), log2.Printf); err != nil { + if err = actionConfig.Init(&genericclioptions.ConfigFlags{}, "", os.Getenv(HelmDriver), log.Printf); err != nil { return nil, err } @@ -48,7 +48,7 @@ func newKubeImpl(cfg config.AmiConfig) (ami.AMI, error) { cli: kubeCli, helm: actionConfig, conf: &cfg.Kube, - log: log.With(log.Any("ami", "kube")), + log: logv2.With(logv2.Any("ami", "kube")), } return model, nil } @@ -103,9 +103,9 @@ func (k *kubeImpl) StatsApps(ns string) ([]specv1.AppStats, error) { if ok { qpsExts, err = qpsStatsExt(context.RunModeKube) if err != nil { - k.log.Warn("failed to collect qps stats", log.Error(errors.Trace(err))) + k.log.Warn("failed to collect qps stats", logv2.Error(errors.Trace(err))) } - k.log.Debug("collect qps stats successfully", log.Any("qpsStats", qpsExts)) + k.log.Debug("collect qps stats successfully", logv2.Any("qpsStats", qpsExts)) } else { k.log.Warn("invalid collecting qps stats function") } diff --git a/ami/kube/kube_helm.go b/ami/kube/kube_helm.go index 37ea04e3..0b74fe27 100644 --- a/ami/kube/kube_helm.go +++ b/ami/kube/kube_helm.go @@ -4,12 +4,12 @@ package kube import ( "context" - log2 "log" + "log" "os" "strings" "github.com/baetyl/baetyl-go/v2/errors" - "github.com/baetyl/baetyl-go/v2/log" + logv2 "github.com/baetyl/baetyl-go/v2/log" specv1 "github.com/baetyl/baetyl-go/v2/spec/v1" "gopkg.in/yaml.v3" "helm.sh/helm/v3/pkg/action" @@ -71,8 +71,8 @@ func (k *kubeImpl) StatsHelm(_ string) ([]specv1.AppStats, error) { } appStats[h.Name] = specv1.AppStats{ AppInfo: specv1.AppInfo{ - h.Name, - h.Labels[BaetylHelmVersion], + Name: h.Name, + Version: h.Labels[BaetylHelmVersion], }, Status: transStatus(h.Info.Status), DeployType: specv1.WorkloadCustom, @@ -115,14 +115,14 @@ func (k *kubeImpl) ApplyHelm(ns string, app specv1.Application, cfgs map[string] ns = DefaultHelmNamespace } helmCfg := new(action.Configuration) - if err := helmCfg.Init(&genericclioptions.ConfigFlags{Namespace: &ns}, ns, os.Getenv(HelmDriver), log2.Printf); err != nil { + if err := helmCfg.Init(&genericclioptions.ConfigFlags{Namespace: &ns}, ns, os.Getenv(HelmDriver), log.Printf); err != nil { return errors.Trace(err) } old, err := k.GetHelm(helmCfg, app.Name) // already exists, check version if err == nil { if version, ok := old.Labels[BaetylHelmVersion]; !ok || version == app.Version { - k.log.Warn("helm release already exists", log.Any("release", app.Name)) + k.log.Warn("helm release already exists", logv2.Any("release", app.Name)) return nil } else { return k.UpdateHelm(helmCfg, app, cfgs, old) @@ -151,7 +151,7 @@ func (k *kubeImpl) ApplyHelm(ns string, app specv1.Application, cfgs map[string] } rel, err := cli.Run(chart, vals) if rel != nil { - k.log.Debug("helm install", log.Any("release", rel.Name)) + k.log.Debug("helm install", logv2.Any("release", rel.Name)) } return err } @@ -179,7 +179,7 @@ func (k *kubeImpl) UpdateHelm(cfg *action.Configuration, app specv1.Application, } rel, err := cli.Run(app.Name, chart, vals) if rel != nil { - k.log.Debug("helm upgrade", log.Any("release", rel.Name)) + k.log.Debug("helm upgrade", logv2.Any("release", rel.Name)) } return err } @@ -200,13 +200,13 @@ func (k *kubeImpl) DeleteHelm(_ string, app string) error { return errors.New(ErrNotHelmApp) } helmCfg := new(action.Configuration) - if err = helmCfg.Init(&genericclioptions.ConfigFlags{Namespace: &ns}, ns, os.Getenv(HelmDriver), log2.Printf); err != nil { + if err = helmCfg.Init(&genericclioptions.ConfigFlags{Namespace: &ns}, ns, os.Getenv(HelmDriver), log.Printf); err != nil { return errors.Trace(err) } cli := action.NewUninstall(helmCfg) result, err := cli.Run(app) if result != nil && result.Release != nil { - k.log.Debug("helm uninstall", log.Any("release", result.Release.Name)) + k.log.Debug("helm uninstall", logv2.Any("release", result.Release.Name)) } return err }