making changes as requested by matt

Signed-off-by: Robert Sirchia <rsirchia@outlook.com>
pull/30603/head
Robert Sirchia 6 months ago
parent 2192c4e0d1
commit 3a19576377
No known key found for this signature in database
GPG Key ID: C2D40F4D8196E874

@ -51,7 +51,7 @@ func processDependencyConditions(reqs []*chart.Dependency, cvals Values, cpath s
slog.Warn("returned non-bool value", "path", c, "chart", r.Name) slog.Warn("returned non-bool value", "path", c, "chart", r.Name)
} else if _, ok := err.(ErrNoValue); !ok { } else if _, ok := err.(ErrNoValue); !ok {
// this is a real error // this is a real error
slog.Warn("the method PathValue returned error", slog.Any("err", err)) slog.Warn("the method PathValue returned error", slog.Any("error", err))
} }
} }
} }
@ -271,7 +271,7 @@ func processImportValues(c *chart.Chart, merge bool) error {
}) })
vm, err := cvals.Table(r.Name + "." + child) vm, err := cvals.Table(r.Name + "." + child)
if err != nil { if err != nil {
slog.Warn("ImportValues missing table", slog.Any("err", err)) slog.Warn("ImportValues missing table", slog.Any("error", err))
continue continue
} }
if merge { if merge {

@ -111,7 +111,7 @@ func getDynamicClientOnKind(apiversion string, kind string, config *rest.Config)
} }
intf, err := dynamic.NewForConfig(config) intf, err := dynamic.NewForConfig(config)
if err != nil { if err != nil {
slog.Error("unable to get dynamic client", slog.Any("err", err)) slog.Error("unable to get dynamic client", slog.Any("error", err))
return nil, false, err return nil, false, err
} }
res := intf.Resource(gvr) res := intf.Resource(gvr)
@ -122,7 +122,7 @@ func getAPIResourceForGVK(gvk schema.GroupVersionKind, config *rest.Config) (met
res := metav1.APIResource{} res := metav1.APIResource{}
discoveryClient, err := discovery.NewDiscoveryClientForConfig(config) discoveryClient, err := discovery.NewDiscoveryClientForConfig(config)
if err != nil { if err != nil {
slog.Error("unable to create discovery client", slog.Any("err", err)) slog.Error("unable to create discovery client", slog.Any("error", err))
return res, err return res, err
} }
resList, err := discoveryClient.ServerResourcesForGroupVersion(gvk.GroupVersion().String()) resList, err := discoveryClient.ServerResourcesForGroupVersion(gvk.GroupVersion().String())

@ -95,7 +95,7 @@ func (i *VCSInstaller) Install() error {
// Update updates a remote repository // Update updates a remote repository
func (i *VCSInstaller) Update() error { func (i *VCSInstaller) Update() error {
slog.Debug("updating", "repo", i.Repo.Remote()) slog.Debug("updating", "source", i.Repo.Remote())
if i.Repo.IsDirty() { if i.Repo.IsDirty() {
return errors.New("plugin repo was modified") return errors.New("plugin repo was modified")
} }
@ -160,7 +160,7 @@ func (i *VCSInstaller) sync(repo vcs.Repo) error {
slog.Debug("cloning", "source", repo.Remote(), "destination", repo.LocalPath()) slog.Debug("cloning", "source", repo.Remote(), "destination", repo.LocalPath())
return repo.Get() return repo.Get()
} }
slog.Debug("updating", "remote", repo.Remote()) slog.Debug("updating", "source", repo.Remote(), "destination", repo.LocalPath())
return repo.Update() return repo.Update()
} }

@ -343,7 +343,7 @@ func ResolveReferenceURL(baseURL, refURL string) (string, error) {
func (e *Entry) String() string { func (e *Entry) String() string {
buf, err := json.Marshal(e) buf, err := json.Marshal(e)
if err != nil { if err != nil {
slog.Error("failed to marshal entry", slog.Any("err", err)) slog.Error("failed to marshal entry", slog.Any("error", err))
panic(err) panic(err)
} }
return string(buf) return string(buf)

Loading…
Cancel
Save